svn commit: r1054345 - /tuscany/sca-cpp/trunk/components/log/Makefile.am

[js...@apache.org]

Author: jsdelfino
Date: Sun Jan  2 03:05:22 2011
New Revision: 1054345

URL: http://svn.apache.org/viewvc?rev=1054345&view=rev
Log:
Fix automake warning. Add pragmas to sources generated by Thrift using sed instead of incorrectly overriding CXXFLAGS.

Modified:
    tuscany/sca-cpp/trunk/components/log/Makefile.am

Modified: tuscany/sca-cpp/trunk/components/log/Makefile.am
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/components/log/Makefile.am?rev=1054345&r1=1054344&r2=1054345&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/components/log/Makefile.am (original)
+++ tuscany/sca-cpp/trunk/components/log/Makefile.am Sun Jan  2 03:05:22 2011
@@ -36,15 +36,13 @@ EXTRA_DIST = log.composite log.component
 
 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