From 3c2a49df2f0757362bf6f1d138ccbd62cf3c6dec Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Fri, 14 Oct 2016 12:13:50 +0200
Subject: [PATCH] build: merge "introspection/Makefile.am" into toplevel
 Makefile.am

---
 .gitignore                |   3 +-
 Makefile.am               | 193 +++++++++++++++++++++++++++++++++++++-
 configure.ac              |   1 -
 introspection/Makefile.am | 180 -----------------------------------
 4 files changed, 192 insertions(+), 185 deletions(-)
 delete mode 100644 introspection/Makefile.am

diff --git a/.gitignore b/.gitignore
index ef0055f250..d016b14cdb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,7 +8,8 @@
 *.la
 *.gir
 *.typelib
-*.stamp
+**.stamp
+.dirstamp
 *-enum-types.[ch]
 *-glue.h
 *.loT
diff --git a/Makefile.am b/Makefile.am
index 86d66b9553..f569cabf75 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,9 +4,13 @@ include $(GLIB_MAKEFILE)
 
 ###############################################################################
 
+noinst_LTLIBRARIES =
+CLEANFILES =
+EXTRA_DIST =
+BUILT_SOURCES =
+
 SUBDIRS = \
 	. \
-	introspection \
 	libnm-core \
 	libnm \
 	src \
@@ -73,7 +77,188 @@ DISTCLEANFILES += $(polkit_policy_DATA)
 
 ###############################################################################
 
-EXTRA_DIST = \
+noinst_LTLIBRARIES += \
+	introspection/libnmdbus.la
+
+# gdbus-codegen 2.38 will emit code that requires glib 2.38, which
+# will then cause availability warnings if we define
+# GLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_32.
+#
+# This is fixed in GLib 2.40 (it emits code that takes
+# GLIB_VERSION_MAX_ALLOWED into account), so this workaround can go
+# away when we depend on that.
+introspection_libnmdbus_la_CPPFLAGS = $(filter-out -DGLIB_VERSION_MAX_ALLOWED%,$(GLIB_CFLAGS))
+
+nodist_introspection_libnmdbus_la_SOURCES = \
+	introspection/nmdbus-access-point.c \
+	introspection/nmdbus-access-point.h \
+	introspection/nmdbus-active-connection.c \
+	introspection/nmdbus-active-connection.h \
+	introspection/nmdbus-agent-manager.c \
+	introspection/nmdbus-agent-manager.h \
+	introspection/nmdbus-checkpoint.c \
+	introspection/nmdbus-checkpoint.h \
+	introspection/nmdbus-device-adsl.c \
+	introspection/nmdbus-device-adsl.h \
+	introspection/nmdbus-device-bond.c \
+	introspection/nmdbus-device-bond.h \
+	introspection/nmdbus-device-bridge.c \
+	introspection/nmdbus-device-bridge.h \
+	introspection/nmdbus-device-bt.c \
+	introspection/nmdbus-device-bt.h \
+	introspection/nmdbus-device-ethernet.c \
+	introspection/nmdbus-device-ethernet.h \
+	introspection/nmdbus-device.c \
+	introspection/nmdbus-device.h \
+	introspection/nmdbus-device-generic.c \
+	introspection/nmdbus-device-generic.h \
+	introspection/nmdbus-device-infiniband.c \
+	introspection/nmdbus-device-infiniband.h \
+	introspection/nmdbus-device-ip-tunnel.c \
+	introspection/nmdbus-device-ip-tunnel.h \
+	introspection/nmdbus-device-macvlan.c \
+	introspection/nmdbus-device-macvlan.h \
+	introspection/nmdbus-device-modem.c \
+	introspection/nmdbus-device-modem.h \
+	introspection/nmdbus-device-olpc-mesh.c \
+	introspection/nmdbus-device-olpc-mesh.h \
+	introspection/nmdbus-device-statistics.c \
+	introspection/nmdbus-device-statistics.h \
+	introspection/nmdbus-device-team.c \
+	introspection/nmdbus-device-team.h \
+	introspection/nmdbus-device-tun.c \
+	introspection/nmdbus-device-tun.h \
+	introspection/nmdbus-device-veth.c \
+	introspection/nmdbus-device-veth.h \
+	introspection/nmdbus-device-vlan.c \
+	introspection/nmdbus-device-vlan.h \
+	introspection/nmdbus-device-vxlan.c \
+	introspection/nmdbus-device-vxlan.h \
+	introspection/nmdbus-device-wifi.c \
+	introspection/nmdbus-device-wifi.h \
+	introspection/nmdbus-device-wimax.c \
+	introspection/nmdbus-device-wimax.h \
+	introspection/nmdbus-dhcp4-config.c \
+	introspection/nmdbus-dhcp4-config.h \
+	introspection/nmdbus-dhcp6-config.c \
+	introspection/nmdbus-dhcp6-config.h \
+	introspection/nmdbus-ip4-config.c \
+	introspection/nmdbus-ip4-config.h \
+	introspection/nmdbus-ip6-config.c \
+	introspection/nmdbus-ip6-config.h \
+	introspection/nmdbus-manager.c \
+	introspection/nmdbus-manager.h \
+	introspection/nmdbus-ppp-manager.c \
+	introspection/nmdbus-ppp-manager.h \
+	introspection/nmdbus-secret-agent.c \
+	introspection/nmdbus-secret-agent.h \
+	introspection/nmdbus-settings-connection.c \
+	introspection/nmdbus-settings-connection.h \
+	introspection/nmdbus-settings.c \
+	introspection/nmdbus-settings.h \
+	introspection/nmdbus-vpn-connection.c \
+	introspection/nmdbus-vpn-connection.h \
+	introspection/nmdbus-vpn-plugin.c \
+	introspection/nmdbus-vpn-plugin.h
+
+DBUS_INTERFACE_DOCS = \
+	introspection/nmdbus-access-point-org.freedesktop.NetworkManager.AccessPoint.xml \
+	introspection/nmdbus-active-connection-org.freedesktop.NetworkManager.Connection.Active.xml \
+	introspection/nmdbus-checkpoint-org.freedesktop.NetworkManager.Checkpoint.xml \
+	introspection/nmdbus-device-team-org.freedesktop.NetworkManager.Device.Team.xml \
+	introspection/nmdbus-dhcp6-config-org.freedesktop.NetworkManager.DHCP6Config.xml \
+	introspection/nmdbus-device-wifi-org.freedesktop.NetworkManager.Device.Wireless.xml \
+	introspection/nmdbus-manager-org.freedesktop.NetworkManager.xml \
+	introspection/nmdbus-vpn-connection-org.freedesktop.NetworkManager.VPN.Connection.xml \
+	introspection/nmdbus-secret-agent-org.freedesktop.NetworkManager.SecretAgent.xml \
+	introspection/nmdbus-device-org.freedesktop.NetworkManager.Device.xml \
+	introspection/nmdbus-vpn-plugin-org.freedesktop.NetworkManager.VPN.Plugin.xml \
+	introspection/nmdbus-device-bt-org.freedesktop.NetworkManager.Device.Bluetooth.xml \
+	introspection/nmdbus-device-vxlan-org.freedesktop.NetworkManager.Device.Vxlan.xml \
+	introspection/nmdbus-settings-connection-org.freedesktop.NetworkManager.Settings.Connection.xml \
+	introspection/nmdbus-device-bond-org.freedesktop.NetworkManager.Device.Bond.xml \
+	introspection/nmdbus-device-macvlan-org.freedesktop.NetworkManager.Device.Macvlan.xml \
+	introspection/nmdbus-ppp-manager-org.freedesktop.NetworkManager.PPP.xml \
+	introspection/nmdbus-device-vlan-org.freedesktop.NetworkManager.Device.Vlan.xml \
+	introspection/nmdbus-device-adsl-org.freedesktop.NetworkManager.Device.Adsl.xml \
+	introspection/nmdbus-agent-manager-org.freedesktop.NetworkManager.AgentManager.xml \
+	introspection/nmdbus-device-wimax-org.freedesktop.NetworkManager.Device.WiMax.xml \
+	introspection/nmdbus-device-ip-tunnel-org.freedesktop.NetworkManager.Device.IPTunnel.xml \
+	introspection/nmdbus-device-tun-org.freedesktop.NetworkManager.Device.Tun.xml \
+	introspection/nmdbus-device-bridge-org.freedesktop.NetworkManager.Device.Bridge.xml \
+	introspection/nmdbus-device-olpc-mesh-org.freedesktop.NetworkManager.Device.OlpcMesh.xml \
+	introspection/nmdbus-dhcp4-config-org.freedesktop.NetworkManager.DHCP4Config.xml \
+	introspection/nmdbus-device-generic-org.freedesktop.NetworkManager.Device.Generic.xml \
+	introspection/nmdbus-device-infiniband-org.freedesktop.NetworkManager.Device.Infiniband.xml \
+	introspection/nmdbus-device-modem-org.freedesktop.NetworkManager.Device.Modem.xml \
+	introspection/nmdbus-ip6-config-org.freedesktop.NetworkManager.IP6Config.xml \
+	introspection/nmdbus-device-veth-org.freedesktop.NetworkManager.Device.Veth.xml \
+	introspection/nmdbus-settings-org.freedesktop.NetworkManager.Settings.xml \
+	introspection/nmdbus-device-ethernet-org.freedesktop.NetworkManager.Device.Wired.xml \
+	introspection/nmdbus-ip4-config-org.freedesktop.NetworkManager.IP4Config.xml \
+	introspection/nmdbus-device-statistics-org.freedesktop.NetworkManager.Device.Statistics.xml
+
+define _make_nmdbus_rule
+$(1): $(patsubst introspection/nmdbus-%.c,introspection/nm-%.xml,$(1))
+	$$(AM_V_GEN) gdbus-codegen \
+		--generate-c-code $$(basename $$@) \
+		--generate-docbook $$(basename $$@) \
+		--c-namespace NMDBus \
+		--interface-prefix org.freedesktop.NetworkManager \
+		$$<
+
+$(filter $(basename $(1))-org.freedesktop.NetworkManager.%,$(DBUS_INTERFACE_DOCS)): $(1)
+	@true
+
+$(basename $(1)).h: $(1)
+	@true
+endef
+
+$(foreach f,$(filter %.c,$(nodist_introspection_libnmdbus_la_SOURCES)),$(eval $(call _make_nmdbus_rule,$f)))
+
+BUILT_SOURCES += $(nodist_introspection_libnmdbus_la_SOURCES) $(DBUS_INTERFACE_DOCS)
+
+EXTRA_DIST += \
+	introspection/nm-access-point.xml \
+	introspection/nm-active-connection.xml \
+	introspection/nm-agent-manager.xml \
+	introspection/nm-checkpoint.xml \
+	introspection/nm-device-adsl.xml \
+	introspection/nm-device-bond.xml \
+	introspection/nm-device-bridge.xml \
+	introspection/nm-device-bt.xml \
+	introspection/nm-device-ethernet.xml \
+	introspection/nm-device-generic.xml \
+	introspection/nm-device-infiniband.xml \
+	introspection/nm-device-ip-tunnel.xml \
+	introspection/nm-device-macvlan.xml \
+	introspection/nm-device-modem.xml \
+	introspection/nm-device-olpc-mesh.xml \
+	introspection/nm-device-statistics.xml \
+	introspection/nm-device-team.xml \
+	introspection/nm-device-tun.xml \
+	introspection/nm-device-veth.xml \
+	introspection/nm-device-vlan.xml \
+	introspection/nm-device-vxlan.xml \
+	introspection/nm-device-wifi.xml \
+	introspection/nm-device-wimax.xml \
+	introspection/nm-device.xml \
+	introspection/nm-dhcp4-config.xml \
+	introspection/nm-dhcp6-config.xml \
+	introspection/nm-ip4-config.xml \
+	introspection/nm-ip6-config.xml \
+	introspection/nm-manager.xml \
+	introspection/nm-ppp-manager.xml \
+	introspection/nm-secret-agent.xml \
+	introspection/nm-settings-connection.xml \
+	introspection/nm-settings.xml \
+	introspection/nm-vpn-connection.xml \
+	introspection/nm-vpn-plugin.xml \
+	introspection/nm-wimax-nsp.xml
+
+###############################################################################
+
+EXTRA_DIST += \
 	CONTRIBUTING \
 	NetworkManager.pc.in \
 	intltool-extract.in \
@@ -107,7 +292,9 @@ EXTRA_DIST = \
 	\
 	$(NULL)
 
-CLEANFILES = \
+CLEANFILES += \
+	$(BUILT_SOURCES) \
+	\
 	cscope.in.out \
 	cscope.out \
 	cscope.po.out \
diff --git a/configure.ac b/configure.ac
index 24f50ef70d..1aadad9f59 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1187,7 +1187,6 @@ clients/Makefile
 clients/cli/Makefile
 clients/tui/Makefile
 clients/tui/newt/Makefile
-introspection/Makefile
 man/Makefile
 man/common.ent
 po/Makefile.in
diff --git a/introspection/Makefile.am b/introspection/Makefile.am
deleted file mode 100644
index 27b54e5d04..0000000000
--- a/introspection/Makefile.am
+++ /dev/null
@@ -1,180 +0,0 @@
-noinst_LTLIBRARIES = \
-	libnmdbus.la
-
-# gdbus-codegen 2.38 will emit code that requires glib 2.38, which
-# will then cause availability warnings if we define
-# GLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_32.
-#
-# This is fixed in GLib 2.40 (it emits code that takes
-# GLIB_VERSION_MAX_ALLOWED into account), so this workaround can go
-# away when we depend on that.
-AM_CPPFLAGS = $(filter-out -DGLIB_VERSION_MAX_ALLOWED%,$(GLIB_CFLAGS))
-
-nodist_libnmdbus_la_SOURCES = \
-	nmdbus-access-point.c \
-	nmdbus-access-point.h \
-	nmdbus-active-connection.c \
-	nmdbus-active-connection.h \
-	nmdbus-agent-manager.c \
-	nmdbus-agent-manager.h \
-	nmdbus-checkpoint.c \
-	nmdbus-checkpoint.h \
-	nmdbus-device-adsl.c \
-	nmdbus-device-adsl.h \
-	nmdbus-device-bond.c \
-	nmdbus-device-bond.h \
-	nmdbus-device-bridge.c \
-	nmdbus-device-bridge.h \
-	nmdbus-device-bt.c \
-	nmdbus-device-bt.h \
-	nmdbus-device-ethernet.c \
-	nmdbus-device-ethernet.h \
-	nmdbus-device.c \
-	nmdbus-device.h \
-	nmdbus-device-generic.c \
-	nmdbus-device-generic.h \
-	nmdbus-device-infiniband.c \
-	nmdbus-device-infiniband.h \
-	nmdbus-device-ip-tunnel.c \
-	nmdbus-device-ip-tunnel.h \
-	nmdbus-device-macvlan.c \
-	nmdbus-device-macvlan.h \
-	nmdbus-device-modem.c \
-	nmdbus-device-modem.h \
-	nmdbus-device-olpc-mesh.c \
-	nmdbus-device-olpc-mesh.h \
-	nmdbus-device-statistics.c \
-	nmdbus-device-statistics.h \
-	nmdbus-device-team.c \
-	nmdbus-device-team.h \
-	nmdbus-device-tun.c \
-	nmdbus-device-tun.h \
-	nmdbus-device-veth.c \
-	nmdbus-device-veth.h \
-	nmdbus-device-vlan.c \
-	nmdbus-device-vlan.h \
-	nmdbus-device-vxlan.c \
-	nmdbus-device-vxlan.h \
-	nmdbus-device-wifi.c \
-	nmdbus-device-wifi.h \
-	nmdbus-device-wimax.c \
-	nmdbus-device-wimax.h \
-	nmdbus-dhcp4-config.c \
-	nmdbus-dhcp4-config.h \
-	nmdbus-dhcp6-config.c \
-	nmdbus-dhcp6-config.h \
-	nmdbus-ip4-config.c \
-	nmdbus-ip4-config.h \
-	nmdbus-ip6-config.c \
-	nmdbus-ip6-config.h \
-	nmdbus-manager.c \
-	nmdbus-manager.h \
-	nmdbus-ppp-manager.c \
-	nmdbus-ppp-manager.h \
-	nmdbus-secret-agent.c \
-	nmdbus-secret-agent.h \
-	nmdbus-settings-connection.c \
-	nmdbus-settings-connection.h \
-	nmdbus-settings.c \
-	nmdbus-settings.h \
-	nmdbus-vpn-connection.c \
-	nmdbus-vpn-connection.h \
-	nmdbus-vpn-plugin.c \
-	nmdbus-vpn-plugin.h
-
-DBUS_INTERFACE_DOCS = \
-	nmdbus-access-point-org.freedesktop.NetworkManager.AccessPoint.xml \
-	nmdbus-active-connection-org.freedesktop.NetworkManager.Connection.Active.xml \
-	nmdbus-checkpoint-org.freedesktop.NetworkManager.Checkpoint.xml \
-	nmdbus-device-team-org.freedesktop.NetworkManager.Device.Team.xml \
-	nmdbus-dhcp6-config-org.freedesktop.NetworkManager.DHCP6Config.xml \
-	nmdbus-device-wifi-org.freedesktop.NetworkManager.Device.Wireless.xml \
-	nmdbus-manager-org.freedesktop.NetworkManager.xml \
-	nmdbus-vpn-connection-org.freedesktop.NetworkManager.VPN.Connection.xml \
-	nmdbus-secret-agent-org.freedesktop.NetworkManager.SecretAgent.xml \
-	nmdbus-device-org.freedesktop.NetworkManager.Device.xml \
-	nmdbus-vpn-plugin-org.freedesktop.NetworkManager.VPN.Plugin.xml \
-	nmdbus-device-bt-org.freedesktop.NetworkManager.Device.Bluetooth.xml \
-	nmdbus-device-vxlan-org.freedesktop.NetworkManager.Device.Vxlan.xml \
-	nmdbus-settings-connection-org.freedesktop.NetworkManager.Settings.Connection.xml \
-	nmdbus-device-bond-org.freedesktop.NetworkManager.Device.Bond.xml \
-	nmdbus-device-macvlan-org.freedesktop.NetworkManager.Device.Macvlan.xml \
-	nmdbus-ppp-manager-org.freedesktop.NetworkManager.PPP.xml \
-	nmdbus-device-vlan-org.freedesktop.NetworkManager.Device.Vlan.xml \
-	nmdbus-device-adsl-org.freedesktop.NetworkManager.Device.Adsl.xml \
-	nmdbus-agent-manager-org.freedesktop.NetworkManager.AgentManager.xml \
-	nmdbus-device-wimax-org.freedesktop.NetworkManager.Device.WiMax.xml \
-	nmdbus-device-ip-tunnel-org.freedesktop.NetworkManager.Device.IPTunnel.xml \
-	nmdbus-device-tun-org.freedesktop.NetworkManager.Device.Tun.xml \
-	nmdbus-device-bridge-org.freedesktop.NetworkManager.Device.Bridge.xml \
-	nmdbus-device-olpc-mesh-org.freedesktop.NetworkManager.Device.OlpcMesh.xml \
-	nmdbus-dhcp4-config-org.freedesktop.NetworkManager.DHCP4Config.xml \
-	nmdbus-device-generic-org.freedesktop.NetworkManager.Device.Generic.xml \
-	nmdbus-device-infiniband-org.freedesktop.NetworkManager.Device.Infiniband.xml \
-	nmdbus-device-modem-org.freedesktop.NetworkManager.Device.Modem.xml \
-	nmdbus-ip6-config-org.freedesktop.NetworkManager.IP6Config.xml \
-	nmdbus-device-veth-org.freedesktop.NetworkManager.Device.Veth.xml \
-	nmdbus-settings-org.freedesktop.NetworkManager.Settings.xml \
-	nmdbus-device-ethernet-org.freedesktop.NetworkManager.Device.Wired.xml \
-	nmdbus-ip4-config-org.freedesktop.NetworkManager.IP4Config.xml \
-	nmdbus-device-statistics-org.freedesktop.NetworkManager.Device.Statistics.xml
-
-define _make_nmdbus_rule
-$(1): $(patsubst nmdbus-%.c,nm-%.xml,$(1))
-	$$(AM_V_GEN) gdbus-codegen \
-		--generate-c-code $$(basename $$@) \
-		--generate-docbook $$(basename $$@) \
-		--c-namespace NMDBus \
-		--interface-prefix org.freedesktop.NetworkManager \
-		$$<
-
-$(filter $(basename $(1))-org.freedesktop.NetworkManager.%,$(DBUS_INTERFACE_DOCS)): $(1)
-	@true
-
-$(basename $(1)).h: $(1)
-	@true
-endef
-
-$(foreach f,$(filter %.c,$(nodist_libnmdbus_la_SOURCES)),$(eval $(call _make_nmdbus_rule,$f)))
-
-BUILT_SOURCES = $(nodist_libnmdbus_la_SOURCES) $(DBUS_INTERFACE_DOCS)
-
-CLEANFILES = $(BUILT_SOURCES)
-
-EXTRA_DIST = \
-	nm-access-point.xml \
-	nm-active-connection.xml \
-	nm-agent-manager.xml \
-	nm-checkpoint.xml \
-	nm-device-adsl.xml \
-	nm-device-bond.xml \
-	nm-device-bridge.xml \
-	nm-device-bt.xml \
-	nm-device-ethernet.xml \
-	nm-device-generic.xml \
-	nm-device-infiniband.xml \
-	nm-device-ip-tunnel.xml \
-	nm-device-macvlan.xml \
-	nm-device-modem.xml \
-	nm-device-olpc-mesh.xml \
-	nm-device-statistics.xml \
-	nm-device-team.xml \
-	nm-device-tun.xml \
-	nm-device-veth.xml \
-	nm-device-vlan.xml \
-	nm-device-vxlan.xml \
-	nm-device-wifi.xml \
-	nm-device-wimax.xml \
-	nm-device.xml \
-	nm-dhcp4-config.xml \
-	nm-dhcp6-config.xml \
-	nm-ip4-config.xml \
-	nm-ip6-config.xml \
-	nm-manager.xml \
-	nm-ppp-manager.xml \
-	nm-secret-agent.xml \
-	nm-settings-connection.xml \
-	nm-settings.xml \
-	nm-vpn-connection.xml \
-	nm-vpn-plugin.xml \
-	nm-wimax-nsp.xml