From 4128d837ac62902cd03e7456624bb7e121a524c6 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Sat, 15 Oct 2016 22:28:34 +0200
Subject: [PATCH] build: merge "src/settings/plugins/ifupdown/Makefile.am" into
 toplevel Makefile

---
 Makefile.am                               | 55 +++++++++++++++++++++++
 src/settings/plugins/ifupdown/Makefile.am | 53 +---------------------
 2 files changed, 56 insertions(+), 52 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index ea781d431e..77cd934742 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2019,6 +2019,61 @@ EXTRA_DIST += \
 	src/settings/plugins/ifcfg-rh/nm-ifcfg-rh.conf \
 	src/settings/plugins/ifcfg-rh/nm-ifcfg-rh.xml
 
+###############################################################################
+# src/settings/plugins/ifupdown
+###############################################################################
+
+if CONFIG_PLUGIN_IFUPDOWN
+
+pkglib_LTLIBRARIES += src/settings/plugins/ifupdown/libnm-settings-plugin-ifupdown.la
+
+noinst_LTLIBRARIES += src/settings/plugins/ifupdown/libnms-ifupdown-core.la
+
+src_settings_plugins_ifupdown_cppflags = \
+	-I$(top_srcdir)/src \
+	-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) \
+	$(GUDEV_CFLAGS) \
+	-DSYSCONFDIR=\"$(sysconfdir)\"
+
+
+src_settings_plugins_ifupdown_libnms_ifupdown_core_la_SOURCES = \
+	src/settings/plugins/ifupdown/nms-ifupdown-interface-parser.c \
+	src/settings/plugins/ifupdown/nms-ifupdown-interface-parser.h \
+	src/settings/plugins/ifupdown/nms-ifupdown-parser.c \
+	src/settings/plugins/ifupdown/nms-ifupdown-parser.h
+
+src_settings_plugins_ifupdown_libnms_ifupdown_core_la_CPPFLAGS = $(src_settings_plugins_ifupdown_cppflags)
+
+
+src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_SOURCES = \
+	src/settings/plugins/ifupdown/nms-ifupdown-connection.c \
+	src/settings/plugins/ifupdown/nms-ifupdown-connection.h \
+	src/settings/plugins/ifupdown/nms-ifupdown-plugin.c \
+	src/settings/plugins/ifupdown/nms-ifupdown-plugin.h
+
+src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_CPPFLAGS = $(src_settings_plugins_ifupdown_cppflags)
+
+src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_LDFLAGS = \
+	-module -avoid-version \
+	-Wl,--version-script="$(top_srcdir)/linker-script-settings.ver"
+
+src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_LIBADD = \
+	src/settings/plugins/ifupdown/libnms-ifupdown-core.la
+
+check-local-symbols-settings-ifupdown: src/settings/plugins/ifupdown/libnm-settings-plugin-ifupdown.la
+	$(call check_so_symbols,$(builddir)/src/settings/plugins/ifupdown/.libs/libnm-settings-plugin-ifupdown.so)
+
+check_local += check-local-symbols-settings-ifupdown
+
+endif
+
 ###############################################################################
 
 girdir = $(datadir)/gir-1.0
diff --git a/src/settings/plugins/ifupdown/Makefile.am b/src/settings/plugins/ifupdown/Makefile.am
index 547834ff6a..3c6155b9c6 100644
--- a/src/settings/plugins/ifupdown/Makefile.am
+++ b/src/settings/plugins/ifupdown/Makefile.am
@@ -1,52 +1 @@
-SUBDIRS = . tests
-
-@GNOME_CODE_COVERAGE_RULES@
-
-include $(top_srcdir)/nm.mk
-
-pkglib_LTLIBRARIES = \
-	libnm-settings-plugin-ifupdown.la
-
-noinst_LTLIBRARIES = \
-	libnms-ifupdown-core.la
-
-AM_CPPFLAGS = \
-	-I$(top_srcdir)/src \
-	-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) \
-	$(GUDEV_CFLAGS) \
-	-DSYSCONFDIR=\"$(sysconfdir)\"
-
-###############################################################################
-
-libnms_ifupdown_core_la_SOURCES = \
-	nms-ifupdown-interface-parser.c \
-	nms-ifupdown-interface-parser.h \
-	nms-ifupdown-parser.c \
-	nms-ifupdown-parser.h
-
-###############################################################################
-
-libnm_settings_plugin_ifupdown_la_SOURCES = \
-	nms-ifupdown-connection.c \
-	nms-ifupdown-connection.h \
-	nms-ifupdown-plugin.c \
-	nms-ifupdown-plugin.h
-
-libnm_settings_plugin_ifupdown_la_LDFLAGS = \
-	-module -avoid-version \
-	-Wl,--version-script="$(top_srcdir)/linker-script-settings.ver"
-
-libnm_settings_plugin_ifupdown_la_LIBADD = \
-	libnms-ifupdown-core.la
-
-###############################################################################
-
-check-local:
-	$(call check_so_symbols,$(builddir)/.libs/libnm-settings-plugin-ifupdown.so)
+SUBDIRS = tests