build: merge "src/settings/plugins/ifnet/Makefile.am" into toplevel Makefile

2 files changed, 59 insertions, 57 deletions

diff --git a/Makefile.am b/Makefile.am
index 24a89a4297..45416f574c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2125,6 +2125,64 @@ EXTRA_DIST += \
 	src/settings/plugins/ifupdown/tests/test21-source-dir-stanza.d
 
 ###############################################################################
+# src/settings/plugins/ifnet
+###############################################################################
+
+if CONFIG_PLUGIN_IFNET
+
+pkglib_LTLIBRARIES += src/settings/plugins/ifnet/libnm-settings-plugin-ifnet.la
+
+noinst_LTLIBRARIES += src/settings/plugins/ifnet/libnms-ifnet-core.la
+
+src_settings_plugins_ifnet_cppflags = \
+	-I$(top_srcdir)/src \
+	-I$(top_srcdir)/src/platform \
+	-I$(top_srcdir)/src/settings \
+	-I$(top_srcdir)/shared \
+	-I$(top_builddir)/shared \
+	-I$(top_srcdir)/libnm-core \
+	-I$(top_builddir)/libnm-core \
+	-DG_LOG_DOMAIN=\""NetworkManager"\" \
+	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
+	$(GLIB_CFLAGS) \
+	-DSYSCONFDIR=\"$(sysconfdir)\"
+	-DSBINDIR=\"$(sbindir)\"
+
+src_settings_plugins_ifnet_libnms_ifnet_core_la_SOURCES = \
+	src/settings/plugins/ifnet/nms-ifnet-net-parser.c\
+	src/settings/plugins/ifnet/nms-ifnet-net-parser.h\
+	src/settings/plugins/ifnet/nms-ifnet-connection-parser.c \
+	src/settings/plugins/ifnet/nms-ifnet-connection-parser.h \
+	src/settings/plugins/ifnet/nms-ifnet-net-utils.h\
+	src/settings/plugins/ifnet/nms-ifnet-net-utils.c\
+	src/settings/plugins/ifnet/nms-ifnet-wpa-parser.h\
+	src/settings/plugins/ifnet/nms-ifnet-wpa-parser.c
+
+src_settings_plugins_ifnet_libnms_ifnet_core_la_CPPFLAGS = $(src_settings_plugins_ifnet_cppflags)
+
+src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la_SOURCES = \
+	src/settings/plugins/ifnet/nms-ifnet-connection.c \
+	src/settings/plugins/ifnet/nms-ifnet-connection.h \
+	src/settings/plugins/ifnet/nms-ifnet-plugin.c \
+	src/settings/plugins/ifnet/nms-ifnet-plugin.h
+
+src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la_CPPFLAGS = $(src_settings_plugins_ifnet_cppflags)
+
+src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la_LDFLAGS = \
+	-module -avoid-version \
+	-Wl,--version-script="$(top_srcdir)/linker-script-settings.ver"
+
+src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la_LIBADD = \
+	src/settings/plugins/ifnet/libnms-ifnet-core.la
+
+check-local-symbols-settings-ifnet: src/settings/plugins/ifnet/libnm-settings-plugin-ifnet.la
+	$(call check_so_symbols,$(builddir)/src/settings/plugins/ifnet/.libs/libnm-settings-plugin-ifnet.so)
+
+check_local += check-local-symbols-settings-ifnet
+
+endif
+
+###############################################################################
 
 girdir = $(datadir)/gir-1.0
 gir_DATA = $(INTROSPECTION_GIRS)
diff --git a/src/settings/plugins/ifnet/Makefile.am b/src/settings/plugins/ifnet/Makefile.am
index c3e0dee41f..3c6155b9c6 100644
--- a/src/settings/plugins/ifnet/Makefile.am
+++ b/src/settings/plugins/ifnet/Makefile.am
@@ -1,57 +1 @@
-SUBDIRS = . tests
-
-@GNOME_CODE_COVERAGE_RULES@
-
-include $(top_srcdir)/nm.mk
-
-pkglib_LTLIBRARIES = \
-	libnm-settings-plugin-ifnet.la
-
-noinst_LTLIBRARIES = \
-	libnms-ifnet-core.la
-
-AM_CPPFLAGS = \
-	-I$(top_srcdir)/src \
-	-I$(top_srcdir)/src/platform \
-	-I$(top_srcdir)/src/settings \
-	-I$(top_srcdir)/shared \
-	-I$(top_builddir)/shared \
-	-I$(top_srcdir)/libnm-core \
-	-I$(top_builddir)/libnm-core \
-	-DG_LOG_DOMAIN=\""NetworkManager"\" \
-	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
-	$(GLIB_CFLAGS) \
-	-DSYSCONFDIR=\"$(sysconfdir)\"
-	-DSBINDIR=\"$(sbindir)\"
-
-###############################################################################
-
-libnms_ifnet_core_la_SOURCES = \
-	nms-ifnet-net-parser.c\
-	nms-ifnet-net-parser.h\
-	nms-ifnet-connection-parser.c \
-	nms-ifnet-connection-parser.h \
-	nms-ifnet-net-utils.h\
-	nms-ifnet-net-utils.c\
-	nms-ifnet-wpa-parser.h\
-	nms-ifnet-wpa-parser.c
-
-###############################################################################
-
-libnm_settings_plugin_ifnet_la_SOURCES = \
-	nms-ifnet-connection.c \
-	nms-ifnet-connection.h \
-	nms-ifnet-plugin.c \
-	nms-ifnet-plugin.h
-
-libnm_settings_plugin_ifnet_la_LDFLAGS = \
-	-module -avoid-version \
-	-Wl,--version-script="$(top_srcdir)/linker-script-settings.ver"
-
-libnm_settings_plugin_ifnet_la_LIBADD = \
-	libnms-ifnet-core.la
-
-###############################################################################
-
-check-local:
-	$(call check_so_symbols,$(builddir)/.libs/libnm-settings-plugin-ifnet.so)
+SUBDIRS = tests