You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by mt...@apache.org on 2010/05/21 10:09:03 UTC
svn commit: r946930 - in /trafficserver/traffic/trunk: example/app-template/
iocore/cache/ iocore/dns/ iocore/hostdb/ iocore/net/ proxy/congest/
proxy/dns_cache/ proxy/hdrs/ proxy/http2/ proxy/logging/ proxy/mgmt2/
proxy/mgmt2/api2/ proxy/mgmt2/api2/re...
Author: mturk
Date: Fri May 21 08:09:02 2010
New Revision: 946930
URL: http://svn.apache.org/viewvc?rev=946930&view=rev
Log:
Remove redundant include paths from makefiles
Modified:
trafficserver/traffic/trunk/example/app-template/Makefile.am
trafficserver/traffic/trunk/iocore/cache/Makefile.am
trafficserver/traffic/trunk/iocore/dns/Makefile.am
trafficserver/traffic/trunk/iocore/hostdb/Makefile.am
trafficserver/traffic/trunk/iocore/net/Makefile.am
trafficserver/traffic/trunk/proxy/congest/Makefile.am
trafficserver/traffic/trunk/proxy/dns_cache/Makefile.am
trafficserver/traffic/trunk/proxy/hdrs/Makefile.am
trafficserver/traffic/trunk/proxy/http2/Makefile.am
trafficserver/traffic/trunk/proxy/logging/Makefile.am
trafficserver/traffic/trunk/proxy/mgmt2/Makefile.am
trafficserver/traffic/trunk/proxy/mgmt2/api2/Makefile.am
trafficserver/traffic/trunk/proxy/mgmt2/api2/remote/Makefile.am
trafficserver/traffic/trunk/proxy/mgmt2/cli/Makefile.am
trafficserver/traffic/trunk/proxy/mgmt2/cli2/Makefile.am
trafficserver/traffic/trunk/proxy/mgmt2/cop/Makefile.am
trafficserver/traffic/trunk/proxy/mgmt2/tools/Makefile.am
trafficserver/traffic/trunk/proxy/stats/Makefile.am
Modified: trafficserver/traffic/trunk/example/app-template/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/example/app-template/Makefile.am?rev=946930&r1=946929&r2=946930&view=diff
==============================================================================
--- trafficserver/traffic/trunk/example/app-template/Makefile.am (original)
+++ trafficserver/traffic/trunk/example/app-template/Makefile.am Fri May 21 08:09:02 2010
@@ -14,12 +14,11 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-AM_CPPFLAGS = -I$(top_srcdir)/libinktomi++ \
- -I$(iocore_include_dirs) \
- -I$(top_srcdir)/librecords \
- -I$(top_srcdir)/proxy
-# -I$(top_srcdir)/proxy/hdrs
-# -I$(top_srcdir)/proxy/logging
+AM_CPPFLAGS = -I$(iocore_include_dirs) \
+ -I$(top_srcdir)/librecords \
+ -I$(top_srcdir)/proxy
+# -I$(top_srcdir)/proxy/hdrs
+# I$(top_srcdir)/proxy/logging
DEFS += @IOCORE_MODULARIZED_DEFS@
Modified: trafficserver/traffic/trunk/iocore/cache/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/cache/Makefile.am?rev=946930&r1=946929&r2=946930&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/cache/Makefile.am (original)
+++ trafficserver/traffic/trunk/iocore/cache/Makefile.am Fri May 21 08:09:02 2010
@@ -20,15 +20,13 @@ if STANDALONE_IOCORE
AM_CPPFLAGS = \
$(iocore_include_dirs) \
-I$(top_srcdir)/librecords \
- -I$(top_srcdir)/libinktomi++ \
-DSYSCONFDIR=\"$(sysconfdir)\"
-ADD_SRC =
+ADD_SRC =
else
AM_CPPFLAGS = \
$(iocore_include_dirs) \
-I$(top_srcdir)/librecords \
- -I$(top_srcdir)/libinktomi++ \
-I$(top_srcdir)/proxy \
-I$(top_srcdir)/proxy/hdrs \
-I$(top_srcdir)/proxy/http2 \
@@ -37,7 +35,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/proxy/mgmt2/preparse \
-I$(top_srcdir)/proxy/mgmt2/utils \
-I$(top_srcdir)/proxy/mgmt2/web2 \
- -DSYSCONFDIR=\"$(sysconfdir)\"
+ -DSYSCONFDIR=\"$(sysconfdir)\"
ADD_SRC = CacheTest.cc P_CacheTest.h NewCacheVC.cc NewCacheVC.h
endif
Modified: trafficserver/traffic/trunk/iocore/dns/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/dns/Makefile.am?rev=946930&r1=946929&r2=946930&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/dns/Makefile.am (original)
+++ trafficserver/traffic/trunk/iocore/dns/Makefile.am Fri May 21 08:09:02 2010
@@ -19,12 +19,10 @@
if STANDALONE_IOCORE
AM_CPPFLAGS = \
$(iocore_include_dirs) \
- -I$(top_srcdir)/libinktomi++ \
- -I$(top_srcdir)/librecords
+ -I$(top_srcdir)/librecords
else
AM_CPPFLAGS = \
$(iocore_include_dirs) \
- -I$(top_srcdir)/libinktomi++ \
-I$(top_srcdir)/librecords \
-I$(top_srcdir)/proxy \
-I$(top_srcdir)/proxy/mgmt2/preparse \
Modified: trafficserver/traffic/trunk/iocore/hostdb/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/hostdb/Makefile.am?rev=946930&r1=946929&r2=946930&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/hostdb/Makefile.am (original)
+++ trafficserver/traffic/trunk/iocore/hostdb/Makefile.am Fri May 21 08:09:02 2010
@@ -19,12 +19,10 @@
if STANDALONE_IOCORE
AM_CPPFLAGS = \
$(iocore_include_dirs) \
- -I$(top_srcdir)/libinktomi++ \
- -I$(top_srcdir)/librecords
+ -I$(top_srcdir)/librecords
else
AM_CPPFLAGS = \
$(iocore_include_dirs) \
- -I$(top_srcdir)/libinktomi++ \
-I$(top_srcdir)/librecords \
-I$(top_srcdir)/proxy \
-I$(top_srcdir)/proxy/mgmt2/preparse \
Modified: trafficserver/traffic/trunk/iocore/net/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/net/Makefile.am?rev=946930&r1=946929&r2=946930&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/net/Makefile.am (original)
+++ trafficserver/traffic/trunk/iocore/net/Makefile.am Fri May 21 08:09:02 2010
@@ -19,12 +19,10 @@
if STANDALONE_IOCORE
AM_CPPFLAGS = \
$(iocore_include_dirs) \
- -I$(top_srcdir)/libinktomi++ \
- -I$(top_srcdir)/librecords
+ -I$(top_srcdir)/librecords
else
AM_CPPFLAGS = \
$(iocore_include_dirs) \
- -I$(top_srcdir)/libinktomi++ \
-I$(top_srcdir)/librecords \
-I$(top_srcdir)/proxy \
-I$(top_srcdir)/proxy/mgmt2/preparse \
Modified: trafficserver/traffic/trunk/proxy/congest/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/congest/Makefile.am?rev=946930&r1=946929&r2=946930&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/congest/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/congest/Makefile.am Fri May 21 08:09:02 2010
@@ -17,17 +17,16 @@
# limitations under the License.
AM_CPPFLAGS = \
+ $(iocore_include_dirs) \
-I$(top_srcdir)/librecords \
-I$(top_srcdir)/proxy \
- $(iocore_include_dirs) \
-I$(top_srcdir)/proxy/http2 \
-I$(top_srcdir)/proxy/mgmt2 \
-I$(top_srcdir)/proxy/mgmt2/preparse \
-I$(top_srcdir)/proxy/mgmt2/utils \
-I$(top_srcdir)/proxy/mgmt2/web2 \
-I$(top_srcdir)/proxy/hdrs \
- -I$(top_srcdir)/proxy/logging \
- -I$(top_srcdir)/libinktomi++
+ -I$(top_srcdir)/proxy/logging
noinst_LIBRARIES = libCongestionControl.a
Modified: trafficserver/traffic/trunk/proxy/dns_cache/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/dns_cache/Makefile.am?rev=946930&r1=946929&r2=946930&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/dns_cache/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/dns_cache/Makefile.am Fri May 21 08:09:02 2010
@@ -17,8 +17,8 @@
# limitations under the License.
AM_CPPFLAGS = \
- -I$(top_srcdir)/librecords \
$(iocore_include_dirs) \
+ -I$(top_srcdir)/librecords \
-I$(top_srcdir)/proxy \
-I$(top_srcdir)/proxy/http2 \
-I$(top_srcdir)/proxy/mgmt2 \
@@ -26,8 +26,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/proxy/mgmt2/utils \
-I$(top_srcdir)/proxy/mgmt2/web2 \
-I$(top_srcdir)/proxy/hdrs \
- -I$(top_srcdir)/proxy/logging \
- -I$(top_srcdir)/libinktomi++
+ -I$(top_srcdir)/proxy/logging
noinst_LIBRARIES = libdnscache.a
Modified: trafficserver/traffic/trunk/proxy/hdrs/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/hdrs/Makefile.am?rev=946930&r1=946929&r2=946930&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/hdrs/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/hdrs/Makefile.am Fri May 21 08:09:02 2010
@@ -24,11 +24,10 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/proxy/mgmt2/utils \
-I$(top_srcdir)/proxy/mgmt2/web2 \
-I$(top_srcdir)/proxy/hdrs \
- -I$(top_srcdir)/proxy/logging \
- -I$(top_srcdir)/libinktomi++
+ -I$(top_srcdir)/proxy/logging
noinst_LIBRARIES = libhdrs.a
-EXTRA_PROGRAMS = load_http_hdr
+EXTRA_PROGRAMS = load_http_hdr
# Http library source files.
libhdrs_a_SOURCES = \
Modified: trafficserver/traffic/trunk/proxy/http2/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/http2/Makefile.am?rev=946930&r1=946929&r2=946930&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/http2/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/http2/Makefile.am Fri May 21 08:09:02 2010
@@ -17,8 +17,8 @@
# limitations under the License.
AM_CPPFLAGS = \
- -I$(top_srcdir)/proxy \
$(iocore_include_dirs) \
+ -I$(top_srcdir)/proxy \
-I$(top_srcdir)/librecords \
-I$(top_srcdir)/proxy/mgmt2 \
-I$(top_srcdir)/proxy/mgmt2/preparse \
@@ -26,16 +26,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/proxy/mgmt2/web2 \
-I$(top_srcdir)/proxy/hdrs \
-I$(top_srcdir)/proxy/http2/remap \
- -I$(top_srcdir)/proxy/logging \
- -I$(top_srcdir)/libinktomi++ \
- -I$(top_srcdir)/iocore/cache \
- -I$(top_srcdir)/iocore/utils \
- -I$(top_srcdir)/iocore/eventsystem \
- -I$(top_srcdir)/iocore/net \
- -I$(top_srcdir)/iocore/aio \
- -I$(top_srcdir)/iocore/cluster \
- -I$(top_srcdir)/iocore/hostdb \
- -I$(top_srcdir)/iocore/dns
+ -I$(top_srcdir)/proxy/logging
noinst_HEADERS = HttpProxyServerMain.h
noinst_LIBRARIES = libhttp.a
Modified: trafficserver/traffic/trunk/proxy/logging/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/logging/Makefile.am?rev=946930&r1=946929&r2=946930&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/logging/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/logging/Makefile.am Fri May 21 08:09:02 2010
@@ -19,9 +19,8 @@
DEFS += -DIOCORE_LOG_COLLATION
AM_CPPFLAGS = \
- -I$(top_srcdir)/libinktomi++ \
- -I$(top_srcdir)/proxy \
$(iocore_include_dirs) \
+ -I$(top_srcdir)/proxy \
-I$(top_srcdir)/proxy/http2 \
-I$(top_srcdir)/proxy/http2/remap \
-I$(top_srcdir)/proxy/mgmt2 \
Modified: trafficserver/traffic/trunk/proxy/mgmt2/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/Makefile.am?rev=946930&r1=946929&r2=946930&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/Makefile.am Fri May 21 08:09:02 2010
@@ -21,8 +21,10 @@ SUBDIRS = cli cluster cop \
preparse tools utils web2 html2 stats api2 $(CLI_DIR)
AM_CPPFLAGS = \
+ $(iocore_include_dirs) \
-I$(top_srcdir)/librecords \
- -I$(top_srcdir)/libinktomi++ \
+ -I$(top_srcdir)/proxy \
+ -I$(top_srcdir)/proxy/hdrs \
-I$(top_srcdir)/proxy/mgmt2 \
-I$(top_srcdir)/proxy/mgmt2/api2 \
-I$(top_srcdir)/proxy/mgmt2/api2/include \
@@ -32,9 +34,6 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/proxy/mgmt2/stats \
-I$(top_srcdir)/proxy/mgmt2/utils \
-I$(top_srcdir)/proxy/mgmt2/web2 \
- $(iocore_include_dirs) \
- -I$(top_srcdir)/proxy \
- -I$(top_srcdir)/proxy/hdrs \
-DPKGSYSUSER=\"$(pkgsysuser)\"
MGMT_DEFS = @MGMT_DEFS@
Modified: trafficserver/traffic/trunk/proxy/mgmt2/api2/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/api2/Makefile.am?rev=946930&r1=946929&r2=946930&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/api2/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/api2/Makefile.am Fri May 21 08:09:02 2010
@@ -20,7 +20,7 @@
SUBDIRS = remote
AM_CPPFLAGS = \
- -I$(top_srcdir)/libinktomi++ \
+ $(iocore_include_dirs) \
-I$(top_srcdir)/librecords \
-I$(top_srcdir)/proxy/mgmt2 \
-I$(top_srcdir)/proxy/mgmt2/cli \
@@ -32,8 +32,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/proxy/iocore \
-I$(top_srcdir)/proxy/hdrs \
-I$(top_srcdir)/proxy/mgmt2/api2/include \
- -I$(top_srcdir)/proxy/mgmt2/api2 \
- $(iocore_include_dirs)
+ -I$(top_srcdir)/proxy/mgmt2/api2
MGMT_DEFS = @MGMT_DEFS@
DEFS += $(MGMT_DEFS)
Modified: trafficserver/traffic/trunk/proxy/mgmt2/api2/remote/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/api2/remote/Makefile.am?rev=946930&r1=946929&r2=946930&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/api2/remote/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/api2/remote/Makefile.am Fri May 21 08:09:02 2010
@@ -15,7 +15,7 @@
# limitations under the License.
AM_CPPFLAGS = \
- -I$(top_srcdir)/libinktomi++ \
+ $(iocore_include_dirs) \
-I$(top_srcdir)/librecords \
-I$(top_srcdir)/proxy/mgmt2 \
-I$(top_srcdir)/proxy/mgmt2/cli \
@@ -28,8 +28,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/proxy/hdrs \
-I$(top_srcdir)/proxy/mgmt2/api2 \
-I$(top_srcdir)/proxy/mgmt2/api2/remote \
- -I$(top_srcdir)/proxy/mgmt2/api2/include \
- $(iocore_include_dirs)
+ -I$(top_srcdir)/proxy/mgmt2/api2/include
MGMT_DEFS = @MGMT_DEFS@
DEFS += $(MGMT_DEFS)
Modified: trafficserver/traffic/trunk/proxy/mgmt2/cli/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/cli/Makefile.am?rev=946930&r1=946929&r2=946930&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/cli/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/cli/Makefile.am Fri May 21 08:09:02 2010
@@ -18,6 +18,7 @@
# limitations under the License.
AM_CPPFLAGS = \
+ $(iocore_include_dirs) \
-I$(top_srcdir)/libinktomi++ \
-I$(top_srcdir)/librecords \
-I$(top_srcdir)/proxy/mgmt2 \
@@ -27,8 +28,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/proxy/mgmt2/preparse \
-I$(top_srcdir)/proxy/mgmt2/utils \
-I$(top_srcdir)/proxy/mgmt2/web2 \
- -I$(top_srcdir)/proxy \
- $(iocore_include_dirs)
+ -I$(top_srcdir)/proxy
MGMT_DEFS = @MGMT_DEFS@
DEFS += $(MGMT_DEFS)
Modified: trafficserver/traffic/trunk/proxy/mgmt2/cli2/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/cli2/Makefile.am?rev=946930&r1=946929&r2=946930&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/cli2/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/cli2/Makefile.am Fri May 21 08:09:02 2010
@@ -20,12 +20,11 @@
SUFFIXES = .java .class .jar .my .def .stb .html
AM_CPPFLAGS = \
- -I$(top_srcdir)/proxy/mgmt2/utils \
- -I$(top_srcdir)/libinktomi++ \
+ $(iocore_include_dirs) \
-I$(top_srcdir)/proxy \
+ -I$(top_srcdir)/proxy/mgmt2/utils \
-I$(top_srcdir)/proxy/mgmt2/api2/include \
- -I$(top_srcdir)/proxy/mgmt2/tools \
- $(iocore_include_dirs)
+ -I$(top_srcdir)/proxy/mgmt2/tools
bin_PROGRAMS = traffic_shell
Modified: trafficserver/traffic/trunk/proxy/mgmt2/cop/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/cop/Makefile.am?rev=946930&r1=946929&r2=946930&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/cop/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/cop/Makefile.am Fri May 21 08:09:02 2010
@@ -18,7 +18,7 @@
# limitations under the License.
AM_CPPFLAGS = \
- -I$(top_srcdir)/libinktomi++ \
+ $(iocore_include_dirs) \
-I$(top_srcdir)/proxy/mgmt2 \
-I$(top_srcdir)/proxy/mgmt2/cli \
-I$(top_srcdir)/proxy/mgmt2/cluster \
@@ -26,7 +26,6 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/proxy/mgmt2/utils \
-I$(top_srcdir)/proxy/mgmt2/web2 \
-I$(top_srcdir)/proxy \
- $(iocore_include_dirs) \
-DPKGSYSUSER=\"$(pkgsysuser)\"
MGMT_DEFS = @MGMT_DEFS@
Modified: trafficserver/traffic/trunk/proxy/mgmt2/tools/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/tools/Makefile.am?rev=946930&r1=946929&r2=946930&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/tools/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/tools/Makefile.am Fri May 21 08:09:02 2010
@@ -18,13 +18,12 @@
# limitations under the License.
AM_CPPFLAGS = \
- -I$(top_srcdir)/libinktomi++ \
+ $(iocore_include_dirs) \
-I$(top_srcdir)/librecords \
-I$(top_srcdir)/proxy/mgmt2/utils \
-I$(top_srcdir)/proxy/mgmt2/api2 \
-I$(top_srcdir)/proxy/mgmt2/api2/include \
- -I$(top_srcdir)/proxy/mgmt2 \
- $(iocore_include_dirs)
+ -I$(top_srcdir)/proxy/mgmt2
MGMT_DEFS = @MGMT_DEFS@
DEFS += $(MGMT_DEFS)
Modified: trafficserver/traffic/trunk/proxy/stats/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/stats/Makefile.am?rev=946930&r1=946929&r2=946930&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/stats/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/stats/Makefile.am Fri May 21 08:09:02 2010
@@ -17,9 +17,8 @@
# limitations under the License.
AM_CPPFLAGS = \
- -I$(top_srcdir)/libinktomi++ \
- -I$(top_srcdir)/proxy \
$(iocore_include_dirs) \
+ -I$(top_srcdir)/proxy \
-I$(top_srcdir)/proxy/mgmt2 \
-I$(top_srcdir)/proxy/mgmt2/preparse \
-I$(top_srcdir)/proxy/mgmt2/utils \