You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by ig...@apache.org on 2012/08/08 15:57:07 UTC
[2/2] git commit: [TS-1368] fix wccp's out of tree build
[TS-1368] fix wccp's out of tree build
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/72dcbdc5
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/72dcbdc5
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/72dcbdc5
Branch: refs/heads/master
Commit: 72dcbdc58024abc6f67a592853e488d7f9eebd83
Parents: 829826a
Author: Igor Galić <i....@brainsware.org>
Authored: Wed Aug 8 15:54:14 2012 +0200
Committer: Igor Galić <i....@brainsware.org>
Committed: Wed Aug 8 15:54:14 2012 +0200
----------------------------------------------------------------------
lib/tsconfig/Makefile.am | 5 +++--
lib/wccp/Makefile.am | 2 ++
2 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/72dcbdc5/lib/tsconfig/Makefile.am
----------------------------------------------------------------------
diff --git a/lib/tsconfig/Makefile.am b/lib/tsconfig/Makefile.am
index 2dae39b..7864472 100644
--- a/lib/tsconfig/Makefile.am
+++ b/lib/tsconfig/Makefile.am
@@ -23,7 +23,8 @@ libtsconfig_la_LDFLAGS = -no-undefined -version-info @TS_LIBTOOL_VERSION@
AM_YFLAGS = --yacc -d -p tsconfig
AM_CPPFLAGS = \
- -I$(top_srcdir)/lib
+ -I$(top_srcdir)/lib \
+ -I$(top_srcdir)/lib/ts
BUILT_SOURCES = \
TsConfigGrammar.c TsConfigGrammar.h TsConfigGrammar.hpp \
@@ -52,4 +53,4 @@ test_tsconfig_LDADD = libtsconfig.la ../ts/libtsutil.la @LIBEXECINFO@
# Strip to just the enum in the ts::config namespace so we can use
# it more easily in C++.
TsConfigGrammar.hpp: TsConfigGrammar.h BisonHeaderToC++.sed
- $(SED) -f $(srcdir)/BisonHeaderToC++.sed $(srcdir)/TsConfigGrammar.h > $@
+ $(SED) -f $(srcdir)/BisonHeaderToC++.sed $(builddir)/TsConfigGrammar.h > $@
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/72dcbdc5/lib/wccp/Makefile.am
----------------------------------------------------------------------
diff --git a/lib/wccp/Makefile.am b/lib/wccp/Makefile.am
index ccd09cb..fafc304 100644
--- a/lib/wccp/Makefile.am
+++ b/lib/wccp/Makefile.am
@@ -19,6 +19,8 @@
AM_CPPFLAGS = \
-I$(top_srcdir)/lib \
+ -I$(top_srcdir)/lib/ts \
+ -I$(top_builddir)/proxy/api/ts \
-I$(top_srcdir)/proxy/api/ts
#WCCP_DEFS = @WCCP_DEFS@