TS-3739 TS-3427 Eliminate superflous -Ilib
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/342f9e2c Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/342f9e2c Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/342f9e2c Branch: refs/heads/master Commit: 342f9e2c4b760ea9bb77c13fb7c46a44e4d338bb Parents: 36e1dd0 Author: Leif Hedstrom <[email protected]> Authored: Thu Jul 9 22:47:17 2015 -0600 Committer: Leif Hedstrom <[email protected]> Committed: Thu Jul 9 22:47:17 2015 -0600 ---------------------------------------------------------------------- cmd/traffic_crashlog/Makefile.am | 1 - cmd/traffic_layout/Makefile.am | 1 - cmd/traffic_top/Makefile.am | 1 - iocore/aio/Makefile.am | 1 - iocore/cache/Makefile.am | 1 - iocore/cluster/Makefile.am | 1 - iocore/dns/Makefile.am | 1 - iocore/hostdb/Makefile.am | 1 - iocore/net/Makefile.am | 1 - lib/atscppapi/examples/async_timer/Makefile.am | 1 + lib/atscppapi/examples/boom/Makefile.am | 1 + lib/atscppapi/examples/intercept/Makefile.am | 1 - lib/records/Makefile.am | 1 - lib/tsconfig/Makefile.am | 1 - mgmt/Makefile.am | 3 +-- mgmt/api/Makefile.am | 1 - mgmt/cluster/Makefile.am | 3 +-- mgmt/utils/Makefile.am | 1 - proxy/Makefile.am | 1 - proxy/congest/Makefile.am | 1 - proxy/http/Makefile.am | 1 - proxy/http/remap/Makefile.am | 1 - proxy/http2/Makefile.am | 1 - proxy/logging/Makefile.am | 1 - proxy/spdy/Makefile.am | 1 - tools/Makefile.am | 2 +- 26 files changed, 5 insertions(+), 26 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/342f9e2c/cmd/traffic_crashlog/Makefile.am ---------------------------------------------------------------------- diff --git a/cmd/traffic_crashlog/Makefile.am b/cmd/traffic_crashlog/Makefile.am index 131e954..fa537a8 100644 --- a/cmd/traffic_crashlog/Makefile.am +++ b/cmd/traffic_crashlog/Makefile.am @@ -20,7 +20,6 @@ bin_PROGRAMS = traffic_crashlog AM_CPPFLAGS = \ $(iocore_include_dirs) \ -I$(top_srcdir)/lib \ - -I$(top_builddir)/lib \ -I$(top_srcdir)/lib/ts \ -I$(top_builddir)/lib/ts \ -I$(top_srcdir)/lib/records \ http://git-wip-us.apache.org/repos/asf/trafficserver/blob/342f9e2c/cmd/traffic_layout/Makefile.am ---------------------------------------------------------------------- diff --git a/cmd/traffic_layout/Makefile.am b/cmd/traffic_layout/Makefile.am index cc6361e..f0998ca 100644 --- a/cmd/traffic_layout/Makefile.am +++ b/cmd/traffic_layout/Makefile.am @@ -20,7 +20,6 @@ bin_PROGRAMS = traffic_layout AM_CPPFLAGS = \ $(iocore_include_dirs) \ -I$(top_srcdir)/lib \ - -I$(top_builddir)/lib \ -I$(top_srcdir)/lib/ts \ -I$(top_builddir)/lib/ts \ -I$(top_srcdir)/lib/records \ http://git-wip-us.apache.org/repos/asf/trafficserver/blob/342f9e2c/cmd/traffic_top/Makefile.am ---------------------------------------------------------------------- diff --git a/cmd/traffic_top/Makefile.am b/cmd/traffic_top/Makefile.am index de4bf02..1fba7be 100644 --- a/cmd/traffic_top/Makefile.am +++ b/cmd/traffic_top/Makefile.am @@ -21,7 +21,6 @@ if BUILD_TRAFFIC_TOP AM_CPPFLAGS = \ $(iocore_include_dirs) \ -I$(top_srcdir)/lib \ - -I$(top_builddir)/lib \ -I$(top_srcdir)/lib/ts \ -I$(top_builddir)/lib/ts \ -I$(top_srcdir)/mgmt/api/include \ http://git-wip-us.apache.org/repos/asf/trafficserver/blob/342f9e2c/iocore/aio/Makefile.am ---------------------------------------------------------------------- diff --git a/iocore/aio/Makefile.am b/iocore/aio/Makefile.am index dce5abd..bb9c1ca 100644 --- a/iocore/aio/Makefile.am +++ b/iocore/aio/Makefile.am @@ -19,7 +19,6 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/iocore/eventsystem \ -I$(top_srcdir)/lib \ - -I$(top_builddir)/lib \ -I$(top_srcdir)/lib/records \ -I$(top_srcdir)/lib/ts \ -I$(top_builddir)/lib/ts http://git-wip-us.apache.org/repos/asf/trafficserver/blob/342f9e2c/iocore/cache/Makefile.am ---------------------------------------------------------------------- diff --git a/iocore/cache/Makefile.am b/iocore/cache/Makefile.am index 97505ce..1e26a1e 100644 --- a/iocore/cache/Makefile.am +++ b/iocore/cache/Makefile.am @@ -19,7 +19,6 @@ AM_CPPFLAGS = \ $(iocore_include_dirs) \ -I$(top_srcdir)/lib \ - -I$(top_builddir)/lib \ -I$(top_srcdir)/lib/records \ -I$(top_srcdir)/lib/ts \ -I$(top_builddir)/lib/ts \ http://git-wip-us.apache.org/repos/asf/trafficserver/blob/342f9e2c/iocore/cluster/Makefile.am ---------------------------------------------------------------------- diff --git a/iocore/cluster/Makefile.am b/iocore/cluster/Makefile.am index 1e1fb15..8d526c6 100644 --- a/iocore/cluster/Makefile.am +++ b/iocore/cluster/Makefile.am @@ -18,7 +18,6 @@ AM_CPPFLAGS = \ $(iocore_include_dirs) \ - -I$(top_builddir)/lib \ -I$(top_srcdir)/lib \ -I$(top_srcdir)/lib/records \ -I$(top_srcdir)/lib/ts \ http://git-wip-us.apache.org/repos/asf/trafficserver/blob/342f9e2c/iocore/dns/Makefile.am ---------------------------------------------------------------------- diff --git a/iocore/dns/Makefile.am b/iocore/dns/Makefile.am index 222d3cf..46aa8d4 100644 --- a/iocore/dns/Makefile.am +++ b/iocore/dns/Makefile.am @@ -19,7 +19,6 @@ AM_CPPFLAGS = \ $(iocore_include_dirs) \ -I$(top_srcdir)/lib \ - -I$(top_builddir)/lib \ -I$(top_srcdir)/lib/records \ -I$(top_srcdir)/lib/ts \ -I$(top_builddir)/lib/ts \ http://git-wip-us.apache.org/repos/asf/trafficserver/blob/342f9e2c/iocore/hostdb/Makefile.am ---------------------------------------------------------------------- diff --git a/iocore/hostdb/Makefile.am b/iocore/hostdb/Makefile.am index c475a81..98c0414 100644 --- a/iocore/hostdb/Makefile.am +++ b/iocore/hostdb/Makefile.am @@ -19,7 +19,6 @@ AM_CPPFLAGS = \ $(iocore_include_dirs) \ -I$(top_srcdir)/lib \ - -I$(top_builddir)/lib \ -I$(top_srcdir)/lib/records \ -I$(top_srcdir)/lib/ts \ -I$(top_builddir)/lib/ts \ http://git-wip-us.apache.org/repos/asf/trafficserver/blob/342f9e2c/iocore/net/Makefile.am ---------------------------------------------------------------------- diff --git a/iocore/net/Makefile.am b/iocore/net/Makefile.am index b8cfacd..81c07ab 100644 --- a/iocore/net/Makefile.am +++ b/iocore/net/Makefile.am @@ -19,7 +19,6 @@ AM_CPPFLAGS = \ $(iocore_include_dirs) \ -I$(top_srcdir)/lib \ - -I$(top_builddir)/lib \ -I$(top_srcdir)/lib/records \ -I$(top_srcdir)/lib/ts \ -I$(top_builddir)/lib/ts \ http://git-wip-us.apache.org/repos/asf/trafficserver/blob/342f9e2c/lib/atscppapi/examples/async_timer/Makefile.am ---------------------------------------------------------------------- diff --git a/lib/atscppapi/examples/async_timer/Makefile.am b/lib/atscppapi/examples/async_timer/Makefile.am index 5a5ea45..0d66734 100644 --- a/lib/atscppapi/examples/async_timer/Makefile.am +++ b/lib/atscppapi/examples/async_timer/Makefile.am @@ -18,6 +18,7 @@ include $(top_srcdir)/build/plugins.mk AM_CPPFLAGS += -I$(top_srcdir)/lib/atscppapi/src/include -Wno-unused-variable + target=AsyncTimer.so pkglib_LTLIBRARIES = AsyncTimer.la AsyncTimer_la_SOURCES = AsyncTimer.cc http://git-wip-us.apache.org/repos/asf/trafficserver/blob/342f9e2c/lib/atscppapi/examples/boom/Makefile.am ---------------------------------------------------------------------- diff --git a/lib/atscppapi/examples/boom/Makefile.am b/lib/atscppapi/examples/boom/Makefile.am index ac56c7d..4e54413 100644 --- a/lib/atscppapi/examples/boom/Makefile.am +++ b/lib/atscppapi/examples/boom/Makefile.am @@ -18,6 +18,7 @@ include $(top_srcdir)/build/plugins.mk AM_CPPFLAGS += -I$(top_srcdir)/lib/atscppapi/src/include -Wno-unused-variable + target=boom.so pkglib_LTLIBRARIES = boom.la boom_la_SOURCES = boom.cc http://git-wip-us.apache.org/repos/asf/trafficserver/blob/342f9e2c/lib/atscppapi/examples/intercept/Makefile.am ---------------------------------------------------------------------- diff --git a/lib/atscppapi/examples/intercept/Makefile.am b/lib/atscppapi/examples/intercept/Makefile.am index 1d7aa29..65881eb 100644 --- a/lib/atscppapi/examples/intercept/Makefile.am +++ b/lib/atscppapi/examples/intercept/Makefile.am @@ -14,7 +14,6 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -# include $(top_srcdir)/build/plugins.mk http://git-wip-us.apache.org/repos/asf/trafficserver/blob/342f9e2c/lib/records/Makefile.am ---------------------------------------------------------------------- diff --git a/lib/records/Makefile.am b/lib/records/Makefile.am index b612405..b38e279 100644 --- a/lib/records/Makefile.am +++ b/lib/records/Makefile.am @@ -23,7 +23,6 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/mgmt/api/include \ -I$(top_srcdir)/mgmt/utils \ -I$(top_srcdir)/lib \ - -I$(top_builddir)/lib \ -I$(top_srcdir)/lib/ts \ -I$(top_builddir)/lib/ts http://git-wip-us.apache.org/repos/asf/trafficserver/blob/342f9e2c/lib/tsconfig/Makefile.am ---------------------------------------------------------------------- diff --git a/lib/tsconfig/Makefile.am b/lib/tsconfig/Makefile.am index c74b260..19e1acd 100644 --- a/lib/tsconfig/Makefile.am +++ b/lib/tsconfig/Makefile.am @@ -25,7 +25,6 @@ AM_YFLAGS = --yacc -d -p tsconfig AM_CPPFLAGS = \ -I$(top_srcdir)/lib \ - -I$(top_builddir)/lib \ -I$(top_srcdir)/lib/ts \ -I$(top_builddir)/lib/ts http://git-wip-us.apache.org/repos/asf/trafficserver/blob/342f9e2c/mgmt/Makefile.am ---------------------------------------------------------------------- diff --git a/mgmt/Makefile.am b/mgmt/Makefile.am index e65c7d4..cc0cb82 100644 --- a/mgmt/Makefile.am +++ b/mgmt/Makefile.am @@ -36,8 +36,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/lib/records \ -I$(top_srcdir)/lib/ts \ -I$(top_builddir)/lib/ts \ - -I$(top_srcdir)/lib \ - -I$(top_builddir)/lib + -I$(top_srcdir)/lib libmgmt_c_la_SOURCES = \ RecordsConfig.cc \ http://git-wip-us.apache.org/repos/asf/trafficserver/blob/342f9e2c/mgmt/api/Makefile.am ---------------------------------------------------------------------- diff --git a/mgmt/api/Makefile.am b/mgmt/api/Makefile.am index b34cb29..62adea1 100644 --- a/mgmt/api/Makefile.am +++ b/mgmt/api/Makefile.am @@ -29,7 +29,6 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/mgmt/utils \ -I$(top_srcdir)/mgmt/api/include \ -I$(top_srcdir)/lib \ - -I$(top_builddir)/lib \ $(LIBUNWIND_CFLAGS) noinst_LTLIBRARIES = libmgmtapilocal.la libmgmtapi.la http://git-wip-us.apache.org/repos/asf/trafficserver/blob/342f9e2c/mgmt/cluster/Makefile.am ---------------------------------------------------------------------- diff --git a/mgmt/cluster/Makefile.am b/mgmt/cluster/Makefile.am index 4b15a8e..404bffc 100644 --- a/mgmt/cluster/Makefile.am +++ b/mgmt/cluster/Makefile.am @@ -24,8 +24,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/mgmt \ -I$(top_srcdir)/mgmt/api/include \ -I$(top_srcdir)/mgmt/utils \ - -I$(top_srcdir)/lib \ - -I$(top_builddir)/lib + -I$(top_srcdir)/lib noinst_LTLIBRARIES = libcluster.la http://git-wip-us.apache.org/repos/asf/trafficserver/blob/342f9e2c/mgmt/utils/Makefile.am ---------------------------------------------------------------------- diff --git a/mgmt/utils/Makefile.am b/mgmt/utils/Makefile.am index 6295810..4324349 100644 --- a/mgmt/utils/Makefile.am +++ b/mgmt/utils/Makefile.am @@ -27,7 +27,6 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/lib/records \ -I$(top_srcdir)/lib/ts \ -I$(top_builddir)/lib/ts \ - -I$(top_builddir)/lib \ -I$(top_srcdir)/lib \ @OPENSSL_INCLUDES@ http://git-wip-us.apache.org/repos/asf/trafficserver/blob/342f9e2c/proxy/Makefile.am ---------------------------------------------------------------------- diff --git a/proxy/Makefile.am b/proxy/Makefile.am index c1c17ae..4935798 100644 --- a/proxy/Makefile.am +++ b/proxy/Makefile.am @@ -49,7 +49,6 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/mgmt/utils \ -I$(top_srcdir)/proxy/api/ts \ -I$(top_srcdir)/lib \ - -I$(top_builddir)/lib \ @OPENSSL_INCLUDES@ # NOTE: it is safe to use AM_LDFLAGS here because we are only building executables. If we start http://git-wip-us.apache.org/repos/asf/trafficserver/blob/342f9e2c/proxy/congest/Makefile.am ---------------------------------------------------------------------- diff --git a/proxy/congest/Makefile.am b/proxy/congest/Makefile.am index 416ad6e..a217582 100644 --- a/proxy/congest/Makefile.am +++ b/proxy/congest/Makefile.am @@ -19,7 +19,6 @@ AM_CPPFLAGS = \ $(iocore_include_dirs) \ -I$(top_srcdir)/lib \ - -I$(top_builddir)/lib \ -I$(top_srcdir)/lib/records \ -I$(top_srcdir)/lib/ts \ -I$(top_builddir)/lib/ts \ http://git-wip-us.apache.org/repos/asf/trafficserver/blob/342f9e2c/proxy/http/Makefile.am ---------------------------------------------------------------------- diff --git a/proxy/http/Makefile.am b/proxy/http/Makefile.am index 478bc1f..5d94ccc 100644 --- a/proxy/http/Makefile.am +++ b/proxy/http/Makefile.am @@ -23,7 +23,6 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/proxy/api/ts \ -I$(top_srcdir)/proxy \ -I$(top_srcdir)/lib \ - -I$(top_builddir)/lib \ -I$(top_srcdir)/lib/records \ -I$(top_srcdir)/lib/ts \ -I$(top_builddir)/lib/ts \ http://git-wip-us.apache.org/repos/asf/trafficserver/blob/342f9e2c/proxy/http/remap/Makefile.am ---------------------------------------------------------------------- diff --git a/proxy/http/remap/Makefile.am b/proxy/http/remap/Makefile.am index e444588..75adad5 100644 --- a/proxy/http/remap/Makefile.am +++ b/proxy/http/remap/Makefile.am @@ -19,7 +19,6 @@ AM_CPPFLAGS = \ $(iocore_include_dirs) \ -I$(top_srcdir)/lib \ - -I$(top_builddir)/lib \ -I$(top_srcdir)/lib/records \ -I$(top_srcdir)/lib/ts \ -I$(top_builddir)/lib/ts \ http://git-wip-us.apache.org/repos/asf/trafficserver/blob/342f9e2c/proxy/http2/Makefile.am ---------------------------------------------------------------------- diff --git a/proxy/http2/Makefile.am b/proxy/http2/Makefile.am index 4e0853c..b8c74d0 100644 --- a/proxy/http2/Makefile.am +++ b/proxy/http2/Makefile.am @@ -20,7 +20,6 @@ AM_CPPFLAGS = \ $(iocore_include_dirs) \ -I$(top_srcdir)/proxy/api/ts \ -I$(top_srcdir)/lib \ - -I$(top_builddir)/lib \ -I$(top_srcdir)/lib/records \ -I$(top_srcdir)/lib/ts \ -I$(top_builddir)/lib/ts \ http://git-wip-us.apache.org/repos/asf/trafficserver/blob/342f9e2c/proxy/logging/Makefile.am ---------------------------------------------------------------------- diff --git a/proxy/logging/Makefile.am b/proxy/logging/Makefile.am index 78a901c..f8220f9 100644 --- a/proxy/logging/Makefile.am +++ b/proxy/logging/Makefile.am @@ -19,7 +19,6 @@ AM_CPPFLAGS = \ $(iocore_include_dirs) \ -I$(top_srcdir)/lib \ - -I$(top_builddir)/lib \ -I$(top_srcdir)/lib/records \ -I$(top_srcdir)/lib/ts \ -I$(top_builddir)/lib/ts \ http://git-wip-us.apache.org/repos/asf/trafficserver/blob/342f9e2c/proxy/spdy/Makefile.am ---------------------------------------------------------------------- diff --git a/proxy/spdy/Makefile.am b/proxy/spdy/Makefile.am index 0cd3e0a..01cba4d 100644 --- a/proxy/spdy/Makefile.am +++ b/proxy/spdy/Makefile.am @@ -20,7 +20,6 @@ AM_CPPFLAGS = \ $(iocore_include_dirs) \ -I$(top_srcdir)/proxy/api/ts \ -I$(top_srcdir)/lib \ - -I$(top_builddir)/lib \ -I$(top_srcdir)/lib/records \ -I$(top_srcdir)/lib/ts \ -I$(top_builddir)/lib/ts \ http://git-wip-us.apache.org/repos/asf/trafficserver/blob/342f9e2c/tools/Makefile.am ---------------------------------------------------------------------- diff --git a/tools/Makefile.am b/tools/Makefile.am index fa0fe86..91cc72e 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -24,7 +24,7 @@ pkgconfig_DATA = trafficserver.pc AM_LDFLAGS = @EXTRA_CXX_LDFLAGS@ @LIBTOOL_LINK_FLAGS@ AM_CPPFLAGS = $(iocore_include_dirs) \ - -I$(top_srcdir)/lib -I$(top_builddir)/lib \ + -I$(top_srcdir)/lib \ -I$(top_srcdir)/lib/ts -I$(top_builddir)/lib/ts \ -I$(top_srcdir)/lib/wccp
