[sword-cvs] sword/utilities Makefile.am,1.22,1.23

[sword@www.crosswire.org]

Update of /usr/local/cvsroot/sword/utilities
In directory www:/tmp/cvs-serv31204/utilities

Modified Files:
	Makefile.am 
Log Message:

and make --without-zlib mean something as well


Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/sword/utilities/Makefile.am,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- Makefile.am	8 Jul 2003 08:08:42 -0000	1.22
+++ Makefile.am	8 Jul 2003 13:19:41 -0000	1.23
@@ -3,10 +3,10 @@
 LDADD = $(top_builddir)/lib/libsword.la 
 
 noinst_PROGRAMS = cipherraw ciphertest ciphertest2 lexdump mkfastmod \
-stepdump step2vpl gbfidx modwrite addvs addld emptyvss \
-txt2sword addgb imp2gbs imp2ld mod2imp thml2gbs xml2gbs
+stepdump step2vpl gbfidx modwrite addvs emptyvss \
+txt2sword addgb imp2gbs mod2imp thml2gbs xml2gbs
 
-bin_PROGRAMS = mod2imp mod2osis osis2mod vs2osisref mod2zmod mod2vpl \
+bin_PROGRAMS = mod2imp mod2osis osis2mod vs2osisref mod2vpl \
 	vpl2mod imp2vs
 
 if INSTALLMGR
@@ -21,7 +21,14 @@
 ICUPROG =
 endif
 
+if ZLIB
+ZLIBPROG = mod2zmod addld imp2ld
+else
+ZLIBPROG =
+endif
+
 noinst_PROGRAMS += $(ICUPROG) $(IMGRPROG)
+bin_PROGRAMS += $(ZLIBPROG)
 
 if ICU
 endif
@@ -31,22 +38,18 @@
 ciphertest2_SOURCES = ciphertest2.cpp
 lexdump_SOURCES = lexdump.c
 lexdump_LDADD = -lstdc++
-installmgr_LDADD = -lcurl $(CURL_LIBS) $(LDADD)
 mkfastmod_SOURCES = mkfastmod.cpp
 mod2vpl_SOURCES = mod2vpl.cpp
 vpl2mod_SOURCES = vpl2mod.cpp
 stepdump_SOURCES = stepdump.cpp
 step2vpl_SOURCES = step2vpl.cpp
-mod2zmod_SOURCES = mod2zmod.cpp
 gbfidx_SOURCES = gbfidx.cpp
 modwrite_SOURCES = modwrite.cpp
 addvs_SOURCES = addvs.cpp
-addld_SOURCES = addld.cpp
 emptyvss_SOURCES = emptyvss.cpp
 txt2sword_SOURCES = txt2sword.cpp
 addgb_SOURCES = addgb.cpp
 imp2gbs_SOURCES = imp2gbs.cpp
-imp2ld_SOURCES = imp2ld.cpp
 imp2vs_SOURCES = imp2vs.cpp
 mod2imp_SOURCES = mod2imp.cpp
 thml2gbs_SOURCES = thml2gbs.cpp
@@ -54,4 +57,14 @@
 xml2gbs_SOURCES = xml2gbs.cpp
 osis2mod_SOURCES = osis2mod.cpp
 vs2osisref_SOURCES = vs2osisref.cpp
+
+if INSTALLMGR
 installmgr_SOURCES = installmgr.cpp
+installmgr_LDADD = -lcurl $(CURL_LIBS) $(LDADD)
+endif
+
+if ZLIB
+mod2zmod_SOURCES = mod2zmod.cpp
+addld_SOURCES = addld.cpp
+imp2ld_SOURCES = imp2ld.cpp
+endif