[sword-cvs] sword/src/modules/texts/ztext Makefile.am,1.4,1.5

[sword at www.crosswire.org]

Committed by: dglassey

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

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/texts/ztext/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Makefile.am	7 May 2004 17:49:45 -0000	1.4
+++ Makefile.am	18 May 2004 12:34:43 -0000	1.5
@@ -1,11 +1,8 @@
 ztextdir = $(top_srcdir)/src/modules/texts/ztext
 
-#if BUILDSPLITLIB
-#libsword_imp_la_SOURCES += $(ztextdir)/ztext.cpp
-#libsword_la_SOURCES += $(ztextdir)/ztext2.cpp
-#else
 if BUILDNEWVKEY
-libsword_la_SOURCES += $(ztextdir)/ztext2.cpp
+zt2 = $(ztextdir)/ztext2.cpp
+else
+zt2 =
 endif
-libsword_la_SOURCES += $(ztextdir)/ztext.cpp
-#endif
+libsword_la_SOURCES += $(ztextdir)/ztext.cpp $(zt2)