build: merge "src/rdisc/tests/Makefile.am" into toplevel Makefile

5 files changed, 40 insertions, 42 deletions

diff --git a/Makefile.am b/Makefile.am
index 8246c38c00..cd374ebdc5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,6 +27,7 @@ TESTS =
 BUILT_SOURCES =
 GLIB_GENERATED =
 check_programs =
+check_programs_norun =
 check_ltlibraries =
 check_local =
 dbusservice_DATA =
@@ -2732,6 +2733,43 @@ src_devices_tests_test_arping_LDADD = \
 	src/platform/tests/libnm-platform-tests.la
 
 ###############################################################################
+# src/rdisc/tests
+###############################################################################
+
+src_rdisc_tests_cppflags = \
+	-I${top_srcdir} \
+	-I$(top_srcdir)/shared \
+	-I$(top_builddir)/shared \
+	-I${top_srcdir}/src \
+	-I${top_srcdir}/src/platform \
+	-I${top_srcdir}/libnm-core \
+	-I${top_builddir}/libnm-core \
+	-I${srcdir}/src/rdisc \
+	-DG_LOG_DOMAIN=\""NetworkManager"\" \
+	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
+	$(GLIB_CFLAGS) \
+	$(CODE_COVERAGE_CFLAGS) \
+	$(LIBNDP_CFLAGS)
+
+src_rdisc_tests_ldflags = \
+	$(CODE_COVERAGE_LDFLAGS)
+
+src_rdisc_tests_ldadd = \
+	src/libNetworkManagerTest.la \
+	$(GLIB_LIBS)
+
+check_programs += src/rdisc/tests/test-rdisc-fake
+check_programs_norun += src/rdisc/tests/test-rdisc-linux
+
+src_rdisc_tests_test_rdisc_linux_CPPFLAGS = $(src_rdisc_tests_cppflags)
+src_rdisc_tests_test_rdisc_linux_LDFLAGS = $(src_rdisc_tests_flags)
+src_rdisc_tests_test_rdisc_linux_LDADD = $(src_rdisc_tests_ldadd)
+
+src_rdisc_tests_test_rdisc_fake_CPPFLAGS = $(src_rdisc_tests_cppflags)
+src_rdisc_tests_test_rdisc_fake_LDFLAGS = $(src_rdisc_tests_flags)
+src_rdisc_tests_test_rdisc_fake_LDADD = $(src_rdisc_tests_ldadd)
+
+###############################################################################
 
 girdir = $(datadir)/gir-1.0
 gir_DATA = $(INTROSPECTION_GIRS)
@@ -2745,10 +2783,10 @@ dbusservice_DATA += src/org.freedesktop.NetworkManager.conf
 ###############################################################################
 
 if ENABLE_TESTS
-noinst_PROGRAMS += $(check_programs)
+noinst_PROGRAMS += $(check_programs) $(check_programs_norun)
 noinst_LTLIBRARIES += $(check_ltlibraries)
 else
-check_PROGRAMS += $(check_programs)
+check_PROGRAMS += $(check_programs) $(check_programs_norun)
 check_LTLIBRARIES += $(check_ltlibraries)
 endif
 
diff --git a/configure.ac b/configure.ac
index a9b30a126a..6f518d9aa5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1139,8 +1139,6 @@ src/tests/Makefile
 src/tests/config/Makefile
 src/supplicant-manager/tests/Makefile
 src/supplicant-manager/tests/certs/Makefile
-src/rdisc/Makefile
-src/rdisc/tests/Makefile
 libnm/libnm.pc
 libnm-util/libnm-util.pc
 libnm-util/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index c016f81d5b..7a8cfe45b4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,7 +2,6 @@ SUBDIRS =
 
 if ENABLE_TESTS
 SUBDIRS += \
-	rdisc \
 	supplicant-manager/tests \
 	tests
 endif
diff --git a/src/rdisc/Makefile.am b/src/rdisc/Makefile.am
deleted file mode 100644
index 3c6155b9c6..0000000000
--- a/src/rdisc/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = tests
diff --git a/src/rdisc/tests/Makefile.am b/src/rdisc/tests/Makefile.am
deleted file mode 100644
index 2d8ab4659c..0000000000
--- a/src/rdisc/tests/Makefile.am
+++ /dev/null
@@ -1,36 +0,0 @@
-AM_CPPFLAGS = \
-	-I${top_srcdir} \
-	-I$(top_srcdir)/shared \
-	-I$(top_builddir)/shared \
-	-I${top_srcdir}/src \
-	-I${top_srcdir}/src/platform \
-	-I${top_srcdir}/libnm-core \
-	-I${top_builddir}/libnm-core \
-	-I${srcdir}/.. \
-	-DG_LOG_DOMAIN=\""NetworkManager"\" \
-	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
-	$(GLIB_CFLAGS) \
-	$(LIBNDP_CFLAGS)
-
-AM_CFLAGS = $(CODE_COVERAGE_CFLAGS)
-AM_LDFLAGS = \
-	$(GLIB_LIBS) \
-	$(CODE_COVERAGE_LDFLAGS)
-
-@GNOME_CODE_COVERAGE_RULES@
-
-noinst_PROGRAMS = test-rdisc-linux test-rdisc-fake
-
-test_rdisc_linux_SOURCES = \
-	test-rdisc-linux.c
-test_rdisc_linux_LDADD = \
-	$(top_builddir)/src/libNetworkManager.la
-
-test_rdisc_fake_SOURCES = \
-	test-rdisc-fake.c
-test_rdisc_fake_LDADD = \
-	$(top_builddir)/src/libNetworkManagerTest.la
-
-@NM_LOG_COMPILER@
-TESTS = test-rdisc-fake
-