From 7bd7331ea55fc27573035d343fe949cc15fa9047 Mon Sep 17 00:00:00 2001 Message-Id: <7bd7331ea55fc27573035d343fe949cc15fa9047.1715014040.git.mdw@distorted.org.uk> From: Mark Wooding Date: Mon, 29 Dec 2008 10:21:35 +0000 Subject: [PATCH] Build: Explicitly link against mLib or catacomb. Organization: Straylight/Edgeware From: Mark Wooding This avoids an ugly double-link in the server. Doesn't make anything actually work better, though. --- client/Makefile.am | 3 ++- configure.ac | 1 - pkstream/Makefile.am | 2 ++ proxy/Makefile.am | 2 ++ server/Makefile.am | 3 ++- uslip/Makefile.am | 2 ++ 6 files changed, 10 insertions(+), 3 deletions(-) diff --git a/client/Makefile.am b/client/Makefile.am index dbbc2579..4e03c3be 100644 --- 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 c285d619..aa775b7b 100644 --- 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 faafe0a7..a6cebddd 100644 --- 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 54add7ec..0d4e516d 100644 --- 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 e033ab0c..3c050a10 100644 --- 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 182f8391..d7228578 100644 --- 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. -- [mdw]