BIND 10 master, updated. 0e2851da1d2f91263c2f474fecdfe14427cf5c34 [master] Fix building with srcdir != objdir

BIND 10 source code commits bind10-changes at lists.isc.org
Tue Dec 17 05:36:12 UTC 2013


The branch, master has been updated
       via  0e2851da1d2f91263c2f474fecdfe14427cf5c34 (commit)
      from  0b4b438f337361eeeb7f5e5dbaf9938c24353812 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 0e2851da1d2f91263c2f474fecdfe14427cf5c34
Author: Kean Johnston <kean at isc.org>
Date:   Tue Dec 17 07:33:22 2013 +0200

    [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.

-----------------------------------------------------------------------

Summary of changes:
 tests/tools/perfdhcp/Makefile.am       |    3 ++-
 tests/tools/perfdhcp/tests/Makefile.am |    1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

-----------------------------------------------------------------------
diff --git a/tests/tools/perfdhcp/Makefile.am b/tests/tools/perfdhcp/Makefile.am
index 014a4e2..cfab327 100644
--- a/tests/tools/perfdhcp/Makefile.am
+++ b/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
\ No newline at end of file
+EXTRA_DIST = perfdhcp_internals.dox
diff --git a/tests/tools/perfdhcp/tests/Makefile.am b/tests/tools/perfdhcp/tests/Makefile.am
index 64f446b..31c11ed 100644
--- a/tests/tools/perfdhcp/tests/Makefile.am
+++ b/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)



More information about the bind10-changes mailing list