Build: Explicitly link against mLib or catacomb.

This avoids an ugly double-link in the server.  Doesn't make anything
actually work better, though.

diff --git a/client/Makefile.am b/client/Makefile.am
index dbbc25796d90fbd9d29e08e4a7e2fa310dd4df2e..4e03c3be2cff4de63d85f8deb9ceadb250158c0b 100644 (file)
--- a/client/Makefile.am
+++ b/client/Makefile.am
@@ -28,12 +28,13 @@ include $(top_srcdir)/vars.am
 bin_PROGRAMS            =
 man_MANS                =
 
+LDADD                   = $(libtripe) $(mLib_LIBS)
+
 ###--------------------------------------------------------------------------
 ### Client program.
 
 bin_PROGRAMS           += tripectl
 
-tripectl_LDADD          = $(libtripe)
 tripectl_SOURCES        = tripectl.c
 
 ## Manual page.

diff --git a/configure.ac b/configure.ac
index c285d619bdc508a18347c402b0c9bd7e1bdd903e..aa775b7bd0acb68074390c0851e345a9ed3b7e65 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -61,7 +61,6 @@ PKG_CHECK_MODULES([mLib], [mLib >= 2.0.4])
 PKG_CHECK_MODULES([catacomb], [catacomb >= 2.1.1])
 
 CFLAGS="$CFLAGS $mLib_CFLAGS $catacomb_CFLAGS"
-LIBS="$LIBS $mLib_LIBS"
 
 dnl--------------------------------------------------------------------------
 dnl Directories to install things into.

diff --git a/pkstream/Makefile.am b/pkstream/Makefile.am
index faafe0a72adc4a71a75a948121af2e08c385e3ca..a6cebddd889ab68a9bf0edb963f7de2d93abae9b 100644 (file)
--- a/pkstream/Makefile.am
+++ b/pkstream/Makefile.am
@@ -28,6 +28,8 @@ include $(top_srcdir)/vars.am
 bin_PROGRAMS            =
 man_MANS                =
 
+LDADD                   = $(mLib_LIBS)
+
 ###--------------------------------------------------------------------------
 ### Packet-streaming proxy.
 

diff --git a/proxy/Makefile.am b/proxy/Makefile.am
index 54add7ec5545177d7f317594310f11720eca0227..0d4e516d9ec68d193b2645795b8d3af892027d43 100644 (file)
--- a/proxy/Makefile.am
+++ b/proxy/Makefile.am
@@ -28,6 +28,8 @@ include $(top_srcdir)/vars.am
 bin_PROGRAMS            =
 man_MANS                =
 
+LDADD                   = $mLib_LIBS
+
 ###--------------------------------------------------------------------------
 ### Proxy.
 

diff --git a/server/Makefile.am b/server/Makefile.am
index e033ab0cb9d573f93576633b6ee466cac2f3989c..3c050a109a566ac1b22c06f332836200f0287bb4 100644 (file)
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -28,13 +28,14 @@ include $(top_srcdir)/vars.am
 sbin_PROGRAMS           =
 man_MANS                =
 
+LDADD                   = $(libtripe) $(catacomb_LIBS)
+
 ###--------------------------------------------------------------------------
 ### The main server.
 
 sbin_PROGRAMS          += tripe
 
 tripe_SOURCES           =
-tripe_LDADD             = $(libtripe) $(catacomb_LIBS)
 
 ## Main header file.
 tripe_SOURCES          += tripe.h

diff --git a/uslip/Makefile.am b/uslip/Makefile.am
index 182f839149d7383187a3ee16fee6501088df79c1..d722857844846e66c49c9ea8f9855662dd5841f2 100644 (file)
--- a/uslip/Makefile.am
+++ b/uslip/Makefile.am
@@ -28,6 +28,8 @@ include $(top_srcdir)/vars.am
 bin_PROGRAMS            =
 man_MANS                =
 
+LDADD                   = $(mLib_LIBS)
+
 ###--------------------------------------------------------------------------
 ### Fake slip interface.