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

diff --git a/ChangeLog b/ChangeLog
index d3f1f01ff25cb8828b9c23b481f67e65b15845ad..2bff70b03f59034c4c9c60bb159e3d9c78b139af 100644 (file)
--- 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 e518fe9fb92497cdc519b4c269fa005d309c491c..e757bff3e6ba895d4dfc065c3784ab68dd2bf3b4 100644 (file)
--- 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 2c7bf627c819b89c5c99a09a6cdb50114679884d..bd3edd23b5eebc2111a5cdcc8aa319744bb98e8a 100644 (file)
--- 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 c530f3c9ff86816bdaec66c4a2b17437023daf6f..01bbc1f871a6391eda1140ebfd41335a2ebf2ccf 100644 (file)
--- 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 8a0cf5c48663e04f360cef2ef7ff32e4e5592396..46a429bbee08023c17f17d4c917e50694bc66508 100644 (file)
--- 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 1b5cb97c4ffa74854a7067009baeb44697d1502d..d57bae677d8b98c578d9e1947cd7343b71f138b7 100644 (file)
--- 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 53114acab78bf0a9f0ddd5f54fa3c3e8f272fce1..830b59de720da648a29db7b71f199a0822ff3488 100644 (file)
--- 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 b96543b1e977bc6512bed18970130b5112d0bbbf..9e49e1426cc220171ee9bdae3b7503b7ccb651f0 100644 (file)
--- 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 f2d6a69596b07e876dbe395911be34b81d67a892..a1e19f8a7f2200ca36f687cccae6b9329597a49e 100644 (file)
--- 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