From 4def53aabb0cc4a50be305d0f0bcb417b3f1e938 Mon Sep 17 00:00:00 2001 From: Martin Baulig Date: Fri, 19 Feb 1999 11:04:10 +0000 Subject: [PATCH] Sometimes @LIBSUPPORT@ references symbols from @INTLLIBS@ so we need to put @INTLLIBS@ last. --- examples/Makefile.am | 16 ++++++++-------- src/daemon/Makefile.am | 4 ++-- src/inodedb/Makefile.am | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/examples/Makefile.am b/examples/Makefile.am index 5b5344b4..4f1d0581 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@ + @LIBSUPPORT@ @INTLLIBS@ 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@ + @LIBSUPPORT@ @INTLLIBS@ 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@ + @LIBSUPPORT@ @INTLLIBS@ @@ -56,7 +56,7 @@ netload_SOURCES = netload.c netload_LDADD = $(top_builddir)/lib/libgtop.la \ $(top_builddir)/sysdeps/common/libgtop_common.la \ $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps.la \ - @INTLLIBS@ @LIBSUPPORT@ + @LIBSUPPORT@ @INTLLIBS@ netload_static_SOURCES = $(netload_SOURCES) netload_static_LDADD = $(netload_LDADD) @@ -66,7 +66,7 @@ sysdeps_SOURCES = sysdeps.c sysdeps_LDADD = $(top_builddir)/lib/libgtop.la \ $(top_builddir)/sysdeps/common/libgtop_common.la \ $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps.la \ - @INTLLIBS@ @LIBSUPPORT@ + @LIBSUPPORT@ @INTLLIBS@ sysdeps_static_SOURCES = $(sysdeps_SOURCES) sysdeps_static_LDADD = $(sysdeps_LDADD) @@ -81,7 +81,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@ + @GUILE_LIBS@ @LIBSUPPORT@ @INTLLIBS@ third_static_SOURCES = $(third_SOURCES) third_static_LDADD = $(third_LDADD) @@ -91,7 +91,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@ + @LIBSUPPORT@ @INTLLIBS@ mountlist_static_SOURCES= $(mountlist_SOURCES) mountlist_static_LDADD = $(mountlist_LDADD) @@ -102,7 +102,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@ + @LIBSUPPORT@ @INTLLIBS@ smp_static_SOURCES = $(smp_SOURCES) smp_static_LDADD = $(smp_LDADD) diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am index 36686440..13a79936 100644 --- a/src/daemon/Makefile.am +++ b/src/daemon/Makefile.am @@ -36,12 +36,12 @@ libgtop_daemon_LDADD = $(top_builddir)/lib/libgtop.la \ @sysdeps_suid_lib@ \ $(suid_sysdeps) $(suid_common)\ $(GLIB_LIBS)\ - @INTLLIBS@ @LIBSUPPORT@ @libs_xauth@ + @LIBSUPPORT@ @INTLLIBS@ @libs_xauth@ 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 \ $(top_builddir)/sysdeps/common/libgtop_suid_common.la \ - @LIBSUPPORT@ + @LIBSUPPORT@ @INTLLIBS@ EXTRA_DIST = server_config.h.in server_config.pl diff --git a/src/inodedb/Makefile.am b/src/inodedb/Makefile.am index c7447218..41115ed1 100644 --- a/src/inodedb/Makefile.am +++ b/src/inodedb/Makefile.am @@ -5,11 +5,11 @@ INCLUDES = @INCLUDES@ mkinodedb_LDADD = $(top_builddir)/lib/libgtop.la \ $(top_builddir)/sysdeps/common/libgtop_common.la \ $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps.la \ - @INTLLIBS@ @LIBSUPPORT@ + @LIBSUPPORT@ @INTLLIBS@ 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@ + @LIBSUPPORT@ @INTLLIBS@ EXTRA_DIST = README.inodedb