You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by ro...@apache.org on 2014/09/29 22:05:59 UTC
git commit: THRIFT-2716 - removed warnings from some Makefile.ams
Repository: thrift
Updated Branches:
refs/heads/master eb8e5ad87 -> 1ff4a97a4
THRIFT-2716 - removed warnings from some Makefile.ams
Project: http://git-wip-us.apache.org/repos/asf/thrift/repo
Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/1ff4a97a
Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/1ff4a97a
Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/1ff4a97a
Branch: refs/heads/master
Commit: 1ff4a97a45a78e4afe88660927fb798c18336f7d
Parents: eb8e5ad
Author: Konrad Grochowski <hc...@minions.org.pl>
Authored: Fri Sep 19 23:57:57 2014 +0200
Committer: Roger Meier <ro...@apache.org>
Committed: Mon Sep 29 22:05:49 2014 +0200
----------------------------------------------------------------------
lib/cpp/test/Makefile.am | 5 +----
test/cpp/Makefile.am | 5 +----
tutorial/cpp/Makefile.am | 5 +----
3 files changed, 3 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/thrift/blob/1ff4a97a/lib/cpp/test/Makefile.am
----------------------------------------------------------------------
diff --git a/lib/cpp/test/Makefile.am b/lib/cpp/test/Makefile.am
index ba32cb8..012d226 100755
--- a/lib/cpp/test/Makefile.am
+++ b/lib/cpp/test/Makefile.am
@@ -266,10 +266,7 @@ gen-cpp/SecondService.cpp gen-cpp/ThriftTest_constants.cpp gen-cpp/ThriftTest.cp
gen-cpp/ChildService.cpp: processor/proc.thrift
$(THRIFT) --gen cpp:templates,cob_style $<
-INCLUDES = \
- -I$(top_srcdir)/lib/cpp/src
-
-AM_CPPFLAGS = $(BOOST_CPPFLAGS)
+AM_CPPFLAGS = $(BOOST_CPPFLAGS) -I$(top_srcdir)/lib/cpp/src
AM_LDFLAGS = $(BOOST_LDFLAGS)
AM_CXXFLAGS = -Wall
http://git-wip-us.apache.org/repos/asf/thrift/blob/1ff4a97a/test/cpp/Makefile.am
----------------------------------------------------------------------
diff --git a/test/cpp/Makefile.am b/test/cpp/Makefile.am
index 5e96596..3dbcaaa 100755
--- a/test/cpp/Makefile.am
+++ b/test/cpp/Makefile.am
@@ -96,10 +96,7 @@ gen-cpp/ThriftTest.cpp gen-cpp/ThriftTest_types.cpp gen-cpp/ThriftTest_constants
gen-cpp/StressTest_types.cpp gen-cpp/StressTest_constants.cpp: $(top_srcdir)/test/StressTest.thrift
$(THRIFT) --gen cpp $<
-INCLUDES = \
- -I$(top_srcdir)/lib/cpp/src -Igen-cpp
-
-AM_CPPFLAGS = $(BOOST_CPPFLAGS) $(LIBEVENT_CPPFLAGS)
+AM_CPPFLAGS = $(BOOST_CPPFLAGS) $(LIBEVENT_CPPFLAGS) -I$(top_srcdir)/lib/cpp/src -Igen-cpp
AM_CXXFLAGS = -Wall
AM_LDFLAGS = $(BOOST_LDFLAGS) $(LIBEVENT_LDFLAGS)
http://git-wip-us.apache.org/repos/asf/thrift/blob/1ff4a97a/tutorial/cpp/Makefile.am
----------------------------------------------------------------------
diff --git a/tutorial/cpp/Makefile.am b/tutorial/cpp/Makefile.am
index b829845..918adb2 100755
--- a/tutorial/cpp/Makefile.am
+++ b/tutorial/cpp/Makefile.am
@@ -62,10 +62,7 @@ THRIFT = $(top_builddir)/compiler/cpp/thrift
gen-cpp/Calculator.cpp gen-cpp/tutorial_types.cpp gen-cpp/tutorial_constants.cpp: $(top_srcdir)/tutorial/tutorial.thrift
$(THRIFT) --gen cpp -r $<
-INCLUDES = \
- -I$(top_srcdir)/lib/cpp/src -Igen-cpp
-
-AM_CPPFLAGS = $(BOOST_CPPFLAGS) $(LIBEVENT_CPPFLAGS)
+AM_CPPFLAGS = $(BOOST_CPPFLAGS) $(LIBEVENT_CPPFLAGS) -I$(top_srcdir)/lib/cpp/src -Igen-cpp
AM_CXXFLAGS = -Wall
AM_LDFLAGS = $(BOOST_LDFLAGS) $(LIBEVENT_LDFLAGS)