trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zw...@apache.org
Subject svn commit: r1058835 - in /trafficserver/traffic/trunk: configure.ac proxy/mgmt/Makefile.am proxy/mgmt/utils/Makefile.am rc/Makefile.am rc/update_records.cc
Date Fri, 14 Jan 2011 01:59:28 GMT
Author: zwoop
Date: Fri Jan 14 01:59:27 2011
New Revision: 1058835

URL: http://svn.apache.org/viewvc?rev=1058835&view=rev
Log:
TS-637 Remove update_records.cc

Also cleanup some discrepancies with how we use LOCAL_MANAGER
define. This is sort of a mess honestly, we ought to clean this
up better long term.

Removed:
    trafficserver/traffic/trunk/rc/update_records.cc
Modified:
    trafficserver/traffic/trunk/configure.ac
    trafficserver/traffic/trunk/proxy/mgmt/Makefile.am
    trafficserver/traffic/trunk/proxy/mgmt/utils/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=1058835&r1=1058834&r2=1058835&view=diff
==============================================================================
--- trafficserver/traffic/trunk/configure.ac (original)
+++ trafficserver/traffic/trunk/configure.ac Fri Jan 14 01:59:27 2011
@@ -228,7 +228,7 @@ AC_ARG_ENABLE([standalone-iocore],
 AC_MSG_RESULT([$enable_standalone_iocore])
 TS_ARG_ENABLE_VAR([has],[standalone-iocore])
 AC_SUBST(has_standalone_iocore)
-AS_IF([test $has_standalone_iocore],
+AS_IF([test 0 -ne $has_standalone_iocore],
   [AC_SUBST([IOCORE_MODULARIZED_DEFS],[""])
    AC_SUBST([ink_with_modules_def],["-DREC_BUILD_STAND_ALONE"])
    AC_SUBST([ink_with_modules_local],[""])

Modified: trafficserver/traffic/trunk/proxy/mgmt/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt/Makefile.am?rev=1058835&r1=1058834&r2=1058835&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/mgmt/Makefile.am Fri Jan 14 01:59:27 2011
@@ -25,7 +25,8 @@ endif
 
 DIST_SUBDIRS = $(SUBDIRS)
 
-AM_CPPFLAGS = \
+# This is for traffic_manager only (local manager)
+AM_CPPFLAGS = $(ink_with_modules_local) \
   $(iocore_include_dirs) \
   -I$(top_srcdir)/lib/records \
   -I$(top_srcdir)/proxy \
@@ -42,10 +43,21 @@ AM_CPPFLAGS = \
 MGMT_DEFS = @MGMT_DEFS@
 DEFS += $(MGMT_DEFS)
 
-noinst_LIBRARIES = libmgmt_p.a librecords.a
+noinst_LIBRARIES = libmgmt_p.a
 
 bin_PROGRAMS = traffic_manager
 
+# Compile this for "process manager"
+libmgmt_p_a_CPPFLAGS = \
+  $(iocore_include_dirs) \
+  -I$(top_srcdir)/lib/records \
+  -I$(top_srcdir)/proxy/hdrs \
+  -I$(top_srcdir)/proxy/mgmt/api/include \
+  -I$(top_srcdir)/proxy/mgmt/cluster \
+  -I$(top_srcdir)/proxy/mgmt/preparse \
+  -I$(top_srcdir)/proxy/mgmt/utils \
+  -I$(top_srcdir)/proxy/mgmt/web2 \
+  -I$(top_srcdir)/proxy
 libmgmt_p_a_SOURCES = \
   BaseManager.cc \
   BaseManager.h \
@@ -55,13 +67,6 @@ libmgmt_p_a_SOURCES = \
   RecordsConfig.cc \
   RecordsConfig.h
 
-librecords_a_CPPFLAGS = -DFOR_INSTALL $(AM_CPPFLAGS)
-librecords_a_SOURCES = \
-  MgmtDefs.h \
-  RecordsConfig.cc \
-  RecordsConfig.h
-
-traffic_manager_CPPFLAGS = -DLOCAL_MANAGER $(AM_CPPFLAGS)
 traffic_manager_SOURCES = \
   $(top_srcdir)/proxy/Error.cc \
   AddConfigFilesHere.cc \

Modified: trafficserver/traffic/trunk/proxy/mgmt/utils/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt/utils/Makefile.am?rev=1058835&r1=1058834&r2=1058835&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt/utils/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/mgmt/utils/Makefile.am Fri Jan 14 01:59:27 2011
@@ -36,7 +36,7 @@ EXTRA_DIST = MgmtHashTable.h MgmtSocket.
 
 noinst_LIBRARIES = libutils_lm.a libutils_p.a
 
-libutils_lm_a_CPPFLAGS = -DLOCAL_MANAGER $(AM_CPPFLAGS)
+libutils_lm_a_CPPFLAGS = $(ink_with_modules_local) $(AM_CPPFLAGS)
 libutils_lm_a_SOURCES = \
   $(top_srcdir)/lib/ts/MatcherUtils.cc \
   $(top_srcdir)/proxy/DiagsConfig.cc \

Modified: trafficserver/traffic/trunk/rc/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/rc/Makefile.am?rev=1058835&r1=1058834&r2=1058835&view=diff
==============================================================================
--- trafficserver/traffic/trunk/rc/Makefile.am (original)
+++ trafficserver/traffic/trunk/rc/Makefile.am Fri Jan 14 01:59:27 2011
@@ -26,13 +26,3 @@ AM_CPPFLAGS = \
 
 dist_bin_SCRIPTS = \
   trafficserver
-
-noinst_PROGRAMS = update_records
-
-update_records_SOURCES = update_records.cc 
-update_records_LDFLAGS = @EXTRA_CXX_LDFLAGS@
-update_records_LDADD =	\
-			$(top_builddir)/proxy/mgmt/librecords.a \
-			$(top_builddir)/lib/ts/libts.a \
-			@LIBICONV@ @LIBTHREAD@ @LIBRT@ @LIBTCL@ @LIBDL@ @LIBSSL@ @LIBEXECINFO@
-



Mime
View raw message