trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zw...@apache.org
Subject svn commit: r1060582 - in /trafficserver/traffic/trunk: Makefile.am configure.ac cop/ cop/Makefile.am proxy/mgmt/Makefile.am proxy/mgmt/cop/
Date Tue, 18 Jan 2011 21:18:10 GMT
Author: zwoop
Date: Tue Jan 18 21:18:09 2011
New Revision: 1060582

URL: http://svn.apache.org/viewvc?rev=1060582&view=rev
Log:
TS-638 Move proxy/mgmt/cop to cop/

Added:
    trafficserver/traffic/trunk/cop/
      - copied from r1060576, trafficserver/traffic/trunk/proxy/mgmt/cop/
Removed:
    trafficserver/traffic/trunk/proxy/mgmt/cop/
Modified:
    trafficserver/traffic/trunk/Makefile.am
    trafficserver/traffic/trunk/configure.ac
    trafficserver/traffic/trunk/cop/Makefile.am
    trafficserver/traffic/trunk/proxy/mgmt/Makefile.am

Modified: trafficserver/traffic/trunk/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/Makefile.am?rev=1060582&r1=1060581&r2=1060582&view=diff
==============================================================================
--- trafficserver/traffic/trunk/Makefile.am (original)
+++ trafficserver/traffic/trunk/Makefile.am Tue Jan 18 21:18:09 2011
@@ -24,9 +24,9 @@ ACLOCAL_AMFLAGS = -I build
 # proxy/api/ts has to be built first, since so much of libraries and "core
 # depends on the generates ts/ts.h include file.
 if STANDALONE_IOCORE
-SUBDIRS =  proxy/api/ts iocore lib proxy plugins
+SUBDIRS =  proxy/api/ts iocore lib proxy cop plugins
 else
-SUBDIRS =  proxy/api/ts iocore lib proxy rc doc plugins
+SUBDIRS =  proxy/api/ts iocore lib proxy cop rc doc plugins
 endif
 
 DIST_BUILD_USER=`id -nu`

Modified: trafficserver/traffic/trunk/configure.ac
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/configure.ac?rev=1060582&r1=1060581&r2=1060582&view=diff
==============================================================================
--- trafficserver/traffic/trunk/configure.ac (original)
+++ trafficserver/traffic/trunk/configure.ac Tue Jan 18 21:18:09 2011
@@ -1230,7 +1230,6 @@ AC_CONFIG_FILES([proxy/mgmt/api/remote/M
 AC_CONFIG_FILES([proxy/mgmt/cli2/Makefile])
 AC_CONFIG_FILES([proxy/mgmt/cli/Makefile])
 AC_CONFIG_FILES([proxy/mgmt/cluster/Makefile])
-AC_CONFIG_FILES([proxy/mgmt/cop/Makefile])
 AS_IF([test "x$enable_webui" = "xyes"],
   [AC_CONFIG_FILES([proxy/mgmt/html2/Makefile])
    AC_CONFIG_FILES([proxy/mgmt/html2/charting/Makefile])
@@ -1250,6 +1249,8 @@ AC_CONFIG_FILES([proxy/mgmt/web2/Makefil
 AC_CONFIG_FILES([proxy/stats/Makefile])
 AC_CONFIG_FILES([proxy/wccp/Makefile])
 AC_CONFIG_FILES([proxy/api/ts/Makefile])
+# Traffic Cop
+AC_CONFIG_FILES([cop/Makefile])
 # production plugins
 AC_CONFIG_FILES([plugins/Makefile])
 AC_CONFIG_FILES([plugins/conf_remap/Makefile])

Modified: trafficserver/traffic/trunk/cop/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/cop/Makefile.am?rev=1060582&r1=1060576&r2=1060582&view=diff
==============================================================================
--- trafficserver/traffic/trunk/cop/Makefile.am (original)
+++ trafficserver/traffic/trunk/cop/Makefile.am Tue Jan 18 21:18:09 2011
@@ -35,4 +35,4 @@ traffic_cop_LDADD = \
   $(top_builddir)/proxy/mgmt/api/remote/libmgmtapiremote.a \
   $(top_builddir)/iocore/utils/libinkutils.a \
   $(top_builddir)/lib/ts/libts.a \
-  @LIBTHREAD@ @LIBSOCKET@ @LIBTCL@ @LIBRT@ @LIBDL@ @LIBSSL@ 
+  @LIBTHREAD@ @LIBSOCKET@ @LIBTCL@ @LIBICONV@ @LIBRT@ @LIBDL@ @LIBSSL@ 

Modified: trafficserver/traffic/trunk/proxy/mgmt/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt/Makefile.am?rev=1060582&r1=1060581&r2=1060582&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/mgmt/Makefile.am Tue Jan 18 21:18:09 2011
@@ -18,9 +18,9 @@
 #  limitations under the License.
 
 if BUILD_WEBUI
-SUBDIRS = cli cluster preparse tools utils web2 html2 stats api cop $(CLI_DIR)
+SUBDIRS = cli cluster preparse tools utils web2 html2 stats api $(CLI_DIR)
 else
-SUBDIRS = cli cluster preparse tools utils web2 stats api cop $(CLI_DIR)
+SUBDIRS = cli cluster preparse tools utils web2 stats api $(CLI_DIR)
 endif
 
 DIST_SUBDIRS = $(SUBDIRS)



Mime
View raw message