From: Henrik Nordstrom Date: Thu, 5 Nov 2009 23:56:46 +0000 (+0100) Subject: Move XTRA_LIBS into LDADD rules to avoid bad dependency calculation X-Git-Tag: SQUID_3_2_0_1~608 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5dbaae6d43e734199cca90829d350548b458b955;p=thirdparty%2Fsquid.git Move XTRA_LIBS into LDADD rules to avoid bad dependency calculation Having XTRA_LIBS in COMMON_LIBS is not a good idea as COMMON_LIBS is also a dependency and should only contain our generated libs --- diff --git a/src/Makefile.am b/src/Makefile.am index 1c8717f664..8deb281bce 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -166,8 +166,7 @@ COMMON_LIBS = \ auth/libauth.la \ acl/libapi.la \ ip/libip.la \ - fs/libfs.la \ - @XTRA_LIBS@ + fs/libfs.la ## Loadable Modules needs lib/libLtdl stuff INCLUDES += -I$(top_srcdir)/lib -I$(top_srcdir)/lib/libLtdl @@ -551,7 +550,8 @@ squid_LDADD = \ @SSLLIB@ \ @EPOLL_LIBS@ \ @MINGW_LIBS@ \ - @KRB5LIBS@ + @KRB5LIBS@ \ + @XTRA_LIBS@ squid_DEPENDENCIES = $(top_builddir)/lib/libmiscutil.a \ @DISK_LIBS@ \ @DISK_LINKOBJS@ \ @@ -639,7 +639,8 @@ ufsdump_LDADD = \ @SSLLIB@ \ -L$(top_builddir)/lib -lmiscutil \ @EPOLL_LIBS@ \ - @MINGW_LIBS@ + @MINGW_LIBS@ \ + @XTRA_LIBS@ ufsdump_DEPENDENCIES = $(top_builddir)/lib/libmiscutil.a \ $(COMMON_LIBS) \ @DISK_LIBS@ \ @@ -657,7 +658,12 @@ sysconf_DATA = \ data_DATA = \ mib.txt -LDADD = $(COMMON_LIBS) -L../lib -lmiscutil @EPOLL_LIBS@ @MINGW_LIBS@ +LDADD = $(COMMON_LIBS)\ + -L../lib \ + -lmiscutil \ + @EPOLL_LIBS@ \ + @MINGW_LIBS@ \ + @XTRA_LIBS@ EXTRA_DIST = \ cf_gen_defines \ @@ -945,7 +951,8 @@ tests_testHttpReply_LDADD=\ ip/libip.la \ @SQUID_CPPUNIT_LIBS@ \ @SQUID_CPPUNIT_LA@ \ - -L../lib -lmiscutil + -L../lib -lmiscutil \ + @XTRA_LIBS@ tests_testHttpReply_DEPENDENCIES= @SQUID_CPPUNIT_LA@ \ $(top_builddir)/lib/libmiscutil.a @@ -984,7 +991,8 @@ tests_testAuth_LDADD= \ -L../lib -lmiscutil \ @REGEXLIB@ \ @SQUID_CPPUNIT_LIBS@ \ - @SSLLIB@ + @SSLLIB@ \ + @XTRA_LIBS@ \ tests_testAuth_LDFLAGS = $(LIBADD_DL) tests_testAuth_DEPENDENCIES = $(top_builddir)/lib/libmiscutil.a \ @SQUID_CPPUNIT_LA@ @@ -1046,7 +1054,8 @@ tests_testACLMaxUserIP_LDADD= \ -L../lib -lmiscutil \ @REGEXLIB@ \ @SQUID_CPPUNIT_LIBS@ \ - @SSLLIB@ + @SSLLIB@ \ + @XTRA_LIBS@ tests_testACLMaxUserIP_LDFLAGS = $(LIBADD_DL) tests_testACLMaxUserIP_DEPENDENCIES = \ @SQUID_CPPUNIT_LA@ @@ -1063,7 +1072,8 @@ nodist_tests_testBoilerplate_SOURCES = \ tests_testBoilerplate_LDADD= \ -L../lib -lmiscutil \ @SQUID_CPPUNIT_LIBS@ \ - @SSLLIB@ + @SSLLIB@ \ + @XTRA_LIBS@ tests_testBoilerplate_LDFLAGS = $(LIBADD_DL) tests_testBoilerplate_DEPENDENCIES = \ @SQUID_CPPUNIT_LA@ @@ -1208,7 +1218,8 @@ tests_testCacheManager_LDADD = \ @SQUID_CPPUNIT_LIBS@ \ @SQUID_CPPUNIT_LA@ \ @SSLLIB@ \ - @KRB5LIBS@ + @KRB5LIBS@ \ + @XTRA_LIBS@ tests_testCacheManager_LDFLAGS = $(LIBADD_DL) tests_testCacheManager_DEPENDENCIES = $(top_builddir)/lib/libmiscutil.a \ @REPL_OBJS@ \ @@ -1228,7 +1239,8 @@ tests_testDiskIO_LDADD = \ @DISK_LIBS@ \ @AIOLIB@ \ $(COMMON_LIBS) \ - SquidConfig.o + SquidConfig.o \ + @XTRA_LIBS@ tests_testDiskIO_LDFLAGS = $(LIBADD_DL) tests_testDiskIO_DEPENDENCIES = $(top_builddir)/lib/libmiscutil.a \ @@ -1380,7 +1392,8 @@ tests_testEvent_LDADD = \ @SQUID_CPPUNIT_LIBS@ \ @SQUID_CPPUNIT_LA@ \ @SSLLIB@ \ - @KRB5LIBS@ + @KRB5LIBS@ \ + @XTRA_LIBS@ tests_testEvent_LDFLAGS = $(LIBADD_DL) tests_testEvent_DEPENDENCIES = $(top_builddir)/lib/libmiscutil.a \ @REPL_OBJS@ \ @@ -1528,7 +1541,8 @@ tests_testEventLoop_LDADD = \ @SQUID_CPPUNIT_LIBS@ \ @SQUID_CPPUNIT_LA@ \ @SSLLIB@ \ - @KRB5LIBS@ + @KRB5LIBS@ \ + @XTRA_LIBS@ tests_testEventLoop_LDFLAGS = $(LIBADD_DL) tests_testEventLoop_DEPENDENCIES = $(top_builddir)/lib/libmiscutil.a \ @REPL_OBJS@ \ @@ -1671,7 +1685,8 @@ tests_test_http_range_LDADD = \ @SQUID_CPPUNIT_LIBS@ \ @SQUID_CPPUNIT_LA@ \ @SSLLIB@ \ - @KRB5LIBS@ + @KRB5LIBS@ \ + @XTRA_LIBS@ tests_test_http_range_LDFLAGS = $(LIBADD_DL) tests_test_http_range_DEPENDENCIES = \ @SQUID_CPPUNIT_LA@ @@ -1819,7 +1834,8 @@ tests_testHttpRequest_LDADD = \ @SQUID_CPPUNIT_LIBS@ \ @SQUID_CPPUNIT_LA@ \ @SSLLIB@ \ - @KRB5LIBS@ + @KRB5LIBS@ \ + @XTRA_LIBS@ tests_testHttpRequest_LDFLAGS = $(LIBADD_DL) tests_testHttpRequest_DEPENDENCIES = $(top_builddir)/lib/libmiscutil.a \ @REPL_OBJS@ \ @@ -1896,7 +1912,8 @@ tests_testStore_LDADD= \ -L../lib -lmiscutil \ @REGEXLIB@ \ @SQUID_CPPUNIT_LIBS@ \ - @SSLLIB@ + @SSLLIB@ \ + @XTRA_LIBS@ tests_testStore_LDFLAGS = $(LIBADD_DL) tests_testStore_DEPENDENCIES = $(top_builddir)/lib/libmiscutil.a \ @SQUID_CPPUNIT_LA@ @@ -1920,7 +1937,8 @@ tests_testString_LDADD = \ -L../lib -lmiscutil \ @REGEXLIB@ \ @SQUID_CPPUNIT_LIBS@ \ - @SSLLIB@ + @SSLLIB@ \ + @XTRA_LIBS@ tests_testString_LDFLAGS = $(LIBADD_DL) tests_testString_DEPENDENCIES = $(top_builddir)/lib/libmiscutil.a \ @SQUID_CPPUNIT_LA@ @@ -1968,7 +1986,8 @@ SWAP_TEST_LDADD = \ @AIOLIB@ \ -L../lib -lmiscutil \ acl/libapi.la \ - @SQUID_CPPUNIT_LIBS@ + @SQUID_CPPUNIT_LIBS@ \ + @XTRA_LIBS@ SWAP_TEST_DS =\ $(top_builddir)/lib/libmiscutil.a \ repl_modules.o \ @@ -1990,7 +2009,8 @@ nodist_tests_testUfs_SOURCES = \ tests_testUfs_LDADD = \ $(SWAP_TEST_LDADD) \ $(COMMON_LIBS) \ - @SSLLIB@ + @SSLLIB@ \ + @XTRA_LIBS@ tests_testUfs_LDFLAGS = $(LIBADD_DL) tests_testUfs_DEPENDENCIES = \ $(SWAP_TEST_DS) @@ -2006,7 +2026,8 @@ nodist_tests_testCoss_SOURCES = \ tests_testCoss_LDADD = \ libsquid.la \ $(SWAP_TEST_LDADD) \ - @SSLLIB@ + @SSLLIB@ \ + @XTRA_LIBS@ tests_testCoss_LDFLAGS = $(LIBADD_DL) tests_testCoss_DEPENDENCIES = \ $(SWAP_TEST_DS) @@ -2020,7 +2041,8 @@ nodist_tests_testNull_SOURCES = \ $(SWAP_TEST_GEN_SOURCES) tests_testNull_LDADD = \ $(SWAP_TEST_LDADD) \ - @SSLLIB@ + @SSLLIB@ \ + @XTRA_LIBS@ tests_testNull_LDFLAGS = $(LIBADD_DL) tests_testNull_DEPENDENCIES = \ $(SWAP_TEST_DS) @@ -2168,7 +2190,8 @@ tests_testURL_LDADD = \ @SQUID_CPPUNIT_LIBS@ \ @SQUID_CPPUNIT_LA@ \ @SSLLIB@ \ - @KRB5LIBS@ + @KRB5LIBS@ \ + @XTRA_LIBS@ tests_testURL_LDFLAGS = $(LIBADD_DL) tests_testURL_DEPENDENCIES = $(top_builddir)/lib/libmiscutil.a \ @REPL_OBJS@ \