build: move check_so_symbols for settings plugins to parent makefile

Like for the device plugins, check_so_symbols is called from the
Makefile of the plugin itself, not from tests/Makefile.am.

Just keep it consistent.

8 files changed, 28 insertions, 20 deletions

diff --git a/src/settings/plugins/ibft/Makefile.am b/src/settings/plugins/ibft/Makefile.am
index 3ad3a19e46..369d64443a 100644
--- a/src/settings/plugins/ibft/Makefile.am
+++ b/src/settings/plugins/ibft/Makefile.am
@@ -2,6 +2,8 @@ SUBDIRS = . tests
 
 @GNOME_CODE_COVERAGE_RULES@
 
+include $(top_srcdir)/nm.mk
+
 pkglib_LTLIBRARIES = libnm-settings-plugin-ibft.la
 
 noinst_LTLIBRARIES = libnms-ibft-core.la
@@ -42,4 +44,9 @@ libnm_settings_plugin_ibft_la_LIBADD = \
 
 ###############################################################################
 
+check-local:
+	$(call check_so_symbols,$(builddir)/.libs/libnm-settings-plugin-ibft.so)
+
+###############################################################################
+
 CLEANFILES = $(BUILT_SOURCES)
diff --git a/src/settings/plugins/ibft/tests/Makefile.am b/src/settings/plugins/ibft/tests/Makefile.am
index 43df1ab77d..79ae507eb0 100644
--- a/src/settings/plugins/ibft/tests/Makefile.am
+++ b/src/settings/plugins/ibft/tests/Makefile.am
@@ -1,7 +1,5 @@
 if ENABLE_TESTS
 
-include $(top_srcdir)/nm.mk
-
 @GNOME_CODE_COVERAGE_RULES@
 
 AM_CPPFLAGS = \
@@ -36,9 +34,6 @@ test_ibft_LDADD = \
 @VALGRIND_RULES@
 TESTS = test-ibft
 
-check-local:
-	$(call check_so_symbols,$(builddir)/../.libs/libnm-settings-plugin-ibft.so)
-
 endif
 
 EXTRA_DIST = \
diff --git a/src/settings/plugins/ifcfg-rh/Makefile.am b/src/settings/plugins/ifcfg-rh/Makefile.am
index 63c117ea20..37f0716ada 100644
--- a/src/settings/plugins/ifcfg-rh/Makefile.am
+++ b/src/settings/plugins/ifcfg-rh/Makefile.am
@@ -2,6 +2,8 @@ SUBDIRS = . tests
 
 @GNOME_CODE_COVERAGE_RULES@
 
+include $(top_srcdir)/nm.mk
+
 pkglib_LTLIBRARIES = \
 	libnm-settings-plugin-ifcfg-rh.la
 
@@ -78,6 +80,11 @@ libnm_settings_plugin_ifcfg_rh_la_LIBADD = \
 
 ###############################################################################
 
+check-local:
+	$(call check_so_symbols,$(builddir)/.libs/libnm-settings-plugin-ifcfg-rh.so)
+
+###############################################################################
+
 dbusservicedir = $(DBUS_SYS_DIR)
 dbusservice_DATA = nm-ifcfg-rh.conf
 
@@ -87,3 +94,4 @@ EXTRA_DIST = \
 
 CLEANFILES = $(BUILT_SOURCES)
 
+
diff --git a/src/settings/plugins/ifcfg-rh/tests/Makefile.am b/src/settings/plugins/ifcfg-rh/tests/Makefile.am
index 8315e494bf..299843833e 100644
--- a/src/settings/plugins/ifcfg-rh/tests/Makefile.am
+++ b/src/settings/plugins/ifcfg-rh/tests/Makefile.am
@@ -1,7 +1,5 @@
 if ENABLE_TESTS
 
-include $(top_srcdir)/nm.mk
-
 SUBDIRS=network-scripts
 
 @GNOME_CODE_COVERAGE_RULES@
@@ -40,7 +38,4 @@ test_ifcfg_rh_LDADD = \
 @VALGRIND_RULES@
 TESTS = test-ifcfg-rh
 
-check-local:
-	$(call check_so_symbols,$(builddir)/../.libs/libnm-settings-plugin-ifcfg-rh.so)
-
 endif
diff --git a/src/settings/plugins/ifnet/Makefile.am b/src/settings/plugins/ifnet/Makefile.am
index f2a65d9622..207c95f8ae 100644
--- a/src/settings/plugins/ifnet/Makefile.am
+++ b/src/settings/plugins/ifnet/Makefile.am
@@ -2,6 +2,8 @@ SUBDIRS = . tests
 
 @GNOME_CODE_COVERAGE_RULES@
 
+include $(top_srcdir)/nm.mk
+
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/src/platform \
@@ -47,3 +49,8 @@ libnm_settings_plugin_ifnet_la_LDFLAGS = \
 
 libnm_settings_plugin_ifnet_la_LIBADD = \
 	libnms-ifnet-core.la
+
+###############################################################################
+
+check-local:
+	$(call check_so_symbols,$(builddir)/.libs/libnm-settings-plugin-ifnet.so)
diff --git a/src/settings/plugins/ifnet/tests/Makefile.am b/src/settings/plugins/ifnet/tests/Makefile.am
index 7ff38fa09c..283c758942 100644
--- a/src/settings/plugins/ifnet/tests/Makefile.am
+++ b/src/settings/plugins/ifnet/tests/Makefile.am
@@ -1,7 +1,5 @@
 if ENABLE_TESTS
 
-include $(top_srcdir)/nm.mk
-
 @GNOME_CODE_COVERAGE_RULES@
 
 AM_CPPFLAGS= \
@@ -39,9 +37,6 @@ test_ifnet_LDADD = \
 @VALGRIND_RULES@
 TESTS = test-ifnet
 
-check-local:
-	$(call check_so_symbols,$(builddir)/../.libs/libnm-settings-plugin-ifnet.so)
-
 endif
 
 EXTRA_DIST = \
diff --git a/src/settings/plugins/ifupdown/Makefile.am b/src/settings/plugins/ifupdown/Makefile.am
index 539b8a2fe6..0050aa8657 100644
--- a/src/settings/plugins/ifupdown/Makefile.am
+++ b/src/settings/plugins/ifupdown/Makefile.am
@@ -2,6 +2,8 @@ SUBDIRS = . tests
 
 @GNOME_CODE_COVERAGE_RULES@
 
+include $(top_srcdir)/nm.mk
+
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/src/settings \
@@ -43,3 +45,7 @@ libnm_settings_plugin_ifupdown_la_LDFLAGS = \
 libnm_settings_plugin_ifupdown_la_LIBADD = \
 	libnms-ifupdown-core.la
 
+###############################################################################
+
+check-local:
+	$(call check_so_symbols,$(builddir)/.libs/libnm-settings-plugin-ifupdown.so)
diff --git a/src/settings/plugins/ifupdown/tests/Makefile.am b/src/settings/plugins/ifupdown/tests/Makefile.am
index 80abf8a9e7..d8d13c3b2d 100644
--- a/src/settings/plugins/ifupdown/tests/Makefile.am
+++ b/src/settings/plugins/ifupdown/tests/Makefile.am
@@ -1,7 +1,5 @@
 if ENABLE_TESTS
 
-include $(top_srcdir)/nm.mk
-
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/shared \
 	-I$(top_builddir)/shared \
@@ -31,9 +29,6 @@ test_ifupdown_LDADD = \
 @VALGRIND_RULES@
 TESTS = test-ifupdown
 
-check-local:
-	$(call check_so_symbols,$(builddir)/../.libs/libnm-settings-plugin-ifupdown.so)
-
 endif
 
 EXTRA_DIST = \