From 4dd885245b0ce82b18609ab4a05d0d5868ff1391 Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Wed, 11 Sep 2002 21:25:56 +0000 Subject: [PATCH] Remove LIBS = from Makefile.am's. --- asn/Makefile.am | 4 +--- comstack/Makefile.am | 4 +--- configure.in | 21 +++++++++++---------- ill/Makefile.am | 4 +--- odr/Makefile.am | 4 +--- retrieval/Makefile.am | 4 +--- server/Makefile.am | 4 +--- util/Makefile.am | 4 +--- z39.50/Makefile.am | 4 +--- zutil/Makefile.am | 4 +--- 10 files changed, 20 insertions(+), 37 deletions(-) diff --git a/asn/Makefile.am b/asn/Makefile.am index ad0f888..ab975b6 100644 --- a/asn/Makefile.am +++ b/asn/Makefile.am @@ -1,9 +1,7 @@ -## $Id: Makefile.am,v 1.6 2002-04-15 09:44:41 adam Exp $ +## $Id: Makefile.am,v 1.7 2002-09-11 21:25:57 adam Exp $ noinst_LTLIBRARIES=libasn.la -LIBS = - libasn_la_SOURCES = proto.c prt-rsc.c prt-acc.c prt-exp.c prt-grs.c prt-exd.c \ prt-dia.c prt-esp.c prt-arc.c prt-add.c prt-dat.c prt-univ.c diff --git a/comstack/Makefile.am b/comstack/Makefile.am index d0a876e..0f65fe9 100644 --- a/comstack/Makefile.am +++ b/comstack/Makefile.am @@ -1,10 +1,8 @@ -## $Id: Makefile.am,v 1.6 2002-06-04 11:36:10 adam Exp $ +## $Id: Makefile.am,v 1.7 2002-09-11 21:25:57 adam Exp $ noinst_LTLIBRARIES=libcomstack.la AM_CPPFLAGS=-I$(top_srcdir)/include -LIBS = - libcomstack_la_SOURCES=comstack.c tcpip.c waislen.c unix.c diff --git a/configure.in b/configure.in index a65d93a..1046871 100644 --- a/configure.in +++ b/configure.in @@ -1,6 +1,6 @@ dnl YAZ Toolkit, Index Data 1994-2002 dnl See the file LICENSE for details. -dnl $Id: configure.in,v 1.86 2002-09-11 21:19:06 adam Exp $ +dnl $Id: configure.in,v 1.87 2002-09-11 21:25:56 adam Exp $ AC_INIT(include/yaz/yaz-version.h) AM_INIT_AUTOMAKE(yaz, 1.9.1) dnl @@ -172,12 +172,12 @@ AC_TRY_COMPILE([ ac_cv_check_socklen_t=no)]) AC_MSG_RESULT($ac_cv_check_socklen_t) if test "$ac_cv_check_socklen_t" = "yes"; then - AC_DEFINE(HAVE_SOCKLEN_T) -fi -AC_MSG_CHECKING(whether net size is of type size_t) -AC_CACHE_VAL(ac_cv_check_getpeername_accepts_size_t, -[ac_cv_check_getpeername_accepts_size_t='' -AC_TRY_COMPILE([ + AC_DEFINE(HAVE_SOCKLEN_T) +else + AC_MSG_CHECKING(whether net size is of type size_t) + AC_CACHE_VAL(ac_cv_check_getpeername_accepts_size_t, + [ac_cv_check_getpeername_accepts_size_t='' + AC_TRY_COMPILE([ #include #include #include @@ -186,9 +186,10 @@ AC_TRY_COMPILE([ [getpeername(0, (struct sockaddr *)NULL, (size_t *)0);], ac_cv_check_getpeername_accepts_size_t=yes, ac_cv_check_getpeername_accepts_size_t=no)]) -AC_MSG_RESULT($ac_cv_check_getpeername_accepts_size_t) -if test "$ac_cv_check_getpeername_accepts_size_t" = yes; then - AC_DEFINE(GETPEERNAME_ACCEPTS_SIZE_T_FOR_THIRD_ARGUMENT) + AC_MSG_RESULT($ac_cv_check_getpeername_accepts_size_t) + if test "$ac_cv_check_getpeername_accepts_size_t" = yes; then + AC_DEFINE(GETPEERNAME_ACCEPTS_SIZE_T_FOR_THIRD_ARGUMENT) + fi fi dnl dnl ------ tcpd diff --git a/ill/Makefile.am b/ill/Makefile.am index 89f3ecf..c3b0490 100644 --- a/ill/Makefile.am +++ b/ill/Makefile.am @@ -1,4 +1,4 @@ -## $Id: Makefile.am,v 1.8 2002-04-15 09:44:44 adam Exp $ +## $Id: Makefile.am,v 1.9 2002-09-11 21:25:57 adam Exp $ AM_CPPFLAGS=-I$(top_srcdir)/include @@ -8,8 +8,6 @@ EXTRA_DIST=$(tabdata_DATA) noinst_LTLIBRARIES=libill.la -LIBS = - libill_la_SOURCES=ill-core.c item-req.c ill-get.c $(srcdir)/ill-core.c \ diff --git a/odr/Makefile.am b/odr/Makefile.am index 37ef25b..988eedc 100644 --- a/odr/Makefile.am +++ b/odr/Makefile.am @@ -1,11 +1,9 @@ -## $Id: Makefile.am,v 1.6 2002-07-25 12:51:08 adam Exp $ +## $Id: Makefile.am,v 1.7 2002-09-11 21:25:57 adam Exp $ noinst_LTLIBRARIES = libodr.la AM_CPPFLAGS=-I$(top_srcdir)/include -LIBS = - libodr_la_SOURCES = odr_bool.c ber_bool.c ber_len.c ber_tag.c odr_util.c \ odr_null.c ber_null.c odr_int.c ber_int.c odr_tag.c odr_cons.c \ odr_seq.c odr_oct.c ber_oct.c odr_bit.c ber_bit.c odr_oid.c \ diff --git a/retrieval/Makefile.am b/retrieval/Makefile.am index fbc9ee0..aff1919 100644 --- a/retrieval/Makefile.am +++ b/retrieval/Makefile.am @@ -1,9 +1,7 @@ -## $Id: Makefile.am,v 1.7 2002-08-28 12:48:47 adam Exp $ +## $Id: Makefile.am,v 1.8 2002-09-11 21:25:57 adam Exp $ noinst_LTLIBRARIES=libret.la -LIBS = - libret_la_SOURCES = d1_handle.c d1_read.c d1_attset.c d1_tagset.c d1_absyn.c \ d1_grs.c d1_sutrs.c d1_varset.c d1_espec.c d1_doespec.c d1_map.c d1_marc.c \ d1_write.c d1_expout.c d1_sumout.c d1_soif.c d1_prtree.c d1_if.c diff --git a/server/Makefile.am b/server/Makefile.am index 04a013d..9c209d5 100644 --- a/server/Makefile.am +++ b/server/Makefile.am @@ -1,4 +1,4 @@ -## $Id: Makefile.am,v 1.6 2002-04-15 09:44:44 adam Exp $ +## $Id: Makefile.am,v 1.7 2002-09-11 21:25:57 adam Exp $ noinst_LTLIBRARIES=libserver.la @@ -7,6 +7,4 @@ libserver_la_SOURCES = eventl.c seshigh.c statserv.c requestq.c tcpdchk.c \ EXTRA_DIST=service.c -LIBS = - AM_CPPFLAGS=-I$(top_srcdir)/include diff --git a/util/Makefile.am b/util/Makefile.am index 33cab0c..781da6e 100644 --- a/util/Makefile.am +++ b/util/Makefile.am @@ -1,6 +1,6 @@ ## Copyright (C) 1994-2001, Index Data ## All rights reserved. -## $Id: Makefile.am,v 1.12 2002-08-27 14:02:13 adam Exp $ +## $Id: Makefile.am,v 1.13 2002-09-11 21:25:57 adam Exp $ noinst_LTLIBRARIES = libutil.la @@ -10,8 +10,6 @@ bin_SCRIPTS = yaz-comp EXTRA_DIST = yaz-comp cvs-date.tcl -LIBS = - AM_CPPFLAGS=-I$(top_srcdir)/include noinst_PROGRAMS = marcdump yaziconv diff --git a/z39.50/Makefile.am b/z39.50/Makefile.am index 541c537..9e2b397 100644 --- a/z39.50/Makefile.am +++ b/z39.50/Makefile.am @@ -1,4 +1,4 @@ -## $Id: Makefile.am,v 1.10 2002-04-15 09:44:44 adam Exp $ +## $Id: Makefile.am,v 1.11 2002-09-11 21:25:57 adam Exp $ AM_CPPFLAGS=-I$(top_srcdir)/include @@ -9,8 +9,6 @@ tabdata_DATA=datetime.asn esupdate.asn univres.asn z3950v3.asn z.tcl \ esadmin.asn charneg-3.asn EXTRA_DIST=$(tabdata_DATA) -LIBS = - YAZCOMP = $(top_srcdir)/util/yaz-comp libz39_50_la_SOURCES = z-accdes1.c z-accform1.c z-acckrb1.c z-core.c \ diff --git a/zutil/Makefile.am b/zutil/Makefile.am index 98f28f0..3cc9b75 100644 --- a/zutil/Makefile.am +++ b/zutil/Makefile.am @@ -1,9 +1,7 @@ -## $Id: Makefile.am,v 1.10 2002-05-18 09:52:37 oleg Exp $ +## $Id: Makefile.am,v 1.11 2002-09-11 21:25:57 adam Exp $ noinst_LTLIBRARIES = libzutil.la AM_CPPFLAGS=-I$(top_srcdir)/include -LIBS = - libzutil_la_SOURCES = zget.c yaz-ccl.c diagbib1.c logrpn.c \ otherinfo.c pquery.c sortspec.c z3950oid.c charneg.c -- 1.7.10.4