You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by jp...@apache.org on 2013/03/22 23:44:01 UTC
git commit: Revert automake subdir-objects
Updated Branches:
refs/heads/master da19639e0 -> 02eb936fe
Revert automake subdir-objects
This is supposed to be the automake default in the future, but it
breaks 'make distclean' for our build. Each time I fix one instance
of this breakage another one pops up.
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/02eb936f
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/02eb936f
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/02eb936f
Branch: refs/heads/master
Commit: 02eb936fed2e90c7b9db47c958b3754876a966a5
Parents: da19639
Author: James Peach <jp...@apache.org>
Authored: Fri Mar 22 15:40:43 2013 -0700
Committer: James Peach <jp...@apache.org>
Committed: Fri Mar 22 15:40:43 2013 -0700
----------------------------------------------------------------------
configure.ac | 2 +-
mgmt/Makefile.am | 2 +-
mgmt/utils/Makefile.am | 2 --
3 files changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/02eb936f/configure.ac
----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index 19d2a39..4561409 100644
--- a/configure.ac
+++ b/configure.ac
@@ -40,7 +40,7 @@ AC_PREREQ([2.59])
AC_CONFIG_AUX_DIR([build/aux])
AC_CONFIG_SRCDIR([proxy/Main.cc])
AC_CONFIG_MACRO_DIR([build])
-AM_INIT_AUTOMAKE([-Wall -Werror foreign no-installinfo no-installman subdir-objects 1.9.2])
+AM_INIT_AUTOMAKE([-Wall -Werror foreign no-installinfo no-installman 1.9.2])
AC_CONFIG_HEADERS([lib/ts/ink_autoconf.h])
# Configure with --disable-silent-rules to get verbose output. For more info, see
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/02eb936f/mgmt/Makefile.am
----------------------------------------------------------------------
diff --git a/mgmt/Makefile.am b/mgmt/Makefile.am
index a5b8c0d..ea47373 100644
--- a/mgmt/Makefile.am
+++ b/mgmt/Makefile.am
@@ -18,7 +18,6 @@
# limitations under the License.
SUBDIRS = cluster preparse tools utils web2 stats api cli
-DIST_SUBDIRS = $(SUBDIRS)
# This is for traffic_manager only (local manager)
AM_CPPFLAGS = $(ink_with_modules_local) \
@@ -71,6 +70,7 @@ libmgmt_p_a_SOURCES = \
traffic_manager_SOURCES = \
../proxy/Error.cc \
+ ../proxy/DiagsConfig.cc \
AddConfigFilesHere.cc \
Alarms.cc \
Alarms.h \
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/02eb936f/mgmt/utils/Makefile.am
----------------------------------------------------------------------
diff --git a/mgmt/utils/Makefile.am b/mgmt/utils/Makefile.am
index 7829b01..a03ecb0 100644
--- a/mgmt/utils/Makefile.am
+++ b/mgmt/utils/Makefile.am
@@ -40,8 +40,6 @@ noinst_LIBRARIES = libutils_lm.a libutils_p.a
libutils_lm_a_CPPFLAGS = $(ink_with_modules_local) $(AM_CPPFLAGS)
libutils_lm_a_SOURCES = \
- ../../lib/ts/MatcherUtils.cc \
- ../../proxy/DiagsConfig.cc \
EnvBlock.cc \
EnvBlock.h \
ExpandingArray.cc \