[trafficserver] 05/11: Cleans up LDADDs in traffic_server

[zw...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

zwoop pushed a commit to branch 8.0.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git

commit ed41c18dd69816da2a312b334480733d27b319c1
Author: Randall Meyer <ra...@yahoo.com>
AuthorDate: Thu Jul 12 12:48:00 2018 -0700

    Cleans up LDADDs in traffic_server
    
    (cherry picked from commit 113fb905f76802fd7dbab24c420e7983530f3411)
---
 src/traffic_server/Makefile.inc | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/traffic_server/Makefile.inc b/src/traffic_server/Makefile.inc
index 804248f..8175f78 100644
--- a/src/traffic_server/Makefile.inc
+++ b/src/traffic_server/Makefile.inc
@@ -62,7 +62,6 @@ endif
 traffic_server_traffic_server_LDADD = \
 	$(top_builddir)/proxy/http/libhttp.a \
 	$(top_builddir)/proxy/http/remap/libhttp_remap.a \
-	$(top_builddir)/proxy/http/remap/libhttp_remap.a \
 	$(top_builddir)/proxy/http2/libhttp2.a \
 	$(top_builddir)/proxy/logging/liblogging.a \
 	$(top_builddir)/proxy/logging/liblogcollation.a \
@@ -76,12 +75,8 @@ traffic_server_traffic_server_LDADD = \
 	$(top_builddir)/iocore/cache/libinkcache.a \
 	$(top_builddir)/iocore/aio/libinkaio.a \
 	$(top_builddir)/lib/ts/libtsutil.la \
-	$(top_builddir)/proxy/libproxy.a
-
-# ToDo: When we remove this, we hould merge the two _LDADD rules here
-traffic_server_traffic_server_LDADD += \
+	$(top_builddir)/proxy/libproxy.a \
 	$(top_builddir)/iocore/net/libinknet.a \
-	$(top_builddir)/iocore/eventsystem/libinkevent.a \
 	$(top_builddir)/lib/records/librecords_p.a \
 	$(top_builddir)/iocore/eventsystem/libinkevent.a \
 	$(top_builddir)/lib/tsconfig/libtsconfig.la \