build: merge "libnm-util/tests/Makefile.am" into toplevel Makefile

4 files changed, 56 insertions, 89 deletions

diff --git a/Makefile.am b/Makefile.am
index 230d942118..5167298bcb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -76,7 +76,6 @@ SUBDIRS = \
 
 if WITH_LEGACY_LIBRARIES
 SUBDIRS += \
-	libnm-util \
 	libnm-glib
 endif
 
@@ -3664,6 +3663,62 @@ check-local-exports-libnm-util: libnm-util/libnm-util.la
 
 check_local += check-local-exports-libnm-util
 
+###############################################################################
+# libnm-util/tests
+###############################################################################
+
+libnm_util_tests_cppflags = \
+	-I$(top_srcdir)/shared \
+	-I$(top_builddir)/shared \
+	-I$(top_srcdir)/libnm-util \
+	-I$(top_builddir)/libnm-util \
+	$(GLIB_CFLAGS) \
+	$(DBUS_CFLAGS) \
+	-DBUILD_DIR=\"$(abs_builddir)/libnm-util/tests\" \
+	-DTEST_CERT_DIR=\"$(abs_srcdir)/libnm-core/tests/certs\"
+
+libnm_util_tests_ldadd = \
+	libnm-util/libnm-util.la \
+	$(GLIB_LIBS) \
+	$(DBUS_LIBS)
+
+check_programs += \
+	libnm-util/tests/test-settings-defaults \
+	libnm-util/tests/test-crypto \
+	libnm-util/tests/test-secrets \
+	libnm-util/tests/test-general \
+	libnm-util/tests/test-setting-8021x \
+	libnm-util/tests/test-setting-dcb
+
+check_programs_norun += \
+	libnm-util/tests/test-libnm-linking
+
+libnm_util_tests_test_settings_defaults_CPPFLAGS = $(libnm_util_tests_cppflags)
+libnm_util_tests_test_settings_defaults_LDADD = $(libnm_util_tests_ldadd)
+
+libnm_util_tests_test_crypto_CPPFLAGS = $(libnm_util_tests_cppflags)
+libnm_util_tests_test_crypto_LDADD = \
+	libnm-util/libtest-crypto.la \
+	$(libnm_util_tests_ldadd)
+
+libnm_util_tests_test_secrets_CPPFLAGS = $(libnm_util_tests_cppflags)
+libnm_util_tests_test_secrets_LDADD = $(libnm_util_tests_ldadd)
+
+libnm_util_tests_test_general_DEPENDENCIES = libnm-util/tests/test-libnm-linking
+libnm_util_tests_test_general_CPPFLAGS = $(libnm_util_tests_cppflags)
+libnm_util_tests_test_general_LDADD = $(libnm_util_tests_ldadd)
+
+libnm_util_tests_test_setting_8021x_CPPFLAGS = $(libnm_util_tests_cppflags)
+libnm_util_tests_test_setting_8021x_LDADD = $(libnm_util_tests_ldadd)
+
+libnm_util_tests_test_setting_dcb_CPPFLAGS = $(libnm_util_tests_cppflags)
+libnm_util_tests_test_setting_dcb_LDADD = $(libnm_util_tests_ldadd)
+
+libnm_util_tests_test_libnm_linking_CPPFLAGS = $(libnm_util_tests_cppflags)
+libnm_util_tests_test_libnm_linking_LDADD = \
+	$(top_builddir)/libnm/libnm.la \
+	$(libnm_util_tests_ldadd)
+
 endif
 
 ###############################################################################
diff --git a/configure.ac b/configure.ac
index 388179fe45..a9e4b224d1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1136,8 +1136,6 @@ Makefile
 shared/nm-version-macros.h
 libnm/libnm.pc
 libnm-util/libnm-util.pc
-libnm-util/Makefile
-libnm-util/tests/Makefile
 libnm-glib/libnm-glib.pc
 libnm-glib/libnm-glib-vpn.pc
 libnm-glib/Makefile
diff --git a/libnm-util/Makefile.am b/libnm-util/Makefile.am
deleted file mode 100644
index 3c6155b9c6..0000000000
--- a/libnm-util/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = tests
diff --git a/libnm-util/tests/Makefile.am b/libnm-util/tests/Makefile.am
deleted file mode 100644
index 49b29bf01e..0000000000
--- a/libnm-util/tests/Makefile.am
+++ /dev/null
@@ -1,85 +0,0 @@
-if ENABLE_TESTS
-
-AM_CPPFLAGS = \
-	-I$(top_srcdir)/shared \
-	-I$(top_builddir)/shared \
-	-I$(top_srcdir)/libnm-util \
-	-I$(top_builddir)/libnm-util \
-	$(GLIB_CFLAGS) \
-	$(DBUS_CFLAGS) \
-	-DBUILD_DIR=\"$(abs_builddir)\" \
-	-DTEST_CERT_DIR=\"$(abs_top_srcdir)/libnm-core/tests/certs\"
-
-@NM_LOG_COMPILER@
-TESTS = \
-	test-settings-defaults \
-	test-crypto \
-	test-secrets \
-	test-general \
-	test-setting-8021x \
-	test-setting-dcb
-
-noinst_PROGRAMS = \
-	$(TESTS) \
-	test-libnm-linking
-
-test_settings_defaults_SOURCES = \
-	test-settings-defaults.c
-
-test_settings_defaults_LDADD = \
-	$(top_builddir)/libnm-util/libnm-util.la \
-	$(GLIB_LIBS) \
-	$(DBUS_LIBS)
-
-test_crypto_SOURCES = \
-	test-crypto.c
-
-test_crypto_LDADD = \
-	$(top_builddir)/libnm-util/libtest-crypto.la \
-	$(top_builddir)/libnm-util/libnm-util.la \
-	$(GLIB_LIBS)
-
-test_secrets_SOURCES = \
-	test-secrets.c
-
-test_secrets_LDADD = \
-	$(top_builddir)/libnm-util/libnm-util.la \
-	$(GLIB_LIBS) \
-	$(DBUS_LIBS)
-
-test_general_SOURCES = \
-	test-general.c
-
-test_general_LDADD = \
-	$(top_builddir)/libnm-util/libnm-util.la \
-	$(GLIB_LIBS) \
-	$(DBUS_LIBS)
-
-test_general_DEPENDENCIES = test-libnm-linking
-
-test_setting_8021x_SOURCES = \
-	test-setting-8021x.c
-
-test_setting_8021x_LDADD = \
-	$(top_builddir)/libnm-util/libnm-util.la \
-	$(GLIB_LIBS) \
-	$(DBUS_LIBS)
-
-test_setting_dcb_SOURCES = \
-	test-setting-dcb.c
-
-test_setting_dcb_LDADD = \
-	$(top_builddir)/libnm-util/libnm-util.la \
-	$(GLIB_LIBS) \
-	$(DBUS_LIBS)
-
-test_libnm_linking_SOURCES = \
-	test-libnm-linking.c
-
-test_libnm_linking_LDADD = \
-	$(top_builddir)/libnm/libnm.la \
-	$(top_builddir)/libnm-util/libnm-util.la \
-	$(GLIB_LIBS) \
-	$(DBUS_LIBS)
-
-endif