diff options
| author | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2011-01-02 03:05:22 +0000 |
|---|---|---|
| committer | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2011-01-02 03:05:22 +0000 |
| commit | 1f252b24441ebdf6df3ce2ca16bca0d8eff935b4 (patch) | |
| tree | 1d6402a780e09500ef2a7ac70499f8aa432be354 | |
| parent | 743b32faab13dbd426a255ec770dff02fa2550f3 (diff) | |
Fix automake warning. Add pragmas to sources generated by Thrift using sed instead of incorrectly overriding CXXFLAGS.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1054345 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | sca-cpp/trunk/components/log/Makefile.am | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sca-cpp/trunk/components/log/Makefile.am b/sca-cpp/trunk/components/log/Makefile.am index c53230b23f..88ff7b3001 100644 --- a/sca-cpp/trunk/components/log/Makefile.am +++ b/sca-cpp/trunk/components/log/Makefile.am @@ -36,15 +36,13 @@ EXTRA_DIST = log.composite log.componentType logger.componentType *.scm *.thrift BUILT_SOURCES=gen-cpp/fb303_constants.cpp gen-cpp/fb303_types.cpp gen-cpp/scribe_constants.cpp gen-cpp/scribe.cpp gen-cpp/scribe_types.cpp gen-cpp/FacebookService.cpp gen-cpp/scribe.h gen-cpp/fb303_constants.cpp gen-cpp/fb303_types.cpp gen-cpp/scribe_constants.cpp gen-cpp/scribe.cpp gen-cpp/scribe_types.cpp gen-cpp/FacebookService.cpp gen-cpp/scribe.h: scribe.thrift - ${THRIFT_PREFIX}/bin/thrift -r --gen cpp scribe.thrift + ${THRIFT_PREFIX}/bin/thrift -r --gen cpp scribe.thrift; sed -i -e '1i#pragma GCC diagnostic ignored "-Wconversion"\n#pragma GCC diagnostic ignored "-Wunused"\n' gen-cpp/*.cpp CLEANFILES = gen-cpp/* comp_LTLIBRARIES = liblog.la liblogger.la noinst_DATA = liblog.so liblogger.so -CXXFLAGS = ${DEFAULT_CXXFLAGS} -Wno-unused-parameter -Wno-conversion - nodist_liblog_la_SOURCES = gen-cpp/fb303_constants.cpp gen-cpp/fb303_types.cpp gen-cpp/scribe_constants.cpp gen-cpp/scribe.cpp gen-cpp/scribe_types.cpp gen-cpp/FacebookService.cpp gen-cpp/scribe.h liblog_la_CXXFLAGS = -Wno-unused-parameter -Wno-conversion liblog_la_SOURCES = log.cpp |