summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDodji Seketeli <dodji@gnome.org>2003-12-11 16:14:20 +0000
committerDodji Seketeli <dodji@src.gnome.org>2003-12-11 16:14:20 +0000
commit7da465f33ed5cd06d322eb0cdf174f313a2cf6e6 (patch)
tree154191aee021872f73830f4936f0f4a59aaeebb6
parentf34e699a7c8566e76b8e3180429d16799c906881 (diff)
downloadlibcroco-7da465f33ed5cd06d322eb0cdf174f313a2cf6e6.tar.gz
Fixed more build system stuffs here.
2003-12-11 Dodji Seketeli <dodji@gnome.org> * src/layeng/Makefile.am,src/seleng/Makefile.am: Fixed more build system stuffs here.
-rw-r--r--ChangeLog2
-rw-r--r--src/layeng/Makefile.am15
-rw-r--r--src/seleng/Makefile.am9
3 files changed, 14 insertions, 12 deletions
diff --git a/ChangeLog b/ChangeLog
index ea4c8ba..fac0506 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -36,6 +36,8 @@
* configure.in,src/layeng/Makefile.am,src/seleng/Makefile.am:
Provides libcrseleng and libcrlayeng with version info
different from the one of libcroco.
+ * src/layeng/Makefile.am,src/seleng/Makefile.am: Fixed more
+ build system stuffs here.
2003-08-17 Gaël CHAMOULAUD <strider@gnome.org>
diff --git a/src/layeng/Makefile.am b/src/layeng/Makefile.am
index fff072f..d41ff5a 100644
--- a/src/layeng/Makefile.am
+++ b/src/layeng/Makefile.am
@@ -1,20 +1,19 @@
-lib_LTLIBRARIES=libcrlayeng.la
+LAYENG_SRCS=cr-box.c cr-box.h cr-box-view.c cr-box-view.h cr-lay-eng.c cr-lay-eng.h
+EXTRA_DIST=$(LAYENG_SRCS)
+if HAVE_LAYENG
+lib_LTLIBRARIES=libcrlayeng.la
crlayengincdir=$(includedir)/@PACKAGE@/layeng
crlayenginc_HEADERS= cr-box.h cr-box-view.h cr-lay-eng.h
+libcrlayeng_la_SOURCES=$(LAYENG_SRCS)
-#the layout engine files
-if HAVE_LAYENG
-LAYENG_SRCS= cr-box.c cr-box.h cr-box-view.c cr-box-view.h cr-lay-eng.c cr-lay-eng.h
-endif
-libcrlayeng_la_SOURCES=$(LAYENG_SRCS)
INCLUDES=-I$(top_srcdir) -I$(top_srcdir)/src/parser \
-I$(top_srcdir)/src/seleng -I$(top_srcdir)/intl \
@GLIB2_CFLAGS@ @LIBXML2_CFLAGS@ @LIBGNOMEUI2_CFLAGS@
LDADD=$(top_srcdir)/src/parser/@CROCO_PARSER_LIB@
-
+endif
libcrlayeng_la_LDFLAGS=-version-info @LIBCRLAYENG_VERSION_INFO@ \
$(top_srcdir)/src/seleng/@CROCO_SELENG_LIB@ @LIBXML2_LIBS@ \
-@LIBGNOMEUI2_LIBS@
+@LIBGNOMEUI2_LIBS@ \ No newline at end of file
diff --git a/src/seleng/Makefile.am b/src/seleng/Makefile.am
index eb74907..25ad853 100644
--- a/src/seleng/Makefile.am
+++ b/src/seleng/Makefile.am
@@ -1,17 +1,18 @@
+SELENG_SRCS= cr-style.c cr-style.h cr-sel-eng.c cr-sel-eng.h cr-fonts.c cr-fonts.h
+EXTRA_DIST=$(SELENG_SRCS)
+
+if HAVE_SELENG
lib_LTLIBRARIES=libcrseleng.la
crselengincdir=$(includedir)/@PACKAGE@/seleng
crselenginc_HEADERS= cr-fonts.h cr-sel-eng.h cr-style.h
#the selection engine files
-if HAVE_SELENG
-SELENG_SRCS= cr-style.c cr-style.h cr-sel-eng.c cr-sel-eng.h cr-fonts.c cr-fonts.h
-endif
libcrseleng_la_SOURCES=$(SELENG_SRCS)
INCLUDES=-I$(top_srcdir) -I$(top_srcdir)/src/parser -I$(top_srcdir)/intl \
@GLIB2_CFLAGS@ @LIBXML2_CFLAGS@
LDADD=$(top_srcdir)/src/parser/libcroco.la
-
+endif
libcrseleng_la_LDFLAGS=-version-info @LIBCRSELENG_VERSION_INFO@ @LIBXML2_LIBS@