From: Adam Dickmeiss Date: Thu, 30 Sep 2004 08:16:48 +0000 (+0000) Subject: Remove TCL_LIB from all LDADDs except for Tcl filter. We don't anything X-Git-Tag: snippet.version.1~314 X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=commitdiff_plain;h=a9eae0225b1a51b0257f80d9da9f95475dd04f53 Remove TCL_LIB from all LDADDs except for Tcl filter. We don't anything but the filter to link with it! --- diff --git a/dfa/Makefile.am b/dfa/Makefile.am index e7105f0..6c22183 100644 --- a/dfa/Makefile.am +++ b/dfa/Makefile.am @@ -1,11 +1,11 @@ -## $Id: Makefile.am,v 1.5 2004-08-24 10:40:23 adam Exp $ +## $Id: Makefile.am,v 1.6 2004-09-30 08:16:48 adam Exp $ lib_LTLIBRARIES = libidzebra-dfa.la noinst_PROGRAMS = agrep lexer grepper AM_CPPFLAGS = -I$(srcdir)/../include $(YAZINC) -LDADD = libidzebra-dfa.la ../util/libidzebra-util.la $(YAZLALIB) $(TCL_LIB) +LDADD = libidzebra-dfa.la ../util/libidzebra-util.la $(YAZLALIB) agrep_SOURCES = agrep.c diff --git a/dict/Makefile.am b/dict/Makefile.am index 1cfa222..51395cb 100644 --- a/dict/Makefile.am +++ b/dict/Makefile.am @@ -1,4 +1,4 @@ -## $Id: Makefile.am,v 1.8 2004-08-30 21:36:53 adam Exp $ +## $Id: Makefile.am,v 1.9 2004-09-30 08:16:48 adam Exp $ lib_LTLIBRARIES = libidzebra-dict.la noinst_PROGRAMS = dicttest dictext @@ -9,7 +9,7 @@ LDADD = libidzebra-dict.la \ ../bfile/libidzebra-bfile.la \ ../dfa/libidzebra-dfa.la \ ../util/libidzebra-util.la \ - $(TCL_LIB) $(YAZLALIB) + $(YAZLALIB) libidzebra_dict_la_SOURCES = scan.c dopen.c dclose.c drdwr.c open.c close.c insert.c \ lookup.c lookupec.c lookgrep.c delete.c dcompact.c diff --git a/isamb/Makefile.am b/isamb/Makefile.am index 66928df..8b48530 100644 --- a/isamb/Makefile.am +++ b/isamb/Makefile.am @@ -1,4 +1,4 @@ -## $Id: Makefile.am,v 1.6 2004-08-24 10:44:53 adam Exp $ +## $Id: Makefile.am,v 1.7 2004-09-30 08:16:48 adam Exp $ lib_LTLIBRARIES = libidzebra-isamb.la @@ -15,4 +15,4 @@ libidzebra_isamb_la_SOURCES = isamb.c AM_CPPFLAGS=-I$(srcdir)/../include $(YAZINC) -LDADD = ../util/libutil.a ../bfile/libbfile.a libisamc.a $(YAZLALIB) $(TCL_LIB) +LDADD = ../util/libutil.a ../bfile/libbfile.a libisamc.a $(YAZLALIB) diff --git a/isamc/Makefile.am b/isamc/Makefile.am index 142a4fd..68b3557 100644 --- a/isamc/Makefile.am +++ b/isamc/Makefile.am @@ -1,4 +1,4 @@ -## $Id: Makefile.am,v 1.6 2004-08-24 10:37:18 adam Exp $ +## $Id: Makefile.am,v 1.7 2004-09-30 08:16:49 adam Exp $ lib_LTLIBRARIES = libidzebra-isamc.la @@ -6,4 +6,4 @@ libidzebra_isamc_la_SOURCES = isamc.c merge.c isamc-p.h AM_CPPFLAGS = -I$(srcdir)/../include -I$(srcdir)/../index $(YAZINC) -LDADD = ../util/libutil.a ../bfile/libbfile.a libisamc.a $(YAZLALIB) $(TCL_LIB) +LDADD = ../util/libutil.a ../bfile/libbfile.a libisamc.a $(YAZLALIB) diff --git a/isamg/Makefile.am b/isamg/Makefile.am index 83fdc88..0df3f6e 100644 --- a/isamg/Makefile.am +++ b/isamg/Makefile.am @@ -1,4 +1,4 @@ -## $Id: Makefile.am,v 1.2 2002-08-17 08:00:28 adam Exp $ +## $Id: Makefile.am,v 1.3 2004-09-30 08:16:49 adam Exp $ noinst_LIBRARIES = libisamc.a @@ -6,4 +6,4 @@ libisamc_a_SOURCES = isamg.c INCLUDES = -I$(srcdir)/../include @YAZINC@ -LDADD = ../util/libutil.a ../bfile/libbfile.a libisamc.a $(YAZLIB) $(TCL_LIB) +LDADD = ../util/libutil.a ../bfile/libbfile.a libisamc.a $(YAZLIB) diff --git a/test/api/Makefile.am b/test/api/Makefile.am index 10fe8d9..ee2be0e 100644 --- a/test/api/Makefile.am +++ b/test/api/Makefile.am @@ -1,4 +1,4 @@ -# $Id: Makefile.am,v 1.16 2004-09-22 11:59:25 heikki Exp $ +# $Id: Makefile.am,v 1.17 2004-09-30 08:16:49 adam Exp $ noinst_PROGRAMS = testclient testclient_SOURCES = testclient.c @@ -31,5 +31,5 @@ zebralibs = \ ../../dfa/libidzebra-dfa.la \ ../../util/libidzebra-util.la -LDADD = $(zebralibs) $(YAZLALIB) $(TCL_LIB) +LDADD = $(zebralibs) $(YAZLALIB) diff --git a/test/codec/Makefile.am b/test/codec/Makefile.am index 690a7bf..a74c841 100644 --- a/test/codec/Makefile.am +++ b/test/codec/Makefile.am @@ -1,4 +1,4 @@ -# $Id: Makefile.am,v 1.3 2004-08-30 21:36:53 adam Exp $ +# $Id: Makefile.am,v 1.4 2004-09-30 08:16:49 adam Exp $ TESTS = tstcodec @@ -21,4 +21,4 @@ noinst_PROGRAMS = tstcodec AM_CPPFLAGS = -I$(top_srcdir)/include $(YAZINC) -LDADD = $(zebralibs) $(YAZLALIB) $(TCL_LIB) +LDADD = $(zebralibs) $(YAZLALIB) diff --git a/util/Makefile.am b/util/Makefile.am index e20962a..7ba1fee 100644 --- a/util/Makefile.am +++ b/util/Makefile.am @@ -1,4 +1,4 @@ -## $Id: Makefile.am,v 1.11 2004-08-29 12:31:32 adam Exp $ +## $Id: Makefile.am,v 1.12 2004-09-30 08:16:49 adam Exp $ lib_LTLIBRARIES = libidzebra-util.la @@ -11,7 +11,7 @@ EXTRA_DIST = zebrasrv.rh DISTCLEANFILES = idzebra-config AM_CPPFLAGS = -I$(srcdir)/../include $(YAZINC) -DDEFAULT_PROFILE_PATH=\"$(pkgdatadir)/tab\" -LDADD = libidzebra-util.la $(TCL_LIB) $(YAZLALIB) +LDADD = libidzebra-util.la $(YAZLALIB) libidzebra_util_la_SOURCES = res.c charmap.c zebramap.c passwddb.c \ zebra-lock.c dirent.c xpath.c atoi_zn.c