Browse Source

[master] Fix building with srcdir != objdir

Recent changes to the perfdhcp tool introduced a new breakage when
configuring with srcdir != objdir. These were introuced by the code
using #include <tests/tools/perfdhcp/SOME_FILE.h> but there were no
-I flags set to allow for including files from the top level.
Kean Johnston 11 years ago
parent
commit
0e2851da1d
2 changed files with 3 additions and 1 deletions
  1. 2 1
      tests/tools/perfdhcp/Makefile.am
  2. 1 0
      tests/tools/perfdhcp/tests/Makefile.am

+ 2 - 1
tests/tools/perfdhcp/Makefile.am

@@ -2,6 +2,7 @@ SUBDIRS = . tests
 
 AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
 AM_CPPFLAGS += -I$(top_srcdir)/src/lib/log -I$(top_builddir)/src/lib/log
+AM_CPPFLAGS += -I$(top_builddir) -I$(top_srcdir)
 AM_CPPFLAGS += $(BOOST_INCLUDES)
 
 AM_CXXFLAGS = $(B10_CXXFLAGS)
@@ -43,4 +44,4 @@ perfdhcp_LDADD += $(top_builddir)/src/lib/asiolink/libb10-asiolink.la
 
 
 # ... and the documentation
-EXTRA_DIST = perfdhcp_internals.dox
+EXTRA_DIST = perfdhcp_internals.dox

+ 1 - 0
tests/tools/perfdhcp/tests/Makefile.am

@@ -1,6 +1,7 @@
 SUBDIRS = . testdata
 
 AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
+AM_CPPFLAGS += -I$(top_builddir) -I$(top_srcdir)
 AM_CPPFLAGS += -DTEST_DATA_DIR=\"$(abs_srcdir)/testdata\"
 AM_CPPFLAGS += $(BOOST_INCLUDES)
 AM_CXXFLAGS = $(B10_CXXFLAGS)