From e5e4f1de02396b2cfab488f8e5918853e96d6b53 Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Sat, 17 Aug 2002 08:00:27 +0000 Subject: [PATCH] Updated Makefiles --- dfa/Makefile.am | 4 ++-- dict/Makefile.am | 5 +++-- isam/Makefile.am | 4 ++-- isamb/Makefile.am | 4 ++-- isamc/Makefile.am | 4 ++-- isamg/Makefile.am | 4 ++-- util/Makefile.am | 6 ++---- 7 files changed, 15 insertions(+), 16 deletions(-) diff --git a/dfa/Makefile.am b/dfa/Makefile.am index 3058c3b..c8c59ba 100644 --- a/dfa/Makefile.am +++ b/dfa/Makefile.am @@ -1,11 +1,11 @@ -## $Id: Makefile.am,v 1.1 2000-04-05 09:49:35 adam Exp $ +## $Id: Makefile.am,v 1.2 2002-08-17 08:00:27 adam Exp $ noinst_LIBRARIES = libdfa.a noinst_PROGRAMS = agrep lexer grepper INCLUDES = -I$(srcdir)/../include @YAZINC@ -LDADD = libdfa.a ../util/libutil.a @YAZLIB@ @LIBS@ +LDADD = libdfa.a ../util/libutil.a $(YAZLIB) $(TCL_LIB) agrep_SOURCES = agrep.c diff --git a/dict/Makefile.am b/dict/Makefile.am index 9fd786c..d6e99c3 100644 --- a/dict/Makefile.am +++ b/dict/Makefile.am @@ -1,10 +1,11 @@ -## $Id: Makefile.am,v 1.4 2002-04-12 14:40:42 adam Exp $ +## $Id: Makefile.am,v 1.5 2002-08-17 08:00:27 adam Exp $ noinst_LIBRARIES = libdict.a noinst_PROGRAMS = dicttest dictext INCLUDES = -I$(srcdir)/../include @YAZINC@ -LDADD = libdict.a ../bfile/libbfile.a ../dfa/libdfa.a ../util/libutil.a @YAZLIB@ @LIBS@ + +LDADD = libdict.a ../bfile/libbfile.a ../dfa/libdfa.a ../util/libutil.a $(YAZLIB) $(TCL_LIB) libdict_a_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/isam/Makefile.am b/isam/Makefile.am index 43295e6..a0bbfb6 100644 --- a/isam/Makefile.am +++ b/isam/Makefile.am @@ -1,10 +1,10 @@ -## $Id: Makefile.am,v 1.1 2000-04-05 09:49:36 adam Exp $ +## $Id: Makefile.am,v 1.2 2002-08-17 08:00:27 adam Exp $ noinst_LIBRARIES = libisam.a INCLUDES = -I$(srcdir)/../include @YAZINC@ -LDADD = ../util/libutil.a ../bfile/libbfile.a @YAZLIB@ @LIBS@ +LDADD = ../util/libutil.a ../bfile/libbfile.a $(YAZLIB) $(TCL_LIB) libisam_a_SOURCES = isam.c isutil.c rootblk.c memory.c physical.c \ isutil.h keyops.h memory.h physical.h rootblk.h diff --git a/isamb/Makefile.am b/isamb/Makefile.am index 71a1879..f2f07c5 100644 --- a/isamb/Makefile.am +++ b/isamb/Makefile.am @@ -1,4 +1,4 @@ -## $Id: Makefile.am,v 1.1 2000-10-11 12:31:27 adam Exp $ +## $Id: Makefile.am,v 1.2 2002-08-17 08:00:28 adam Exp $ noinst_LIBRARIES = libisamb.a @@ -6,4 +6,4 @@ libisamb_a_SOURCES = isamb.c INCLUDES = -I$(srcdir)/../include @YAZINC@ -LDADD = ../util/libutil.a ../bfile/libbfile.a libisamc.a @YAZLIB@ +LDADD = ../util/libutil.a ../bfile/libbfile.a libisamc.a $(YAZLIB) $(TCL_LIB) diff --git a/isamc/Makefile.am b/isamc/Makefile.am index 6ebd8df..7c0cb4f 100644 --- a/isamc/Makefile.am +++ b/isamc/Makefile.am @@ -1,4 +1,4 @@ -## $Id: Makefile.am,v 1.2 2002-03-21 20:15:57 adam Exp $ +## $Id: Makefile.am,v 1.3 2002-08-17 08:00:28 adam Exp $ noinst_LIBRARIES = libisamc.a @@ -6,4 +6,4 @@ libisamc_a_SOURCES = isamc.c isamd.c merge.c merge-d.c isamc-p.h isamd-p.h INCLUDES = -I$(srcdir)/../include -I$(srcdir)/../index @YAZINC@ -LDADD = ../util/libutil.a ../bfile/libbfile.a libisamc.a @YAZLIB@ +LDADD = ../util/libutil.a ../bfile/libbfile.a libisamc.a $(YAZLIB) $(TCL_LIB) diff --git a/isamg/Makefile.am b/isamg/Makefile.am index 75fe6a8..83fdc88 100644 --- a/isamg/Makefile.am +++ b/isamg/Makefile.am @@ -1,4 +1,4 @@ -## $Id: Makefile.am,v 1.1 2001-01-16 19:05:45 heikki Exp $ +## $Id: Makefile.am,v 1.2 2002-08-17 08:00:28 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@ +LDADD = ../util/libutil.a ../bfile/libbfile.a libisamc.a $(YAZLIB) $(TCL_LIB) diff --git a/util/Makefile.am b/util/Makefile.am index c70dfa0..a701ad1 100644 --- a/util/Makefile.am +++ b/util/Makefile.am @@ -1,4 +1,4 @@ -## $Id: Makefile.am,v 1.4 2002-05-07 11:04:58 adam Exp $ +## $Id: Makefile.am,v 1.5 2002-08-17 08:00:28 adam Exp $ noinst_LIBRARIES = libutil.a @@ -7,10 +7,8 @@ noinst_PROGRAMS = passtest EXTRA_DIST = zebrasrv.rh INCLUDES = -I$(srcdir)/../include @YAZINC@ -LDADD = libutil.a @YAZLIB@ @LIBS@ +LDADD = libutil.a $(YAZLIB) $(TCL_LIB) libutil_a_SOURCES = res.c charmap.c zebramap.c passwddb.c zebra-lock.c dirent.c passtest_SOURCES = passtest.c - -LIBS = -- 1.7.10.4