[sword-cvs] sword/lib Makefile.am,1.19,1.20

[sword at www.crosswire.org]

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

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/lib/Makefile.am,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- Makefile.am	12 Apr 2004 13:58:37 -0000	1.19
+++ Makefile.am	7 May 2004 17:49:45 -0000	1.20
@@ -13,13 +13,13 @@
 # Global config directory
 globalconfdir := @sysconfdir@
 
-if BUILDSPLITLIB
-extralibs = libsword_imp.la libsword_flat.la
-flatlib = libsword_flat.a
-else
+#if BUILDSPLITLIB
+#extralibs = libsword_imp.la libsword_flat.la
+#flatlib = libsword_flat.a
+#else
 extralibs =
 flatlib =
-endif
+#endif
 
 lib_LTLIBRARIES = libsword.la $(extralibs)
 #lib_LIBRARIES = $(flatlib)
@@ -46,14 +46,14 @@
 
 libsword_la_LDFLAGS = -version-info 5
 
-if BUILDSPLITLIB
-libsword_flat_la_LDFLAGS = -version-info 5
-libsword_imp_la_LDFLAGS = -version-info 5
-libsword_flat_la_LIBADD = $(ICULIBADD) $(IMGRLIBADD) libsword.la
-libsword_imp_la_LIBADD = $(ICULIBADD) $(IMGRLIBADD) libsword.la
-libsword_flat_la_SOURCES =
-libsword_imp_la_SOURCES =
-endif
+#if BUILDSPLITLIB
+#libsword_flat_la_LDFLAGS = -version-info 5
+#libsword_imp_la_LDFLAGS = -version-info 5
+#libsword_flat_la_LIBADD = $(ICULIBADD) $(IMGRLIBADD) libsword.la
+#libsword_imp_la_LIBADD = $(ICULIBADD) $(IMGRLIBADD) libsword.la
+#libsword_flat_la_SOURCES =
+#libsword_imp_la_SOURCES =
+#endif
 
 include ../src/keys/Makefile.am
 include ../src/utilfuns/Makefile.am