Imported Upstream version 1.1.92 upstream/1.1.92

1 files changed, 49 insertions, 5 deletions

diff --git a/introspection/Makefile.in b/introspection/Makefile.in
index ac18d9ae..ea43b442 100644
--- a/introspection/Makefile.in
+++ b/introspection/Makefile.in
@@ -540,7 +540,43 @@ nodist_libnmdbus_la_SOURCES = \
 	nmdbus-vpn-plugin.c \
 	nmdbus-vpn-plugin.h
 
-CLEANFILES = $(nodist_libnmdbus_la_SOURCES)
+DBUS_INTERFACE_DOCS = \
+	nmdbus-access-point-org.freedesktop.NetworkManager.AccessPoint.xml \
+	nmdbus-active-connection-org.freedesktop.NetworkManager.Connection.Active.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
+
+BUILT_SOURCES = $(nodist_libnmdbus_la_SOURCES) $(DBUS_INTERFACE_DOCS)
+CLEANFILES = $(BUILT_SOURCES)
 EXTRA_DIST = \
 	all.xml.in \
 	generic-types.xml \
@@ -581,7 +617,8 @@ EXTRA_DIST = \
 	nm-vpn-plugin.xml \
 	nm-wimax-nsp.xml
 
-all: all-am
+all: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .lo .o .obj
@@ -781,10 +818,12 @@ distdir: $(DISTFILES)
 	  fi; \
 	done
 check-am: all-am
-check: check-am
+check: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) check-am
 all-am: Makefile $(LTLIBRARIES)
 installdirs:
-install: install-am
+install: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) install-am
 install-exec: install-exec-am
 install-data: install-data-am
 uninstall: uninstall-am
@@ -815,6 +854,7 @@ distclean-generic:
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
+	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
 clean: clean-am
 
 clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
@@ -886,7 +926,7 @@ ps-am:
 
 uninstall-am:
 
-.MAKE: install-am install-strip
+.MAKE: all check install install-am install-strip
 
 .PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
 	clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \
@@ -909,10 +949,14 @@ 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