chiark / gitweb /
Build: Explicitly link against mLib or catacomb.
authorMark Wooding <mdw@distorted.org.uk>
Mon, 29 Dec 2008 10:21:35 +0000 (10:21 +0000)
committerMark Wooding <mdw@distorted.org.uk>
Mon, 29 Dec 2008 10:21:35 +0000 (10:21 +0000)
This avoids an ugly double-link in the server.  Doesn't make anything
actually work better, though.

client/Makefile.am
configure.ac
pkstream/Makefile.am
proxy/Makefile.am
server/Makefile.am
uslip/Makefile.am

index dbbc257..4e03c3b 100644 (file)
@@ -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.
index c285d61..aa775b7 100644 (file)
@@ -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.
index faafe0a..a6cebdd 100644 (file)
@@ -28,6 +28,8 @@ include $(top_srcdir)/vars.am
 bin_PROGRAMS            =
 man_MANS                =
 
+LDADD                   = $(mLib_LIBS)
+
 ###--------------------------------------------------------------------------
 ### Packet-streaming proxy.
 
index 54add7e..0d4e516 100644 (file)
@@ -28,6 +28,8 @@ include $(top_srcdir)/vars.am
 bin_PROGRAMS            =
 man_MANS                =
 
+LDADD                   = $mLib_LIBS
+
 ###--------------------------------------------------------------------------
 ### Proxy.
 
index e033ab0..3c050a1 100644 (file)
@@ -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
index 182f839..d722857 100644 (file)
@@ -28,6 +28,8 @@ include $(top_srcdir)/vars.am
 bin_PROGRAMS            =
 man_MANS                =
 
+LDADD                   = $(mLib_LIBS)
+
 ###--------------------------------------------------------------------------
 ### Fake slip interface.