[sword-cvs] sword/lib Makefile.am,1.18,1.19

[sword@www.crosswire.org]

Update of /cvs/core/sword/lib
In directory www:/tmp/cvs-serv32022/lib

Modified Files:
	Makefile.am 
Log Message:

dglassey: final makefile update


Index: Makefile.am
===================================================================
RCS file: /cvs/core/sword/lib/Makefile.am,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- Makefile.am	29 Jan 2004 17:38:18 -0000	1.18
+++ Makefile.am	12 Apr 2004 13:58:37 -0000	1.19
@@ -1,6 +1,6 @@
 AUTOMAKE_OPTIONS = 1.6
-INCLUDES = -I$(top_srcdir)/include
-INCLUDES += -DUSE_AUTOTOOLS -DUNIX -Dunix
+AM_CPPFLAGS = -I$(top_srcdir)/include
+AM_CPPFLAGS += -DUSE_AUTOTOOLS -DUNIX -Dunix
 
 if ZLIB
 ZLIBDEF = 
@@ -8,12 +8,21 @@
 ZLIBDEF = -DEXCLUDEZLIB
 endif
 
-INCLUDES += $(ZLIBDEF)
+AM_CPPFLAGS += $(ZLIBDEF)
 
 # Global config directory
 globalconfdir := @sysconfdir@
 
-lib_LTLIBRARIES = libsword.la
+if BUILDSPLITLIB
+extralibs = libsword_imp.la libsword_flat.la
+flatlib = libsword_flat.a
+else
+extralibs =
+flatlib =
+endif
+
+lib_LTLIBRARIES = libsword.la $(extralibs)
+#lib_LIBRARIES = $(flatlib)
 
 libsword_la_SOURCES =
 if ICU
@@ -24,7 +33,7 @@
 ICUDEF =
 endif
 
-INCLUDES += $(ICUDEF)
+AM_CPPFLAGS += $(ICUDEF)
 
 if INSTALLMGR
 IMGRLIBADD = -lcurl $(CURL_LIBS)
@@ -36,6 +45,15 @@
 libsword_la_LIBADD = $(ICULIBADD) $(IMGRLIBADD) 
 
 libsword_la_LDFLAGS = -version-info 5
+
+if BUILDSPLITLIB
+libsword_flat_la_LDFLAGS = -version-info 5
+libsword_imp_la_LDFLAGS = -version-info 5
+libsword_flat_la_LIBADD = $(ICULIBADD) $(IMGRLIBADD) libsword.la
+libsword_imp_la_LIBADD = $(ICULIBADD) $(IMGRLIBADD) libsword.la
+libsword_flat_la_SOURCES =
+libsword_imp_la_SOURCES =
+endif
 
 include ../src/keys/Makefile.am
 include ../src/utilfuns/Makefile.am