diff options
| author | Patrick Ohly <patrick.ohly@intel.com> | 2016-09-20 07:00:28 -0700 |
|---|---|---|
| committer | Patrick Ohly <patrick.ohly@intel.com> | 2016-09-20 07:00:28 -0700 |
| commit | 33dce914e8b8ea965df41538b4c16d205eb7f983 (patch) | |
| tree | 9b3d223d38b96bd700e9feb082a9b9f1515592cf /src | |
| parent | 499c1c72d5fcf421c18cf2053b24bfda32c6034d (diff) | |
autotools: use cppcheck.pc
Now cppcheck is found via the normal PKG_CHECK_MODULES. The advantage
is that CPPUNIT_CFLAGS and CPPUNIT_LIBS can be overridden with
configure parameters, which will be used to link cppcheck statically
into syncevolution.org binaries (libcppunit ABI has changed).
Diffstat (limited to 'src')
| -rw-r--r-- | src/src.am | 8 | ||||
| -rw-r--r-- | src/syncevo/syncevo.am | 4 |
2 files changed, 6 insertions, 6 deletions
@@ -90,10 +90,10 @@ else CORE_SOURCES += $(BACKEND_REGISTRIES) endif -CORE_CXXFLAGS = $(SYNTHESIS_CFLAGS) $(CPPUNIT_CXXFLAGS) +CORE_CXXFLAGS = $(SYNTHESIS_CFLAGS) $(CPPUNIT_CFLAGS) CORE_LDADD = $(SYNCEVOLUTION_LDADD) src/syncevo/libsyncevolution.la $(GLIB_LIBS) $(GTHREAD_LIBS) $(GOBJECT_LIBS) $(LIBS) CORE_DEP = $(SYNCEVOLUTION_DEP) src/syncevo/libsyncevolution.la $(SYNTHESIS_DEP) -CORE_LD_FLAGS = -Wl,-uSyncEvolution_Module_Version -Wl,--export-dynamic $(CPPUNIT_LDFLAGS) $(ADDITIONAL_LDFLAGS) +CORE_LD_FLAGS = -Wl,-uSyncEvolution_Module_Version -Wl,--export-dynamic $(CPPUNIT_LIBS) $(ADDITIONAL_LDFLAGS) if ENABLE_ICALTZ_UTIL # Force inclusion of our own icaltz-util.o into binaries even though @@ -295,8 +295,8 @@ endif src_client_test_undef = $(shell nm $(patsubst %.la,%.a,$(subst /lib,/.libs/lib,$(src_client_test_libs))) | grep funambolAutoRegisterRegistry | sed -e 's/.* /-Wl,-u/' ) src_client_test_CPPFLAGS = -DHAVE_CONFIG_H -DENABLE_INTEGRATION_TESTS -DENABLE_UNIT_TESTS $(src_cppflags) $(QT_CPPFLAGS) -src_client_test_CXXFLAGS = $(filter-out -O2, @CPPUNIT_CXXFLAGS@ $(PCRECPP_CFLAGS) $(SYNCEVOLUTION_CXXFLAGS) $(CORE_CXXFLAGS) $(filter-out -O2 -g -W -Wall, $(QT_CXXFLAGS)) $(SYNCEVO_WFLAGS)) -src_client_test_LDFLAGS = @CPPUNIT_LDFLAGS@ $(src_client_test_undef) $(CORE_LD_FLAGS) $(QT_LDFLAGS) +src_client_test_CXXFLAGS = $(filter-out -O2, @CPPUNIT_CFLAGS@ $(PCRECPP_CFLAGS) $(SYNCEVOLUTION_CXXFLAGS) $(CORE_CXXFLAGS) $(filter-out -O2 -g -W -Wall, $(QT_CXXFLAGS)) $(SYNCEVO_WFLAGS)) +src_client_test_LDFLAGS = @CPPUNIT_LIBS@ $(src_client_test_undef) $(CORE_LD_FLAGS) $(QT_LDFLAGS) src_client_test_LDADD = $(src_client_test_libs) $(CORE_LDADD) $(PCRECPP_LIBS) $(SYNTHESIS_ENGINE) $(QT_LIBS) if !ENABLE_EVOLUTION_COMPATIBILITY src_client_test_LDADD += $(LIBICAL_LIBS) diff --git a/src/syncevo/syncevo.am b/src/syncevo/syncevo.am index 29eeddb8..a3bb5f25 100644 --- a/src/syncevo/syncevo.am +++ b/src/syncevo/syncevo.am @@ -10,8 +10,8 @@ src_syncevo_ldadd = @SYNCEVOLUTION_LDADD@ src_syncevo_ldadd += $(gdbus_build_dir)/libgdbussyncevo.la if ENABLE_UNIT_TESTS -src_syncevo_cxxflags += $(CPPUNIT_CXXFLAGS) -src_syncevo_ldadd += $(CPPUNIT_LDFLAGS) +src_syncevo_cxxflags += $(CPPUNIT_CFLAGS) +src_syncevo_ldadd += $(CPPUNIT_LIBS) endif lib_LTLIBRARIES += src/syncevo/libsyncevolution.la |