[sword-cvs] sword/src/modules/common Makefile.am,1.5,1.6

[sword at www.crosswire.org]

Committed by: dglassey

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

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/modules/common/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Makefile.am	7 May 2004 17:49:45 -0000	1.5
+++ Makefile.am	18 May 2004 12:34:43 -0000	1.6
@@ -17,15 +17,12 @@
 libsword_la_SOURCES += $(commondir)/zstr.cpp
 libsword_la_SOURCES += $(commondir)/entriesblk.cpp
 
-#if BUILDSPLITLIB
-#libsword_la_SOURCES += $(commondir)/zverse2.cpp
-#libsword_imp_la_SOURCES += $(SPLITS)
-#else
 if BUILDNEWVKEY
-libsword_la_SOURCES += $(commondir)/zverse2.cpp
+zv2 = $(commondir)/zverse2.cpp
+else
+zv2 =
 endif
-libsword_la_SOURCES += $(SPLITS)
-#endif
+libsword_la_SOURCES += $(SPLITS) $(zv2)
 
 libsword_la_SOURCES += $(commondir)/sapphire.cpp