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/06/11 22:11:28 UTC
svn commit: r953861 - in /trafficserver/traffic/trunk: ./ proxy/mgmt2/
proxy/mgmt2/tools/
Author: zwoop
Date: Fri Jun 11 20:11:27 2010
New Revision: 953861
URL: http://svn.apache.org/viewvc?rev=953861&view=rev
Log:
TS-16: Cleanup some proxy/mgmt2/tools
Tested: FC13
This gets rid of a few unusued things, I still think we need to move
the "lib" components somewhere else (e.g. into cli2 or libinktomi++_.
Removed:
trafficserver/traffic/trunk/proxy/mgmt2/tools/McastSnoop.cc
trafficserver/traffic/trunk/proxy/mgmt2/tools/NetConfig.cc
trafficserver/traffic/trunk/proxy/mgmt2/tools/TimeConfig.cc
trafficserver/traffic/trunk/proxy/mgmt2/tools/VIPConfig.cc
trafficserver/traffic/trunk/proxy/mgmt2/tools/vip_config_rm
Modified:
trafficserver/traffic/trunk/configure.ac
trafficserver/traffic/trunk/proxy/mgmt2/Makefile.am
trafficserver/traffic/trunk/proxy/mgmt2/tools/Makefile.am
Modified: trafficserver/traffic/trunk/configure.ac
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/configure.ac?rev=953861&r1=953860&r2=953861&view=diff
==============================================================================
--- trafficserver/traffic/trunk/configure.ac (original)
+++ trafficserver/traffic/trunk/configure.ac Fri Jun 11 20:11:27 2010
@@ -1033,8 +1033,7 @@ AS_IF([test "x$enable_webui" = "xyes"],
AC_CONFIG_FILES([proxy/mgmt2/html2/monitor/Makefile])
AC_CONFIG_FILES([proxy/mgmt2/html2/mrtg/Makefile])
AC_CONFIG_FILES([proxy/mgmt2/html2/tune/Makefile])
-]
-)
+])
AC_CONFIG_FILES([proxy/mgmt2/Makefile])
AC_CONFIG_FILES([proxy/mgmt2/preparse/Makefile])
AC_CONFIG_FILES([proxy/mgmt2/stats/Makefile])
Modified: trafficserver/traffic/trunk/proxy/mgmt2/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/Makefile.am?rev=953861&r1=953860&r2=953861&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/Makefile.am Fri Jun 11 20:11:27 2010
@@ -23,6 +23,8 @@ else
SUBDIRS = cli cluster cop preparse tools utils web2 stats api2 $(CLI_DIR)
endif
+DIST_SUBDIRS = $(SUBDIRS)
+
AM_CPPFLAGS = \
$(iocore_include_dirs) \
-I$(top_srcdir)/librecords \
Modified: trafficserver/traffic/trunk/proxy/mgmt2/tools/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/tools/Makefile.am?rev=953861&r1=953860&r2=953861&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/tools/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/tools/Makefile.am Fri Jun 11 20:11:27 2010
@@ -28,41 +28,12 @@ AM_CPPFLAGS = \
MGMT_DEFS = @MGMT_DEFS@
DEFS += $(MGMT_DEFS)
-noinst_PROGRAMS = traffic_vip_config traffic_net_config traffic_time_config traffic_shmem_clean traffic_mcast_snoop
-
+noinst_PROGRAMS = traffic_shmem_clean
noinst_LIBRARIES = libinksysapi.a libinkconfigapi.a
-traffic_vip_config_SOURCES = VIPConfig.cc
-traffic_vip_config_LDFLAGS = @EXTRA_CXX_LDFLAGS@
-traffic_vip_config_LDADD = \
- $(top_builddir)/iocore/utils/libinkutils.a \
- $(top_builddir)/libinktomi++/libinktomi++.a \
- @LIBSOCKET@ @LIBTCL@ @LIBRT@ @LIBDL@ @LIBICONV@ @LIBEXECINFO@
-
-traffic_net_config_SOURCES = NetConfig.cc
-traffic_net_config_LDFLAGS = @EXTRA_CXX_LDFLAGS@
-traffic_net_config_LDADD = \
- $(top_builddir)/iocore/utils/libinkutils.a \
- $(top_builddir)/libinktomi++/libinktomi++.a \
- @LIBSOCKET@ @LIBTCL@ @LIBRT@ @LIBICONV@ @LIBEXECINFO@
-
-traffic_time_config_SOURCES = TimeConfig.cc
-traffic_time_config_LDFLAGS = @EXTRA_CXX_LDFLAGS@
-traffic_time_config_LDADD = \
- $(top_builddir)/iocore/utils/libinkutils.a \
- $(top_builddir)/libinktomi++/libinktomi++.a \
- @LIBSOCKET@ @LIBTCL@ @LIBRT@ @LIBICONV@ @LIBEXECINFO@
-
traffic_shmem_clean_SOURCES = ShmemClean.cc
traffic_shmem_clean_LDFLAGS = @EXTRA_CXX_LDFLAGS@
-traffic_mcast_snoop_SOURCES = McastSnoop.cc
-traffic_mcast_snoop_LDFLAGS = @EXTRA_CXX_LDFLAGS@
-traffic_mcast_snoop_LDADD = \
- $(top_builddir)/iocore/utils/libinkutils.a \
- $(top_builddir)/libinktomi++/libinktomi++.a \
- @LIBSOCKET@ @LIBNSL@ @LIBTCL@ @LIBRT@ @LIBTHREAD@ @LIBDL@ @LIBICONV@ @LIBEXECINFO@
-
libinksysapi_a_SOURCES = SysAPI.cc SysAPI.h
libinkconfigapi_a_SOURCES = \