diff options
| author | Francis Dupont <fdupont@isc.org> | 2015-09-16 15:38:20 +0200 |
|---|---|---|
| committer | Francis Dupont <fdupont@isc.org> | 2015-09-16 15:38:20 +0200 |
| commit | 4d13f5234da33df03c0989829a0e1c1056e53a4e (patch) | |
| tree | 34603d731b312456cd6537cb2bdea11703d58019 /src/lib/cfgrpt | |
| parent | [master] Added ChangeLog entry for #3966. (diff) | |
| parent | [3911a] untabify (diff) | |
| download | kea-4d13f5234da33df03c0989829a0e1c1056e53a4e.tar.xz kea-4d13f5234da33df03c0989829a0e1c1056e53a4e.zip | |
[master] Finished merge of trac3911a (Makefile.am dependency)
Diffstat (limited to 'src/lib/cfgrpt')
| -rw-r--r-- | src/lib/cfgrpt/Makefile.am | 2 | ||||
| -rw-r--r-- | src/lib/cfgrpt/tests/Makefile.am | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/lib/cfgrpt/Makefile.am b/src/lib/cfgrpt/Makefile.am index 46a644582e..beed7c3678 100644 --- a/src/lib/cfgrpt/Makefile.am +++ b/src/lib/cfgrpt/Makefile.am @@ -1,5 +1,7 @@ SUBDIRS = . tests + AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib +AM_CXXFLAGS = $(KEA_CXXFLAGS) # Get rid of generated message files on a clean CLEANFILES = *.gcno *.gcda config_report.cc diff --git a/src/lib/cfgrpt/tests/Makefile.am b/src/lib/cfgrpt/tests/Makefile.am index df3bc191cc..408dbadbe7 100644 --- a/src/lib/cfgrpt/tests/Makefile.am +++ b/src/lib/cfgrpt/tests/Makefile.am @@ -20,8 +20,8 @@ run_unittests_SOURCES = config_report_unittests.cc run_unittests.cc run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES) run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS) -run_unittests_LDADD = $(GTEST_LDADD) -run_unittests_LDADD += $(top_builddir)/src/lib/cfgrpt/libcfgrpt.la +run_unittests_LDADD = $(top_builddir)/src/lib/cfgrpt/libcfgrpt.la +run_unittests_LDADD += $(GTEST_LDADD) endif |