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/21 05:17:19 UTC
git commit: Enable automake subdir-objects
Updated Branches:
refs/heads/master 66192fca6 -> 13411cb95
Enable automake subdir-objects
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/13411cb9
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/13411cb9
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/13411cb9
Branch: refs/heads/master
Commit: 13411cb9596a6cdcfda62b209b772ffb9fc919f3
Parents: 66192fc
Author: James Peach <jp...@apache.org>
Authored: Wed Mar 20 21:17:03 2013 -0700
Committer: James Peach <jp...@apache.org>
Committed: Wed Mar 20 21:17:03 2013 -0700
----------------------------------------------------------------------
configure.ac | 2 +-
mgmt/utils/Makefile.am | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/13411cb9/configure.ac
----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index fe1648a..652f327 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 1.9.2])
+AM_INIT_AUTOMAKE([-Wall -Werror foreign no-installinfo no-installman subdir-objects 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/13411cb9/mgmt/utils/Makefile.am
----------------------------------------------------------------------
diff --git a/mgmt/utils/Makefile.am b/mgmt/utils/Makefile.am
index 145a4ba..7829b01 100644
--- a/mgmt/utils/Makefile.am
+++ b/mgmt/utils/Makefile.am
@@ -40,8 +40,8 @@ noinst_LIBRARIES = libutils_lm.a libutils_p.a
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 \
+ ../../lib/ts/MatcherUtils.cc \
+ ../../proxy/DiagsConfig.cc \
EnvBlock.cc \
EnvBlock.h \
ExpandingArray.cc \