From 754a69a79a8dd628f6d35234cd7bfa28bb8d8b3a Mon Sep 17 00:00:00 2001 From: Martin Baulig Date: Sat, 10 Oct 1998 23:18:40 +0000 Subject: [PATCH] Removed @libs_xauth@ and -lgdbm from the _LDADD variables since libtool 1998-10-11 Martin Baulig * src/inodedb/Makefile.am: Removed @libs_xauth@ and -lgdbm from the _LDADD variables since libtool automatically gets the dependencies. * src/daemon/Makefile.am: Likewise. * examples/Makefile.am: Likewise. --- ChangeLog | 8 ++++++++ examples/Makefile.am | 13 ++++++------- src/daemon/Makefile.am | 2 +- src/inodedb/Makefile.am | 4 ++-- 4 files changed, 17 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index b9836c14..ea80ca2d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +1998-10-11 Martin Baulig + + * src/inodedb/Makefile.am: Removed @libs_xauth@ and -lgdbm + from the _LDADD variables since libtool automatically gets + the dependencies. + * src/daemon/Makefile.am: Likewise. + * examples/Makefile.am: Likewise. + 1998-10-10 Martin Baulig * configure (LIBGTOP_EXTRA_LIBS): Added `GLIB_LIBS'. diff --git a/examples/Makefile.am b/examples/Makefile.am index 7ba8373d..f10485c0 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -24,7 +24,7 @@ first_SOURCES = first.c first_LDADD = $(top_builddir)/lib/libgtop.la \ $(top_builddir)/sysdeps/common/libgtop_common.la \ $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps.la \ - @INTLLIBS@ @LIBSUPPORT@ @LIBGTOP_EXTRA_LIBS@ + @INTLLIBS@ @LIBSUPPORT@ first_static_SOURCES = $(first_SOURCES) first_static_LDADD = $(first_LDADD) @@ -34,7 +34,7 @@ second_SOURCES = second.c second_LDADD = $(top_builddir)/lib/libgtop.la \ $(top_builddir)/sysdeps/common/libgtop_common.la \ $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps.la \ - @INTLLIBS@ @LIBSUPPORT@ @LIBGTOP_EXTRA_LIBS@ + @INTLLIBS@ @LIBSUPPORT@ second_static_SOURCES = $(second_SOURCES) second_static_LDADD = $(second_LDADD) @@ -44,7 +44,7 @@ procmap_SOURCES = procmap.c procmap_LDADD = $(top_builddir)/lib/libgtop.la \ $(top_builddir)/sysdeps/common/libgtop_common.la \ $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps.la \ - @INTLLIBS@ @LIBSUPPORT@ @LIBGTOP_EXTRA_LIBS@ + @INTLLIBS@ @LIBSUPPORT@ procmap_static_SOURCES = $(procmap_SOURCES) procmap_static_LDADD = $(procmap_LDADD) @@ -61,8 +61,7 @@ third_LDADD = $(top_builddir)/sysdeps/guile/libgtop_guile.la \ $(top_builddir)/lib/libgtop.la \ $(top_builddir)/sysdeps/common/libgtop_common.la \ $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps.la \ - @GUILE_LIBS@ @INTLLIBS@ @LIBSUPPORT@ \ - @LIBGTOP_EXTRA_LIBS@ + @GUILE_LIBS@ @INTLLIBS@ @LIBSUPPORT@ third_static_SOURCES = $(third_SOURCES) third_static_LDADD = $(third_LDADD) @@ -72,7 +71,7 @@ mountlist_SOURCES = mountlist.c mountlist_LDADD = $(top_builddir)/lib/libgtop.la \ $(top_builddir)/sysdeps/common/libgtop_common.la \ $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps.la \ - @INTLLIBS@ @LIBSUPPORT@ @LIBGTOP_EXTRA_LIBS@ + @INTLLIBS@ @LIBSUPPORT@ mountlist_static_SOURCES= $(mountlist_SOURCES) mountlist_static_LDADD = $(mountlist_LDADD) @@ -83,7 +82,7 @@ smp_SOURCES = smp.c smp_LDADD = $(top_builddir)/lib/libgtop.la \ $(top_builddir)/sysdeps/common/libgtop_common.la \ $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps.la \ - @INTLLIBS@ @LIBSUPPORT@ @LIBGTOP_EXTRA_LIBS@ + @INTLLIBS@ @LIBSUPPORT@ smp_static_SOURCES = $(smp_SOURCES) smp_static_LDADD = $(smp_LDADD) diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am index 6bb38d5b..d4288145 100644 --- a/src/daemon/Makefile.am +++ b/src/daemon/Makefile.am @@ -22,7 +22,7 @@ libgtop_daemon_LDADD = $(top_builddir)/lib/libgtop.la \ $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps.la \ @sysdeps_suid_lib@ \ $(suid_sysdeps) $(suid_common)\ - @INTLLIBS@ @LIBSUPPORT@ @X_LIBS@ -lXau + @INTLLIBS@ @LIBSUPPORT@ libgtop_server_SOURCES = server.c slave.c io.c version.c daemon.h libgtop_server_LDADD = $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps_suid.la \ diff --git a/src/inodedb/Makefile.am b/src/inodedb/Makefile.am index 2e09bb57..e9d60dd5 100644 --- a/src/inodedb/Makefile.am +++ b/src/inodedb/Makefile.am @@ -3,11 +3,11 @@ bin_PROGRAMS = mkinodedb file_by_inode mkinodedb_LDADD = $(top_builddir)/lib/libgtop.la \ $(top_builddir)/sysdeps/common/libgtop_common.la \ $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps.la \ - @INTLLIBS@ @LIBSUPPORT@ @libs_xauth@ -lgdbm + @INTLLIBS@ @LIBSUPPORT@ file_by_inode_LDADD = $(top_builddir)/lib/libgtop.la \ $(top_builddir)/sysdeps/common/libgtop_common.la \ $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps.la \ - @INTLLIBS@ @LIBSUPPORT@ @libs_xauth@ -lgdbm + @INTLLIBS@ @LIBSUPPORT@ EXTRA_DIST = README.inodedb