You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2010/09/17 01:45:40 UTC
svn commit: r997953 - in /trafficserver/traffic/trunk: ./ iocore/aio/
iocore/cache/ iocore/cluster/ iocore/dns/ iocore/eventsystem/ iocore/utils/
librecords/ proxy/ proxy/congest/ proxy/hdrs/ proxy/http2/
proxy/http2/remap/ proxy/logging/ proxy/mgmt2/ ...
Author: zwoop
Date: Thu Sep 16 23:45:39 2010
New Revision: 997953
URL: http://svn.apache.org/viewvc?rev=997953&view=rev
Log:
TS-442 Cleanup some include "dependencies".
This makes it slightly easier to see what dependencies we have.
Modified:
trafficserver/traffic/trunk/configure.ac
trafficserver/traffic/trunk/iocore/aio/Makefile.am
trafficserver/traffic/trunk/iocore/cache/Makefile.am
trafficserver/traffic/trunk/iocore/cluster/Makefile.am
trafficserver/traffic/trunk/iocore/dns/Makefile.am
trafficserver/traffic/trunk/iocore/eventsystem/Makefile.am
trafficserver/traffic/trunk/iocore/utils/Makefile.am
trafficserver/traffic/trunk/librecords/Makefile.am
trafficserver/traffic/trunk/proxy/Makefile.am
trafficserver/traffic/trunk/proxy/congest/Makefile.am
trafficserver/traffic/trunk/proxy/hdrs/Makefile.am
trafficserver/traffic/trunk/proxy/http2/Makefile.am
trafficserver/traffic/trunk/proxy/http2/remap/Makefile.am
trafficserver/traffic/trunk/proxy/logging/Makefile.am
trafficserver/traffic/trunk/proxy/mgmt2/Main.h
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/cluster/Makefile.am
trafficserver/traffic/trunk/proxy/mgmt2/cop/Makefile.am
trafficserver/traffic/trunk/proxy/mgmt2/html2/configure/Makefile.am
trafficserver/traffic/trunk/proxy/mgmt2/html2/monitor/Makefile.am
trafficserver/traffic/trunk/proxy/mgmt2/preparse/Makefile.am
trafficserver/traffic/trunk/proxy/mgmt2/stats/Makefile.am
trafficserver/traffic/trunk/proxy/mgmt2/tools/Makefile.am
trafficserver/traffic/trunk/proxy/mgmt2/utils/Makefile.am
trafficserver/traffic/trunk/proxy/mgmt2/web2/Makefile.am
trafficserver/traffic/trunk/proxy/stats/Makefile.am
trafficserver/traffic/trunk/rc/Makefile.am
Modified: trafficserver/traffic/trunk/configure.ac
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/configure.ac?rev=997953&r1=997952&r2=997953&view=diff
==============================================================================
--- trafficserver/traffic/trunk/configure.ac (original)
+++ trafficserver/traffic/trunk/configure.ac Thu Sep 16 23:45:39 2010
@@ -733,7 +733,10 @@ case $host_os in
ATS_ADDTO(CPPFLAGS, [-I/usr/local/include])
;;
esac
-ATS_ADDTO(CPPFLAGS, [$TCL_INCLUDE_SPEC])
+
+if test "x${TCL_INCLUDE_SPEC}" != "x-I/usr/include"; then
+ ATS_ADDTO(CPPFLAGS, [$TCL_INCLUDE_SPEC])
+fi
#
# Check for XML parser
@@ -1087,18 +1090,18 @@ ATS_CHECK_GETHOSTBYNAME_R_STYLE
#
# use modular IOCORE
#
-iocore_include_dirs="-I\$(top_srcdir)/librecords \
- -I\$(top_srcdir)/libinktomi++ \
- -I\$(top_srcdir)/iocore/eventsystem \
- -I\$(top_srcdir)/iocore/net \
- -I\$(top_srcdir)/iocore/aio \
- -I\$(top_srcdir)/iocore/hostdb \
- -I\$(top_srcdir)/iocore/cache \
- -I\$(top_srcdir)/iocore/cluster \
- -I\$(top_srcdir)/iocore/utils \
- -I\$(top_srcdir)/iocore/dns \
- -I\$(top_srcdir)/libev"
+iocore_include_dirs="-I\$(top_srcdir)/iocore/eventsystem \
+-I\$(top_srcdir)/iocore/net \
+-I\$(top_srcdir)/iocore/aio \
+-I\$(top_srcdir)/iocore/hostdb \
+-I\$(top_srcdir)/iocore/cache \
+-I\$(top_srcdir)/iocore/cluster \
+-I\$(top_srcdir)/iocore/utils \
+-I\$(top_srcdir)/iocore/dns"
+if test "x$enable_libev" = "xyes"; then
+ iocore_include_dirs="${iocore_include_dirs} -I\$(top_srcdir)/libev"
+fi
# Testing Framework suffix generation hack
TFW_PACKAGE_SUFFIX=$os_type
Modified: trafficserver/traffic/trunk/iocore/aio/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/aio/Makefile.am?rev=997953&r1=997952&r2=997953&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/aio/Makefile.am (original)
+++ trafficserver/traffic/trunk/iocore/aio/Makefile.am Thu Sep 16 23:45:39 2010
@@ -18,8 +18,7 @@
AM_CPPFLAGS = \
-I$(top_srcdir)/iocore/eventsystem \
- -I$(top_srcdir)/librecords \
- -I$(top_srcdir)/libinktomi++
+ -I$(top_srcdir)/librecords
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=997953&r1=997952&r2=997953&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/cache/Makefile.am (original)
+++ trafficserver/traffic/trunk/iocore/cache/Makefile.am Thu Sep 16 23:45:39 2010
@@ -34,7 +34,6 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/proxy/mgmt2 \
-I$(top_srcdir)/proxy/mgmt2/preparse \
-I$(top_srcdir)/proxy/mgmt2/utils \
- -I$(top_srcdir)/proxy/mgmt2/web2 \
-DSYSCONFDIR=\"$(sysconfdir)\"
ADD_SRC = CacheTest.cc P_CacheTest.h NewCacheVC.cc NewCacheVC.h
Modified: trafficserver/traffic/trunk/iocore/cluster/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/cluster/Makefile.am?rev=997953&r1=997952&r2=997953&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/cluster/Makefile.am (original)
+++ trafficserver/traffic/trunk/iocore/cluster/Makefile.am Thu Sep 16 23:45:39 2010
@@ -18,15 +18,13 @@
AM_CPPFLAGS = \
$(iocore_include_dirs) \
+ -I$(top_srcdir)/librecords \
-I$(top_srcdir)/proxy/http2 \
-I$(top_srcdir)/proxy/hdrs \
- -I$(top_srcdir)/proxy/api/include \
-I$(top_srcdir)/proxy \
-I$(top_srcdir)/proxy/mgmt2 \
-I$(top_srcdir)/proxy/mgmt2/preparse \
- -I$(top_srcdir)/proxy/mgmt2/cluster \
- -I$(top_srcdir)/proxy/mgmt2/utils \
- -I$(top_srcdir)/proxy/mgmt2/web2
+ -I$(top_srcdir)/proxy/mgmt2/utils
DEFS += @IOCORE_MODULARIZED_DEFS@
Modified: trafficserver/traffic/trunk/iocore/dns/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/dns/Makefile.am?rev=997953&r1=997952&r2=997953&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/dns/Makefile.am (original)
+++ trafficserver/traffic/trunk/iocore/dns/Makefile.am Thu Sep 16 23:45:39 2010
@@ -27,7 +27,6 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/proxy \
-I$(top_srcdir)/proxy/mgmt2/preparse \
-I$(top_srcdir)/proxy/hdrs \
- -I$(top_srcdir)/proxy/http2 \
-I$(top_srcdir)/proxy/mgmt2 \
-I$(top_srcdir)/proxy/mgmt2/utils
endif
Modified: trafficserver/traffic/trunk/iocore/eventsystem/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/eventsystem/Makefile.am?rev=997953&r1=997952&r2=997953&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/eventsystem/Makefile.am (original)
+++ trafficserver/traffic/trunk/iocore/eventsystem/Makefile.am Thu Sep 16 23:45:39 2010
@@ -17,8 +17,7 @@
# limitations under the License.
AM_CPPFLAGS = \
- -I$(top_srcdir)/librecords \
- -I$(top_srcdir)/libinktomi++
+ -I$(top_srcdir)/librecords
DEFS += @IOCORE_MODULARIZED_DEFS@
Modified: trafficserver/traffic/trunk/iocore/utils/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/utils/Makefile.am?rev=997953&r1=997952&r2=997953&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/utils/Makefile.am (original)
+++ trafficserver/traffic/trunk/iocore/utils/Makefile.am Thu Sep 16 23:45:39 2010
@@ -19,7 +19,6 @@
AM_CPPFLAGS = \
-I$(top_srcdir)/librecords \
-I$(top_srcdir)/iocore/eventsystem \
- -I$(top_srcdir)/libinktomi++ \
-DPREFIX=\"$(prefix)\" \
-DEXEC_PREFIX=\"$(rel_exec_prefix)\" \
-DBINDIR=\"$(rel_bindir)\" \
Modified: trafficserver/traffic/trunk/librecords/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/librecords/Makefile.am?rev=997953&r1=997952&r2=997953&view=diff
==============================================================================
--- trafficserver/traffic/trunk/librecords/Makefile.am (original)
+++ trafficserver/traffic/trunk/librecords/Makefile.am Thu Sep 16 23:45:39 2010
@@ -19,25 +19,13 @@
DEFS += @ink_with_modules_def@
AM_CPPFLAGS = \
- -I$(top_srcdir)/librecords \
-I$(top_srcdir)/iocore/eventsystem \
- -I$(top_srcdir)/iocore/net \
- -I$(top_srcdir)/iocore/cache \
- -I$(top_srcdir)/iocore/aio \
-I$(top_srcdir)/iocore/utils \
- -I$(top_srcdir)/iocore/cluster \
- -I$(top_srcdir)/iocore/dns \
- -I$(top_srcdir)/iocore/hostdb \
-I$(top_srcdir)/proxy/mgmt2 \
-I$(top_srcdir)/proxy/mgmt2/cluster \
- -I$(top_srcdir)/proxy/mgmt2/snmp \
-I$(top_srcdir)/proxy/mgmt2/web2 \
-I$(top_srcdir)/proxy/mgmt2/api2/include \
- -I$(top_srcdir)/proxy/mgmt2/utils \
- -I$(top_srcdir)/proxy/http2 \
- -I$(top_srcdir)/proxy/hdrs \
- -I$(top_srcdir)/proxy \
- -I$(top_srcdir)/libinktomi++
+ -I$(top_srcdir)/proxy/mgmt2/utils
noinst_LIBRARIES = libreclocal.a librecprocess.a
Modified: trafficserver/traffic/trunk/proxy/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/Makefile.am?rev=997953&r1=997952&r2=997953&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/Makefile.am Thu Sep 16 23:45:39 2010
@@ -35,7 +35,7 @@ endif
AM_CPPFLAGS = \
$(iocore_include_dirs) \
- -I$(top_srcdir)/proxy/dns_cache \
+ -I$(top_srcdir)/librecords \
-I$(srcdir)/http2 \
-I$(srcdir)/logging \
-I$(srcdir)/http2/remap \
@@ -43,7 +43,6 @@ AM_CPPFLAGS = \
-I$(srcdir)/mgmt2 \
-I$(srcdir)/mgmt2/preparse \
-I$(srcdir)/mgmt2/utils \
- -I$(srcdir)/mgmt2/web2 \
-I$(srcdir)/api/ts \
-DPKGSYSUSER=\"$(pkgsysuser)\"
Modified: trafficserver/traffic/trunk/proxy/congest/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/congest/Makefile.am?rev=997953&r1=997952&r2=997953&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/congest/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/congest/Makefile.am Thu Sep 16 23:45:39 2010
@@ -20,13 +20,10 @@ AM_CPPFLAGS = \
$(iocore_include_dirs) \
-I$(top_srcdir)/librecords \
-I$(top_srcdir)/proxy \
- -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)/proxy/hdrs
noinst_LIBRARIES = libCongestionControl.a
Modified: trafficserver/traffic/trunk/proxy/hdrs/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/hdrs/Makefile.am?rev=997953&r1=997952&r2=997953&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/hdrs/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/hdrs/Makefile.am Thu Sep 16 23:45:39 2010
@@ -18,13 +18,7 @@
AM_CPPFLAGS = \
$(iocore_include_dirs) \
- -I$(top_srcdir)/proxy \
- -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)/librecords
noinst_LIBRARIES = libhdrs.a
EXTRA_PROGRAMS = load_http_hdr
Modified: trafficserver/traffic/trunk/proxy/http2/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/http2/Makefile.am?rev=997953&r1=997952&r2=997953&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/http2/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/http2/Makefile.am Thu Sep 16 23:45:39 2010
@@ -25,7 +25,6 @@ AM_CPPFLAGS = \
-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/http2/remap \
-I$(top_srcdir)/proxy/logging
Modified: trafficserver/traffic/trunk/proxy/http2/remap/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/http2/remap/Makefile.am?rev=997953&r1=997952&r2=997953&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/http2/remap/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/http2/remap/Makefile.am Thu Sep 16 23:45:39 2010
@@ -18,6 +18,7 @@
AM_CPPFLAGS = \
$(iocore_include_dirs) \
+ -I$(top_srcdir)/librecords \
-I$(top_srcdir)/proxy \
-I$(top_srcdir)/proxy/mgmt2 \
-I$(top_srcdir)/proxy/mgmt2/preparse \
Modified: trafficserver/traffic/trunk/proxy/logging/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/logging/Makefile.am?rev=997953&r1=997952&r2=997953&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/logging/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/logging/Makefile.am Thu Sep 16 23:45:39 2010
@@ -20,13 +20,13 @@ DEFS += -DIOCORE_LOG_COLLATION
AM_CPPFLAGS = \
$(iocore_include_dirs) \
+ -I$(top_srcdir)/librecords \
-I$(top_srcdir)/proxy \
-I$(top_srcdir)/proxy/http2 \
-I$(top_srcdir)/proxy/http2/remap \
-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
EXTRA_DIST = LogStandalone.cc
Modified: trafficserver/traffic/trunk/proxy/mgmt2/Main.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/Main.h?rev=997953&r1=997952&r2=997953&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/Main.h (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/Main.h Thu Sep 16 23:45:39 2010
@@ -34,7 +34,6 @@
#define PATH_NAME_MAX 511 // instead of PATH_MAX which is inconsistent
// on various OSs (linux-4096,osx/bsd-1024,
// windows-260,etc)
-
// TODO: consolidate location of these defaults
#define DEFAULT_ROOT_DIRECTORY PREFIX
#define DEFAULT_LOCAL_STATE_DIRECTORY "var/trafficserver"
Modified: trafficserver/traffic/trunk/proxy/mgmt2/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/Makefile.am?rev=997953&r1=997952&r2=997953&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/Makefile.am Thu Sep 16 23:45:39 2010
@@ -31,9 +31,7 @@ AM_CPPFLAGS = \
-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 \
- -I$(top_srcdir)/proxy/mgmt2/cli \
-I$(top_srcdir)/proxy/mgmt2/cluster \
-I$(top_srcdir)/proxy/mgmt2/preparse \
-I$(top_srcdir)/proxy/mgmt2/stats \
Modified: trafficserver/traffic/trunk/proxy/mgmt2/api2/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/api2/Makefile.am?rev=997953&r1=997952&r2=997953&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/api2/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/api2/Makefile.am Thu Sep 16 23:45:39 2010
@@ -23,16 +23,10 @@ AM_CPPFLAGS = \
$(iocore_include_dirs) \
-I$(top_srcdir)/librecords \
-I$(top_srcdir)/proxy/mgmt2 \
- -I$(top_srcdir)/proxy/mgmt2/cli \
-I$(top_srcdir)/proxy/mgmt2/cluster \
- -I$(top_srcdir)/proxy/mgmt2/preparse \
-I$(top_srcdir)/proxy/mgmt2/utils \
-I$(top_srcdir)/proxy/mgmt2/web2 \
- -I$(top_srcdir)/proxy \
- -I$(top_srcdir)/proxy/iocore \
- -I$(top_srcdir)/proxy/hdrs \
- -I$(top_srcdir)/proxy/mgmt2/api2/include \
- -I$(top_srcdir)/proxy/mgmt2/api2
+ -I$(top_srcdir)/proxy/mgmt2/api2/include
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=997953&r1=997952&r2=997953&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/api2/remote/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/api2/remote/Makefile.am Thu Sep 16 23:45:39 2010
@@ -16,18 +16,9 @@
AM_CPPFLAGS = \
$(iocore_include_dirs) \
- -I$(top_srcdir)/librecords \
-I$(top_srcdir)/proxy/mgmt2 \
- -I$(top_srcdir)/proxy/mgmt2/cli \
- -I$(top_srcdir)/proxy/mgmt2/cluster \
- -I$(top_srcdir)/proxy/mgmt2/preparse \
-I$(top_srcdir)/proxy/mgmt2/utils \
- -I$(top_srcdir)/proxy/mgmt2/web \
- -I$(top_srcdir)/proxy \
- -I$(top_srcdir)/proxy/iocore \
- -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
MGMT_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=997953&r1=997952&r2=997953&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/cli/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/cli/Makefile.am Thu Sep 16 23:45:39 2010
@@ -19,16 +19,12 @@
AM_CPPFLAGS = \
$(iocore_include_dirs) \
- -I$(top_srcdir)/libinktomi++ \
-I$(top_srcdir)/librecords \
-I$(top_srcdir)/proxy/mgmt2 \
- -I$(top_srcdir)/proxy/mgmt2/api2 \
-I$(top_srcdir)/proxy/mgmt2/api2/include \
-I$(top_srcdir)/proxy/mgmt2/cluster \
- -I$(top_srcdir)/proxy/mgmt2/preparse \
-I$(top_srcdir)/proxy/mgmt2/utils \
- -I$(top_srcdir)/proxy/mgmt2/web2 \
- -I$(top_srcdir)/proxy
+ -I$(top_srcdir)/proxy/mgmt2/web2
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=997953&r1=997952&r2=997953&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/cli2/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/cli2/Makefile.am Thu Sep 16 23:45:39 2010
@@ -21,8 +21,6 @@ SUFFIXES = .java .class .jar .my .def .s
AM_CPPFLAGS = \
$(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
Modified: trafficserver/traffic/trunk/proxy/mgmt2/cluster/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/cluster/Makefile.am?rev=997953&r1=997952&r2=997953&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/cluster/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/cluster/Makefile.am Thu Sep 16 23:45:39 2010
@@ -18,16 +18,11 @@
# limitations under the License.
AM_CPPFLAGS = \
- -I$(top_srcdir)/libinktomi++ \
-I$(top_srcdir)/librecords \
-I$(top_srcdir)/proxy/mgmt2 \
- -I$(top_srcdir)/proxy/mgmt2/api2 \
-I$(top_srcdir)/proxy/mgmt2/api2/include \
- -I$(top_srcdir)/proxy/mgmt2/cli \
- -I$(top_srcdir)/proxy/mgmt2/preparse \
-I$(top_srcdir)/proxy/mgmt2/utils \
- -I$(top_srcdir)/proxy/mgmt2/web2 \
- -I$(top_srcdir)/proxy
+ -I$(top_srcdir)/proxy/mgmt2/web2
MGMT_DEFS = @MGMT_DEFS@
DEFS += $(MGMT_DEFS)
Modified: trafficserver/traffic/trunk/proxy/mgmt2/cop/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/cop/Makefile.am?rev=997953&r1=997952&r2=997953&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/cop/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/cop/Makefile.am Thu Sep 16 23:45:39 2010
@@ -19,13 +19,6 @@
AM_CPPFLAGS = \
$(iocore_include_dirs) \
- -I$(top_srcdir)/proxy/mgmt2 \
- -I$(top_srcdir)/proxy/mgmt2/cli \
- -I$(top_srcdir)/proxy/mgmt2/cluster \
- -I$(top_srcdir)/proxy/mgmt2/preparse \
- -I$(top_srcdir)/proxy/mgmt2/utils \
- -I$(top_srcdir)/proxy/mgmt2/web2 \
- -I$(top_srcdir)/proxy \
-DPKGSYSUSER=\"$(pkgsysuser)\"
MGMT_DEFS = @MGMT_DEFS@
Modified: trafficserver/traffic/trunk/proxy/mgmt2/html2/configure/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/html2/configure/Makefile.am?rev=997953&r1=997952&r2=997953&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/html2/configure/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/html2/configure/Makefile.am Thu Sep 16 23:45:39 2010
@@ -31,7 +31,6 @@ dist_webui_DATA = \
c_config_display.ink \
c_congestion.ink \
c_dns_host_database.ink \
- c_dns_proxy.ink \
c_dns_resolver.ink \
c_dns_split.ink \
c_footer.ink \
Modified: trafficserver/traffic/trunk/proxy/mgmt2/html2/monitor/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/html2/monitor/Makefile.am?rev=997953&r1=997952&r2=997953&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/html2/monitor/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/html2/monitor/Makefile.am Thu Sep 16 23:45:39 2010
@@ -21,7 +21,6 @@ dist_webui_DATA = \
m_cache.ink \
m_cluster.ink \
m_dns.ink \
- m_dns_proxy.ink \
m_footer.ink \
m_graphs.ink \
m_header.ink \
Modified: trafficserver/traffic/trunk/proxy/mgmt2/preparse/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/preparse/Makefile.am?rev=997953&r1=997952&r2=997953&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/preparse/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/preparse/Makefile.am Thu Sep 16 23:45:39 2010
@@ -15,7 +15,6 @@
# limitations under the License.
AM_CPPFLAGS = \
- -I$(top_srcdir)/libinktomi++ \
-I$(top_srcdir)/proxy/hdrs
MGMT_DEFS = @MGMT_DEFS@
Modified: trafficserver/traffic/trunk/proxy/mgmt2/stats/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/stats/Makefile.am?rev=997953&r1=997952&r2=997953&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/stats/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/stats/Makefile.am Thu Sep 16 23:45:39 2010
@@ -18,20 +18,13 @@
# limitations under the License.
AM_CPPFLAGS = \
- -I$(top_srcdir)/libinktomi++ \
-I$(top_srcdir)/librecords \
-I$(top_srcdir)/proxy/mgmt2 \
- -I$(top_srcdir)/proxy/mgmt2/cli \
-I$(top_srcdir)/proxy/mgmt2/cluster \
- -I$(top_srcdir)/proxy/mgmt2/preparse \
-I$(top_srcdir)/proxy/mgmt2/utils \
- -I$(top_srcdir)/proxy/mgmt2/api2 \
-I$(top_srcdir)/proxy/mgmt2/api2/include \
-I$(top_srcdir)/proxy/mgmt2/web2 \
- -I$(top_srcdir)/proxy \
- -I$(top_srcdir)/proxy/iocore \
- -I$(top_srcdir)/proxy/hdrs \
- -I$(top_srcdir)/proxy/mgmt2/stats
+ -I$(top_srcdir)/proxy
MGMT_DEFS = @MGMT_DEFS@
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=997953&r1=997952&r2=997953&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/tools/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/tools/Makefile.am Thu Sep 16 23:45:39 2010
@@ -19,7 +19,6 @@
AM_CPPFLAGS = \
$(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 \
Modified: trafficserver/traffic/trunk/proxy/mgmt2/utils/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/utils/Makefile.am?rev=997953&r1=997952&r2=997953&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/utils/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/utils/Makefile.am Thu Sep 16 23:45:39 2010
@@ -18,16 +18,12 @@
# limitations under the License.
AM_CPPFLAGS = \
- -I$(top_srcdir)/libinktomi++ \
-I$(top_srcdir)/librecords \
-I$(top_srcdir)/iocore/utils \
-I$(top_srcdir)/proxy/mgmt2 \
-I$(top_srcdir)/proxy/mgmt2/api2 \
-I$(top_srcdir)/proxy/mgmt2/api2/include \
- -I$(top_srcdir)/proxy/mgmt2/cli \
-I$(top_srcdir)/proxy/mgmt2/cluster \
- -I$(top_srcdir)/proxy/mgmt2/preparse \
- -I$(top_srcdir)/proxy/mgmt2/utils \
-I$(top_srcdir)/proxy/mgmt2/web2 \
-I$(top_srcdir)/proxy
Modified: trafficserver/traffic/trunk/proxy/mgmt2/web2/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/web2/Makefile.am?rev=997953&r1=997952&r2=997953&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/web2/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/web2/Makefile.am Thu Sep 16 23:45:39 2010
@@ -18,7 +18,6 @@
# limitations under the License.
AM_CPPFLAGS = \
- -I$(top_srcdir)/libinktomi++ \
-I$(top_srcdir)/iocore/utils \
-I$(top_srcdir)/librecords \
-I$(top_srcdir)/proxy/mgmt2 \
@@ -26,11 +25,8 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/proxy/mgmt2/api2/include \
-I$(top_srcdir)/proxy/mgmt2/cli \
-I$(top_srcdir)/proxy/mgmt2/cluster \
- -I$(top_srcdir)/proxy/mgmt2/preparse \
-I$(top_srcdir)/proxy/mgmt2/utils \
- -I$(top_srcdir)/proxy/mgmt2/web2 \
-I$(top_srcdir)/proxy/mgmt2/tools \
- -I$(top_srcdir)/proxy \
-I$(top_srcdir)/proxy/hdrs
MGMT_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=997953&r1=997952&r2=997953&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/stats/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/stats/Makefile.am Thu Sep 16 23:45:39 2010
@@ -18,12 +18,10 @@
AM_CPPFLAGS = \
$(iocore_include_dirs) \
+ -I$(top_srcdir)/librecords \
-I$(top_srcdir)/proxy \
-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/logging
+ -I$(top_srcdir)/proxy/mgmt2/utils
noinst_LIBRARIES = libstats.a
Modified: trafficserver/traffic/trunk/rc/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/rc/Makefile.am?rev=997953&r1=997952&r2=997953&view=diff
==============================================================================
--- trafficserver/traffic/trunk/rc/Makefile.am (original)
+++ trafficserver/traffic/trunk/rc/Makefile.am Thu Sep 16 23:45:39 2010
@@ -17,7 +17,6 @@
# limitations under the License.
AM_CPPFLAGS = \
- -I$(top_srcdir)/libinktomi++ \
-I$(top_srcdir)/librecords \
-I$(top_srcdir)/proxy \
-I$(top_srcdir)/proxy/mgmt2 \