From: Amos Jeffries Date: Tue, 2 Sep 2014 12:12:07 +0000 (-0700) Subject: Fix libsquid-parser.la duplications after trunk merge X-Git-Tag: SQUID_3_5_0_1~75^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d2ac5c4db884e53ed7ba49848b7d289e075ff5ce;p=thirdparty%2Fsquid.git Fix libsquid-parser.la duplications after trunk merge --- diff --git a/src/Makefile.am b/src/Makefile.am index 69c5b65d0b..f42403cd44 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1635,7 +1635,6 @@ tests_testCacheManager_LDADD = \ ipc/libipc.la \ mgr/libmgr.la \ $(SNMP_LIBS) \ - parser/libsquid-parser.la \ $(top_builddir)/lib/libmisccontainers.la \ $(top_builddir)/lib/libmiscencoding.la \ $(top_builddir)/lib/libmiscutil.la \ @@ -2066,7 +2065,6 @@ tests_testEvent_LDADD = \ $(ADAPTATION_LIBS) \ $(ESI_LIBS) \ $(SSL_LIBS) \ - parser/libsquid-parser.la \ $(top_builddir)/lib/libmisccontainers.la \ $(top_builddir)/lib/libmiscencoding.la \ $(top_builddir)/lib/libmiscutil.la \ @@ -2319,7 +2317,6 @@ tests_testEventLoop_LDADD = \ $(ADAPTATION_LIBS) \ $(ESI_LIBS) \ $(SSL_LIBS) \ - parser/libsquid-parser.la \ $(top_builddir)/lib/libmisccontainers.la \ $(top_builddir)/lib/libmiscencoding.la \ $(top_builddir)/lib/libmiscutil.la \ @@ -2570,7 +2567,6 @@ tests_test_http_range_LDADD = \ base/libbase.la \ mgr/libmgr.la \ $(SNMP_LIBS) \ - parser/libsquid-parser.la \ $(top_builddir)/lib/libmisccontainers.la \ $(top_builddir)/lib/libmiscencoding.la \ $(top_builddir)/lib/libmiscutil.la \ @@ -2863,7 +2859,6 @@ tests_testHttpRequest_LDADD = \ $(REPL_OBJS) \ $(ADAPTATION_LIBS) \ $(ESI_LIBS) \ - parser/libsquid-parser.la \ $(top_builddir)/lib/libmisccontainers.la \ $(top_builddir)/lib/libmiscencoding.la \ $(top_builddir)/lib/libmiscutil.la \ @@ -3710,7 +3705,6 @@ tests_testURL_LDADD = \ $(REPL_OBJS) \ $(ADAPTATION_LIBS) \ $(ESI_LIBS) \ - parser/libsquid-parser.la \ $(top_builddir)/lib/libmisccontainers.la \ $(top_builddir)/lib/libmiscencoding.la \ $(top_builddir)/lib/libmiscutil.la \