From f88dd66e6d8afd952e286b9aa5f48c4f70141fed Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Sat, 26 Mar 2016 10:16:28 +0100 Subject: [PATCH] introspection: build docbook when generating the code --- .gitignore | 1 + introspection/Makefile.am | 43 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 43 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 0cd4e28d6..7a880bba2 100644 --- a/.gitignore +++ b/.gitignore @@ -142,6 +142,7 @@ test-*.trs /introspection/all.xml /introspection/nmdbus-*.c /introspection/nmdbus-*.h +/introspection/nmdbus-*.xml /libgsystem/ diff --git a/introspection/Makefile.am b/introspection/Makefile.am index 735921d37..4d2e12983 100644 --- a/introspection/Makefile.am +++ b/introspection/Makefile.am @@ -78,21 +78,62 @@ nodist_libnmdbus_la_SOURCES = \ 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-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 + 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))) -CLEANFILES = $(nodist_libnmdbus_la_SOURCES) +BUILT_SOURCES = $(nodist_libnmdbus_la_SOURCES) $(DBUS_INTERFACE_DOCS) + +CLEANFILES = $(BUILT_SOURCES) EXTRA_DIST = \ all.xml.in \ -- 2.17.1