From: Francis Dupont <fdupont@isc.org>
Date: Tue, 21 Oct 2014 10:51:13 +0000 (+0200)
Subject: [trac3162] partial fix of subdir-objects spurious warnings on OSX
X-Git-Tag: trac3162a_base~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e25c7477f3c35cdaa0f038732f697224bfd44847;p=thirdparty%2Fkea.git

[trac3162] partial fix of subdir-objects spurious warnings on OSX
---

diff --git a/ChangeLog b/ChangeLog
index d3f1f01ff2..2bff70b03f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+846.	[bug]		fdupont
+	Fixed subdir-objects warnings from recent versions of autotools,
+	e.g., on Apple OSX.
+	(Trac #3162, git ...)
+
 845.	[func]		marcin
 	Implemented Host class for storing information about IPv4 and IPv6
 	reservations for the host.
diff --git a/src/bin/d2/tests/Makefile.am b/src/bin/d2/tests/Makefile.am
index e518fe9fb9..e757bff3e6 100644
--- a/src/bin/d2/tests/Makefile.am
+++ b/src/bin/d2/tests/Makefile.am
@@ -1,3 +1,5 @@
+AUTOMAKE_OPTIONS = subdir-objects
+
 SHTESTS =
 # The test of dynamic reconfiguration based on signals will work only
 # if we are using file based configuration approach.
diff --git a/src/bin/dhcp4/tests/Makefile.am b/src/bin/dhcp4/tests/Makefile.am
index 2c7bf627c8..bd3edd23b5 100644
--- a/src/bin/dhcp4/tests/Makefile.am
+++ b/src/bin/dhcp4/tests/Makefile.am
@@ -1,3 +1,5 @@
+AUTOMAKE_OPTIONS = subdir-objects
+
 SHTESTS =
 # The test of dynamic reconfiguration based on signals will work only
 # if we are using file based configuration approach.
diff --git a/src/bin/dhcp6/tests/Makefile.am b/src/bin/dhcp6/tests/Makefile.am
index c530f3c9ff..01bbc1f871 100644
--- a/src/bin/dhcp6/tests/Makefile.am
+++ b/src/bin/dhcp6/tests/Makefile.am
@@ -1,3 +1,5 @@
+AUTOMAKE_OPTIONS = subdir-objects
+
 SHTESTS =
 # The test of dynamic reconfiguration based on signals will work only
 # if we are using file based configuration approach.
diff --git a/src/bin/perfdhcp/tests/Makefile.am b/src/bin/perfdhcp/tests/Makefile.am
index 8a0cf5c486..46a429bbee 100644
--- a/src/bin/perfdhcp/tests/Makefile.am
+++ b/src/bin/perfdhcp/tests/Makefile.am
@@ -1,3 +1,5 @@
+AUTOMAKE_OPTIONS = subdir-objects
+
 SUBDIRS = . testdata
 
 AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
@@ -31,12 +33,12 @@ run_unittests_SOURCES += rate_control_unittest.cc
 run_unittests_SOURCES += stats_mgr_unittest.cc
 run_unittests_SOURCES += test_control_unittest.cc
 run_unittests_SOURCES += command_options_helper.h
-run_unittests_SOURCES += $(top_builddir)/src/bin/perfdhcp/command_options.cc
-run_unittests_SOURCES += $(top_builddir)/src/bin/perfdhcp/pkt_transform.cc
-run_unittests_SOURCES += $(top_builddir)/src/bin/perfdhcp/perf_pkt6.cc
-run_unittests_SOURCES += $(top_builddir)/src/bin/perfdhcp/perf_pkt4.cc
-run_unittests_SOURCES += $(top_builddir)/src/bin/perfdhcp/rate_control.cc
-run_unittests_SOURCES += $(top_builddir)/src/bin/perfdhcp/test_control.cc
+run_unittests_SOURCES += ../command_options.cc
+run_unittests_SOURCES += ../pkt_transform.cc
+run_unittests_SOURCES += ../perf_pkt6.cc
+run_unittests_SOURCES += ../perf_pkt4.cc
+run_unittests_SOURCES += ../rate_control.cc
+run_unittests_SOURCES += ../test_control.cc
 
 run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
 run_unittests_LDFLAGS  = $(AM_LDFLAGS)  $(GTEST_LDFLAGS)
diff --git a/src/hooks/dhcp/user_chk/tests/Makefile.am b/src/hooks/dhcp/user_chk/tests/Makefile.am
index 1b5cb97c4f..d57bae677d 100644
--- a/src/hooks/dhcp/user_chk/tests/Makefile.am
+++ b/src/hooks/dhcp/user_chk/tests/Makefile.am
@@ -1,3 +1,5 @@
+AUTOMAKE_OPTIONS = subdir-objects
+
 SUBDIRS = .
 
 AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
diff --git a/src/lib/asiodns/tests/Makefile.am b/src/lib/asiodns/tests/Makefile.am
index 53114acab7..830b59de72 100644
--- a/src/lib/asiodns/tests/Makefile.am
+++ b/src/lib/asiodns/tests/Makefile.am
@@ -1,3 +1,5 @@
+AUTOMAKE_OPTIONS = subdir-objects
+
 AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
 AM_CPPFLAGS += $(BOOST_INCLUDES)
 AM_CPPFLAGS += -I$(top_builddir)/src/lib/dns -I$(top_srcdir)/src/bin
diff --git a/src/lib/dns/Makefile.am b/src/lib/dns/Makefile.am
index b96543b1e9..9e49e1426c 100644
--- a/src/lib/dns/Makefile.am
+++ b/src/lib/dns/Makefile.am
@@ -1,3 +1,5 @@
+AUTOMAKE_OPTIONS = subdir-objects
+
 SUBDIRS = . tests
 
 AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
diff --git a/src/lib/util/Makefile.am b/src/lib/util/Makefile.am
index f2d6a69596..a1e19f8a7f 100644
--- a/src/lib/util/Makefile.am
+++ b/src/lib/util/Makefile.am
@@ -1,3 +1,5 @@
+AUTOMAKE_OPTIONS = subdir-objects
+
 SUBDIRS = . io unittests tests python threads
 
 AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib