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

[sword at www.crosswire.org]

Committed by: dglassey

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

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/src/mgr/Makefile.am,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- Makefile.am	7 May 2004 23:08:15 -0000	1.18
+++ Makefile.am	18 May 2004 12:34:43 -0000	1.19
@@ -6,9 +6,6 @@
 globdef =
 endif
 
-#if BUILDSPLITLIB
-#spdefs = -DSPLITLIB
-#else
 if BUILDNEWVKEY
 spdefs = -DSPLITLIB
 refsrc = $(mgrdir)/refsysmgr.cpp
@@ -16,7 +13,6 @@
 spdefs =
 refsrc =
 endif
-#endif
 
 AM_CPPFLAGS += $(globdef) $(spdefs)
 
@@ -33,10 +29,6 @@
 libsword_la_SOURCES += $(mgrdir)/installmgr.cpp
 libsword_la_SOURCES += $(mgrdir)/stringmgr.cpp
 
-#if BUILDSPLITLIB
-#libsword_imp_la_SOURCES += $(mgrsplits)
-#else
 libsword_la_SOURCES += $(mgrsplits)
 libsword_la_SOURCES += $(refsrc)
-#endif