[sword-cvs] sword/src/keys Makefile.am,1.6,1.7

sword at www.crosswire.org sword at www.crosswire.org
Tue May 18 05:34:45 MST 2004


Committed by: dglassey

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

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/keys/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Makefile.am	7 May 2004 17:49:45 -0000	1.6
+++ Makefile.am	18 May 2004 12:34:43 -0000	1.7
@@ -10,18 +10,9 @@
 if BUILDNEWVKEY
 versekey = $(keysdir)/versekey2.cpp $(keysdir)/versekey.cpp \
 	$(keysdir)/refsys.cpp
-#vkdef = -DVK2
 else
 versekey = $(keysdir)/versekey.cpp
-#vkdef =
 endif
 
-#if BUILDSPLITLIB
-#libsword_imp_la_SOURCES += $(keysdir)/versekey.cpp
-#versekey = $(keysdir)/versekey2.cpp $(keysdir)/refsys.cpp
-#vkdef =
-#endif
-
 libsword_la_SOURCES += $(versekey)
-#AM_CPPFLAGS += $(vkdef)
 



More information about the sword-cvs mailing list