Parcourir la source

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

Francis Dupont il y a 10 ans
Parent
commit
e25c7477f3

+ 5 - 0
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.

+ 2 - 0
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.

+ 2 - 0
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.

+ 2 - 0
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.

+ 8 - 6
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)

+ 2 - 0
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

+ 2 - 0
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

+ 2 - 0
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

+ 2 - 0
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