[sword-cvs] sword/utilities Makefile.am,1.28,1.29

[sword at www.crosswire.org]

Update of /cvs/core/sword/utilities
In directory www:/tmp/cvs-serv7424/utilities

Modified Files:
	Makefile.am 
Log Message:

dglassey: disable the splitlib option for now - vk2 works just find alongside vk


Index: Makefile.am
===================================================================
RCS file: /cvs/core/sword/utilities/Makefile.am,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- Makefile.am	12 Apr 2004 13:47:21 -0000	1.28
+++ Makefile.am	7 May 2004 17:49:45 -0000	1.29
@@ -1,18 +1,18 @@
 AUTOMAKE_OPTIONS = 1.6
 SUBDIRS = diatheke
 INCLUDES = -I $(top_srcdir)/include
-if BUILDSPLITLIB
-LDADD = $(top_builddir)/lib/libsword_imp.la \
-        $(top_builddir)/lib/libsword.la
-else
+#if BUILDSPLITLIB
+#LDADD = $(top_builddir)/lib/libsword_imp.la \
+#        $(top_builddir)/lib/libsword.la
+#else
 LDADD = $(top_builddir)/lib/libsword.la
-endif
-noinst_PROGRAMS = cipherraw ciphertest ciphertest2 lexdump mkfastmod \
+#endif
+noinst_PROGRAMS = cipherraw ciphertest ciphertest2 lexdump \
 stepdump step2vpl gbfidx modwrite addvs emptyvss \
 txt2sword addgb imp2gbs mod2imp thml2gbs xml2gbs
 
 bin_PROGRAMS = mod2imp mod2osis osis2mod vs2osisref mod2vpl \
-	vpl2mod imp2vs installmgr
+	mkfastmod vpl2mod imp2vs installmgr
 
 if INSTALLMGR
 IMGRPROG =
@@ -28,11 +28,17 @@
 endif
 
 if ZLIB
+if BUILDNEWVKEY
+ZLIBPROG = mod2zmod addld imp2ld mod2zmod2 vpl2zmod2
+else
 ZLIBPROG = mod2zmod addld imp2ld
+endif
 else
 ZLIBPROG =
 endif
 
+
+
 noinst_PROGRAMS += $(ICUPROG)
 bin_PROGRAMS += $(ZLIBPROG) $(IMGRPROG)
 
@@ -68,6 +74,10 @@
 #installmgr_LDADD = -lcurl $(CURL_LIBS) $(LDADD)
 
 if ZLIB
+if BUILDNEWVKEY
+mod2zmod2_SOURCES = mod2zmod2.cpp
+vpl2zmod2_SOURCES = vpl2zmod2.cpp
+endif
 mod2zmod_SOURCES = mod2zmod.cpp
 addld_SOURCES = addld.cpp
 imp2ld_SOURCES = imp2ld.cpp