From: Amos Jeffries <squid3@treenet.co.nz>
Date: Wed, 26 Aug 2009 13:14:39 +0000 (+1200)
Subject: Cleanup: shuffle libcompat and libmisc into Common.am as COMPAT_LIB
X-Git-Tag: SQUID_3_2_0_1~761
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f8b57b6ce9acece3e8dcd62debb6bb7c9a31b02c;p=thirdparty%2Fsquid.git

Cleanup: shuffle libcompat and libmisc into Common.am as COMPAT_LIB
---

diff --git a/src/Common.am b/src/Common.am
index 084f108cca..7f4c8d7fc2 100644
--- a/src/Common.am
+++ b/src/Common.am
@@ -23,3 +23,9 @@ INCLUDES = \
 ## make all compiled sources depend on generated files
 ## XXX: Do we really need this? Does auto-dependency tracking work?
 $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h
+
+
+## Because compatibility is almost universal. And the link order is important.
+COMPAT_LIB = \
+	-L$(top_builddir)/lib -lmiscutil \
+	$(top_builddir)/compat/libcompat.la
diff --git a/src/Makefile.am b/src/Makefile.am
index ecc1e1038e..4db4ec7b78 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -197,8 +197,7 @@ libexec_PROGRAMS = \
 cf_gen_SOURCES = cf_gen.cc
 nodist_cf_gen_HEADER = cf_gen_defines.h
 cf_gen_LDADD= \
-	../compat/libcompat.la \
-	-L../lib -lmiscutil \
+	$(COMPAT_LIB) \
 	@XTRA_LIBS@ \
 	@EPOLL_LIBS@ \
 	@MINGW_LIBS@
@@ -531,8 +530,6 @@ nodist_squid_SOURCES = \
 squid_LDADD = \
 	$(COMMON_LIBS) \
 	icmp/libicmp.la icmp/libicmp-core.la \
-        ../compat/libcompat.la \
-	-L../lib \
 	@XTRA_OBJS@ \
 	@DISK_LINKOBJS@ \
 	@REPL_OBJS@ \
@@ -542,8 +539,8 @@ squid_LDADD = \
 	@SNMPLIB@ \
 	${ADAPTATION_LIBS} \
 	${ESI_LIBS} \
+	$(COMPAT_LIB) \
 	@SSLLIB@ \
-	-lmiscutil \
 	@XTRA_LIBS@ \
 	@EPOLL_LIBS@ \
 	@MINGW_LIBS@ 
diff --git a/src/ip/Makefile.am b/src/ip/Makefile.am
index dfbebd1634..38772857dd 100644
--- a/src/ip/Makefile.am
+++ b/src/ip/Makefile.am
@@ -21,9 +21,8 @@ testIpAddress_SOURCES= \
 nodist_testIpAddress_SOURCES= \
 	../tests/testMain.cc
 testIpAddress_LDADD= \
-	$(top_builddir)/compat/libcompat.la \
 	libip.la \
-	-L$(top_builddir)/lib -lmiscutil \
+	$(COMPAT_LIB) \
 	@SQUID_CPPUNIT_LA@ \
 	@SQUID_CPPUNIT_LIBS@
 testIpAddress_LDFLAGS= $(LIBADD_DL)