[sword-cvs] sword/tests Makefile.am,1.20,1.21

[sword at www.crosswire.org]

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

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/tests/Makefile.am,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- Makefile.am	12 Apr 2004 13:47:21 -0000	1.20
+++ Makefile.am	7 May 2004 17:49:45 -0000	1.21
@@ -1,11 +1,11 @@
 AUTOMAKE_OPTIONS = 1.6
 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
+#endif
 if BUILDREFSYS
 refsysdir = refsys
 else
@@ -16,8 +16,10 @@
 
 noinst_PROGRAMS = keytest mgrtest parsekey listtest casttest modtest \
 compnone complzss localetest introtest indextest configtest keycast \
-romantest testblocks filtertest rawldidxtest lextest swaptest genbooktest treeidxtest \
-swbuftest xmltest webiftest
+romantest testblocks filtertest rawldidxtest lextest swaptest \
+genbooktest treeidxtest swbuftest xmltest webiftest
+
+#outputcps
 
 if ICU
 ICUPROG = icutest translittest tlitmgrtest
@@ -40,12 +42,25 @@
 ZLIBPROG =
 endif
 
-noinst_PROGRAMS += $(ZLIBPROG)
+if BUILDNEWVKEY
+VKPROG = keytest2 refsystest
+else
+VKPROG =
+endif
+
+noinst_PROGRAMS += $(ZLIBPROG) $(VKPROG)
 
 if ZLIB
 compzip_SOURCES = compzip.cpp
 endif
 
+if BUILDNEWVKEY
+keytest2_SOURCES = keytest2.cpp
+refsystest_SOURCES = refsystest.cpp
+#You have to make some parts of versekey.h public to 
+#get outputcps to work
+#outputcps_SOURCES = outputcps.cpp
+endif
 
 keytest_SOURCES = keytest.cpp
 mgrtest_SOURCES = mgrtest.cpp
@@ -72,9 +87,6 @@
 webiftest_SOURCES = webiftest.cpp
 xmltest_SOURCES = xmltest.cpp
 
-#You have to make some parts of versekey.h public to 
-#get outputcps to work
-#outputcps_SOURCES = outputcps.cpp
 
 EXTRA_DIST = 
 include bcppmake/Makefile.am