trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r1041269 - in /trafficserver/traffic/trunk: ./ lib/tsconfig/ librecords/ proxy/ proxy/mgmt2/ proxy/mgmt2/api2/ proxy/mgmt2/cli/ proxy/mgmt2/cluster/ proxy/mgmt2/stats/ proxy/mgmt2/utils/ proxy/mgmt2/web2/ proxy/tsconfig/ proxy/wccp/
Date Thu, 02 Dec 2010 03:20:25 GMT
Author: amc
Date: Thu Dec  2 03:20:23 2010
New Revision: 1041269

URL: http://svn.apache.org/viewvc?rev=1041269&view=rev
Log:
TS-569: move TsConfig, fixed makefiles.

Added:
    trafficserver/traffic/trunk/lib/tsconfig/
      - copied from r1041054, trafficserver/traffic/trunk/proxy/tsconfig/
Removed:
    trafficserver/traffic/trunk/proxy/tsconfig/
Modified:
    trafficserver/traffic/trunk/Makefile.am
    trafficserver/traffic/trunk/configure.ac
    trafficserver/traffic/trunk/lib/tsconfig/Makefile.am
    trafficserver/traffic/trunk/librecords/Makefile.am
    trafficserver/traffic/trunk/proxy/Makefile.am
    trafficserver/traffic/trunk/proxy/mgmt2/Makefile.am
    trafficserver/traffic/trunk/proxy/mgmt2/api2/Makefile.am
    trafficserver/traffic/trunk/proxy/mgmt2/cli/Makefile.am
    trafficserver/traffic/trunk/proxy/mgmt2/cluster/Makefile.am
    trafficserver/traffic/trunk/proxy/mgmt2/stats/Makefile.am
    trafficserver/traffic/trunk/proxy/mgmt2/utils/Makefile.am
    trafficserver/traffic/trunk/proxy/mgmt2/web2/Makefile.am
    trafficserver/traffic/trunk/proxy/wccp/Makefile.am

Modified: trafficserver/traffic/trunk/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/Makefile.am?rev=1041269&r1=1041268&r2=1041269&view=diff
==============================================================================
--- trafficserver/traffic/trunk/Makefile.am (original)
+++ trafficserver/traffic/trunk/Makefile.am Thu Dec  2 03:20:23 2010
@@ -22,9 +22,9 @@
 ACLOCAL_AMFLAGS = -I build
 
 if STANDALONE_IOCORE
-SUBDIRS =  libinktomi++ librecords iocore @hdr_dirs@ proxy
+SUBDIRS =  libinktomi++ librecords iocore lib @hdr_dirs@ proxy
 else
-SUBDIRS =  libinktomi++ librecords iocore proxy doc rc
+SUBDIRS =  libinktomi++ librecords iocore lib proxy doc rc
 endif
 
 DIST_BUILD_USER=`id -nu`

Modified: trafficserver/traffic/trunk/configure.ac
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/configure.ac?rev=1041269&r1=1041268&r2=1041269&view=diff
==============================================================================
--- trafficserver/traffic/trunk/configure.ac (original)
+++ trafficserver/traffic/trunk/configure.ac Thu Dec  2 03:20:23 2010
@@ -337,7 +337,7 @@ AC_ARG_ENABLE([wccp],
   [
     has_wccp=1
     AC_SUBST([LIBWCCP], ["\$(top_builddir)/proxy/wccp/libwccp.a"])
-    AC_SUBST([LIBTSCONFIG], ["\$(top_builddir)/proxy/tsconfig/libtsconfig.a"])
+    AC_SUBST([LIBTSCONFIG], ["\$(top_builddir)/lib/tsconfig/libtsconfig.a"])
   ],
   [enable_wccp=no]
 )
@@ -1234,6 +1234,8 @@ AC_CONFIG_FILES([iocore/net/Makefile])
 AC_CONFIG_FILES([iocore/utils/Makefile])
 AC_CONFIG_FILES([libinktomi++/Makefile])
 AC_CONFIG_FILES([librecords/Makefile])
+AC_CONFIG_FILES([lib/Makefile])
+AC_CONFIG_FILES([lib/tsconfig/Makefile])
 AC_CONFIG_FILES([Makefile])
 AC_CONFIG_FILES([proxy/config/body_factory/default/Makefile])
 AC_CONFIG_FILES([proxy/config/body_factory/Makefile])
@@ -1270,7 +1272,6 @@ AC_CONFIG_FILES([proxy/mgmt2/tools/Makef
 AC_CONFIG_FILES([proxy/mgmt2/utils/Makefile])
 AC_CONFIG_FILES([proxy/mgmt2/web2/Makefile])
 AC_CONFIG_FILES([proxy/stats/Makefile])
-AC_CONFIG_FILES([proxy/tsconfig/Makefile])
 AC_CONFIG_FILES([proxy/wccp/Makefile])
 AC_CONFIG_FILES([example/Makefile])
 # example plugins

Modified: trafficserver/traffic/trunk/lib/tsconfig/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/lib/tsconfig/Makefile.am?rev=1041269&r1=1041054&r2=1041269&view=diff
==============================================================================
--- trafficserver/traffic/trunk/lib/tsconfig/Makefile.am (original)
+++ trafficserver/traffic/trunk/lib/tsconfig/Makefile.am Thu Dec  2 03:20:23 2010
@@ -1,4 +1,3 @@
-#
 # Makefile.am for TS Config module.
 #
 #  Licensed to the Apache Software Foundation (ASF) under one
@@ -17,10 +16,6 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-AM_CPPFLAGS = \
-  -I$(top_srcdir)/proxy/mgmt2/api2/include \
-  -DPKGSYSUSER=\"$(pkgsysuser)\"
-
 noinst_LIBRARIES = libtsconfig.a
 
 libtsconfig_a_SOURCES = \

Modified: trafficserver/traffic/trunk/librecords/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/librecords/Makefile.am?rev=1041269&r1=1041268&r2=1041269&view=diff
==============================================================================
--- trafficserver/traffic/trunk/librecords/Makefile.am (original)
+++ trafficserver/traffic/trunk/librecords/Makefile.am Thu Dec  2 03:20:23 2010
@@ -25,7 +25,7 @@ AM_CPPFLAGS = \
   -I$(top_srcdir)/proxy/mgmt2/cluster \
   -I$(top_srcdir)/proxy/mgmt2/web2 \
   -I$(top_srcdir)/proxy/mgmt2/api2/include \
-  -I$(top_srcdir)/proxy/tsconfig \
+  -I$(top_srcdir)/lib/tsconfig \
   -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=1041269&r1=1041268&r2=1041269&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/Makefile.am Thu Dec  2 03:20:23 2010
@@ -24,7 +24,7 @@ noinst_PROGRAMS =
 else
 SUBDIRS = congest http2 hdrs logging
 if BUILD_WCCP
-SUBDIRS += tsconfig wccp
+SUBDIRS += wccp
 endif
 SUBDIRS += mgmt2 config stats
 noinst_LIBRARIES =

Modified: trafficserver/traffic/trunk/proxy/mgmt2/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/Makefile.am?rev=1041269&r1=1041268&r2=1041269&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/Makefile.am Thu Dec  2 03:20:23 2010
@@ -36,7 +36,7 @@ AM_CPPFLAGS = \
   -I$(top_srcdir)/proxy/mgmt2/preparse \
   -I$(top_srcdir)/proxy/mgmt2/stats \
   -I$(top_srcdir)/proxy/mgmt2/utils \
-  -I$(top_srcdir)/proxy/tsconfig \
+  -I$(top_srcdir)/lib/tsconfig \
   -I$(top_srcdir)/proxy/mgmt2/web2
 
 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=1041269&r1=1041268&r2=1041269&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/api2/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/api2/Makefile.am Thu Dec  2 03:20:23 2010
@@ -26,7 +26,7 @@ AM_CPPFLAGS = \
   -I$(top_srcdir)/proxy/mgmt2/cluster \
   -I$(top_srcdir)/proxy/mgmt2/utils \
   -I$(top_srcdir)/proxy/mgmt2/web2 \
-  -I$(top_srcdir)/proxy/tsconfig \
+  -I$(top_srcdir)/lib/tsconfig \
   -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=1041269&r1=1041268&r2=1041269&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/cli/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/cli/Makefile.am Thu Dec  2 03:20:23 2010
@@ -24,7 +24,7 @@ AM_CPPFLAGS = \
   -I$(top_srcdir)/proxy/mgmt2/api2/include \
   -I$(top_srcdir)/proxy/mgmt2/cluster \
   -I$(top_srcdir)/proxy/mgmt2/utils \
-  -I$(top_srcdir)/proxy/tsconfig \
+  -I$(top_srcdir)/lib/tsconfig \
   -I$(top_srcdir)/proxy/mgmt2/web2
 
 MGMT_DEFS = @MGMT_DEFS@

Modified: trafficserver/traffic/trunk/proxy/mgmt2/cluster/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/cluster/Makefile.am?rev=1041269&r1=1041268&r2=1041269&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/cluster/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/cluster/Makefile.am Thu Dec  2 03:20:23 2010
@@ -22,7 +22,7 @@ AM_CPPFLAGS = \
   -I$(top_srcdir)/proxy/mgmt2 \
   -I$(top_srcdir)/proxy/mgmt2/api2/include \
   -I$(top_srcdir)/proxy/mgmt2/utils \
-  -I$(top_srcdir)/proxy/tsconfig \
+  -I$(top_srcdir)/lib/tsconfig \
   -I$(top_srcdir)/proxy/mgmt2/web2
 
 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=1041269&r1=1041268&r2=1041269&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/stats/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/stats/Makefile.am Thu Dec  2 03:20:23 2010
@@ -23,7 +23,7 @@ AM_CPPFLAGS = \
   -I$(top_srcdir)/proxy/mgmt2/cluster \
   -I$(top_srcdir)/proxy/mgmt2/utils \
   -I$(top_srcdir)/proxy/mgmt2/api2/include \
-  -I$(top_srcdir)/proxy/tsconfig \
+  -I$(top_srcdir)/lib/tsconfig \
   -I$(top_srcdir)/proxy/mgmt2/web2 \
   -I$(top_srcdir)/proxy
 

Modified: trafficserver/traffic/trunk/proxy/mgmt2/utils/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/utils/Makefile.am?rev=1041269&r1=1041268&r2=1041269&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/utils/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/utils/Makefile.am Thu Dec  2 03:20:23 2010
@@ -25,7 +25,7 @@ AM_CPPFLAGS = \
   -I$(top_srcdir)/proxy/mgmt2/api2/include \
   -I$(top_srcdir)/proxy/mgmt2/cluster \
   -I$(top_srcdir)/proxy/mgmt2/web2 \
-  -I$(top_srcdir)/proxy/tsconfig \
+  -I$(top_srcdir)/lib/tsconfig \
   -I$(top_srcdir)/proxy
 
 MGMT_DEFS = @MGMT_DEFS@

Modified: trafficserver/traffic/trunk/proxy/mgmt2/web2/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/web2/Makefile.am?rev=1041269&r1=1041268&r2=1041269&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/web2/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/web2/Makefile.am Thu Dec  2 03:20:23 2010
@@ -26,7 +26,7 @@ AM_CPPFLAGS = \
   -I$(top_srcdir)/proxy/mgmt2/cli \
   -I$(top_srcdir)/proxy/mgmt2/cluster \
   -I$(top_srcdir)/proxy/mgmt2/utils \
-  -I$(top_srcdir)/proxy/tsconfig \
+  -I$(top_srcdir)/lib/tsconfig \
   -I$(top_srcdir)/proxy/mgmt2/tools \
   -I$(top_srcdir)/proxy/hdrs
 

Modified: trafficserver/traffic/trunk/proxy/wccp/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/wccp/Makefile.am?rev=1041269&r1=1041268&r2=1041269&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/wccp/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/wccp/Makefile.am Thu Dec  2 03:20:23 2010
@@ -18,7 +18,7 @@
 #  limitations under the License.
 
 AM_CPPFLAGS = \
-  -I$(top_srcdir)/proxy/tsconfig \
+  -I$(top_srcdir)/lib/tsconfig \
   -I$(top_srcdir)/proxy/api/ts
 
 



Mime
View raw message