[sword-cvs] sword/lib Makefile.am,1.21,1.22

[sword at www.crosswire.org]

Committed by: dglassey

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

Modified Files:
	Makefile.am 
Log Message:

fix for automake 1.6
automake 1.7 handles conditional compilation a bit more flexibly
you need define rather than add to variables in if statements then use them elsewhere


Index: Makefile.am
===================================================================
RCS file: /cvs/core/sword/lib/Makefile.am,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- Makefile.am	10 May 2004 17:57:26 -0000	1.21
+++ Makefile.am	18 May 2004 12:34:43 -0000	1.22
@@ -1,4 +1,4 @@
-#AUTOMAKE_OPTIONS = 1.6
+AUTOMAKE_OPTIONS = 1.6
 AM_CPPFLAGS = -I$(top_srcdir)/include
 AM_CPPFLAGS += -DUSE_AUTOTOOLS -DUNIX -Dunix
 
@@ -13,16 +13,7 @@
 # Global config directory
 globalconfdir := @sysconfdir@
 
-#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)
+lib_LTLIBRARIES = libsword.la
 
 libsword_la_SOURCES =
 if ICU
@@ -45,15 +36,6 @@
 libsword_la_LIBADD = $(ICULIBADD) $(IMGRLIBADD) 
 
 libsword_la_LDFLAGS = -release $(VERSION)
-
-#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