summary refs log tree commit diff
path: root/docs/api/Makefile.in
diff options
context:
space:
mode:
Diffstat (limited to 'docs/api/Makefile.in')
-rw-r--r--docs/api/Makefile.in55
1 files changed, 44 insertions, 11 deletions
diff --git a/docs/api/Makefile.in b/docs/api/Makefile.in
index d08d2f88..6a510fef 100644
--- a/docs/api/Makefile.in
+++ b/docs/api/Makefile.in
@@ -95,7 +95,6 @@ build_triplet = @build@
 host_triplet = @host@
 @SETTING_DOCS_AVAILABLE_TRUE@am__append_1 = settings-spec.xml
 @BUILD_SETTING_DOCS_TRUE@am__append_2 = settings-spec.xml
-@ENABLE_GTK_DOC_TRUE@am__append_3 = spec.html
 subdir = docs/api
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_readline.m4 \
@@ -412,10 +411,9 @@ OTHER_FILES = \
 	$(top_srcdir)/introspection/generic-types.xml \
 	$(top_srcdir)/introspection/errors.xml \
 	$(top_srcdir)/introspection/vpn-errors.xml \
-	$(top_srcdir)/tools/doc-generator.xsl \
 	$(top_srcdir)/introspection/generic-types.xml
 
-GENERATED_FILES = spec.html $(am__append_1)
+GENERATED_FILES = $(am__append_1)
 
 ####################################
 
@@ -438,10 +436,50 @@ MKHTML_OPTIONS = --path="$(abs_srcdir)"
 # Non-autogenerated SGML files to be included in $(DOC_MAIN_SGML_FILE)
 content_files = \
 	version.xml \
-	migrating-to-09.xml \
 	../../COPYING \
 	$(NULL)
 
+expand_content_files = \
+	$(top_builddir)/introspection/nmdbus-access-point-org.freedesktop.NetworkManager.AccessPoint.xml \
+	$(top_builddir)/introspection/nmdbus-active-connection-org.freedesktop.NetworkManager.Connection.Active.xml \
+	$(top_builddir)/introspection/nmdbus-device-team-org.freedesktop.NetworkManager.Device.Team.xml \
+	$(top_builddir)/introspection/nmdbus-dhcp6-config-org.freedesktop.NetworkManager.DHCP6Config.xml \
+	$(top_builddir)/introspection/nmdbus-device-wifi-org.freedesktop.NetworkManager.Device.Wireless.xml \
+	$(top_builddir)/introspection/nmdbus-manager-org.freedesktop.NetworkManager.xml \
+	$(top_builddir)/introspection/nmdbus-vpn-connection-org.freedesktop.NetworkManager.VPN.Connection.xml \
+	$(top_builddir)/introspection/nmdbus-secret-agent-org.freedesktop.NetworkManager.SecretAgent.xml \
+	$(top_builddir)/introspection/nmdbus-device-org.freedesktop.NetworkManager.Device.xml \
+	$(top_builddir)/introspection/nmdbus-vpn-plugin-org.freedesktop.NetworkManager.VPN.Plugin.xml \
+	$(top_builddir)/introspection/nmdbus-device-bt-org.freedesktop.NetworkManager.Device.Bluetooth.xml \
+	$(top_builddir)/introspection/nmdbus-device-vxlan-org.freedesktop.NetworkManager.Device.Vxlan.xml \
+	$(top_builddir)/introspection/nmdbus-settings-connection-org.freedesktop.NetworkManager.Settings.Connection.xml \
+	$(top_builddir)/introspection/nmdbus-device-bond-org.freedesktop.NetworkManager.Device.Bond.xml \
+	$(top_builddir)/introspection/nmdbus-device-macvlan-org.freedesktop.NetworkManager.Device.Macvlan.xml \
+	$(top_builddir)/introspection/nmdbus-ppp-manager-org.freedesktop.NetworkManager.PPP.xml \
+	$(top_builddir)/introspection/nmdbus-device-vlan-org.freedesktop.NetworkManager.Device.Vlan.xml \
+	$(top_builddir)/introspection/nmdbus-device-adsl-org.freedesktop.NetworkManager.Device.Adsl.xml \
+	$(top_builddir)/introspection/nmdbus-agent-manager-org.freedesktop.NetworkManager.AgentManager.xml \
+	$(top_builddir)/introspection/nmdbus-device-wimax-org.freedesktop.NetworkManager.Device.WiMax.xml \
+	$(top_builddir)/introspection/nmdbus-device-ip-tunnel-org.freedesktop.NetworkManager.Device.IPTunnel.xml \
+	$(top_builddir)/introspection/nmdbus-device-tun-org.freedesktop.NetworkManager.Device.Tun.xml \
+	$(top_builddir)/introspection/nmdbus-device-bridge-org.freedesktop.NetworkManager.Device.Bridge.xml \
+	$(top_builddir)/introspection/nmdbus-device-olpc-mesh-org.freedesktop.NetworkManager.Device.OlpcMesh.xml \
+	$(top_builddir)/introspection/nmdbus-dhcp4-config-org.freedesktop.NetworkManager.DHCP4Config.xml \
+	$(top_builddir)/introspection/nmdbus-device-generic-org.freedesktop.NetworkManager.Device.Generic.xml \
+	$(top_builddir)/introspection/nmdbus-device-infiniband-org.freedesktop.NetworkManager.Device.Infiniband.xml \
+	$(top_builddir)/introspection/nmdbus-device-modem-org.freedesktop.NetworkManager.Device.Modem.xml \
+	$(top_builddir)/introspection/nmdbus-ip6-config-org.freedesktop.NetworkManager.IP6Config.xml \
+	$(top_builddir)/introspection/nmdbus-device-veth-org.freedesktop.NetworkManager.Device.Veth.xml \
+	$(top_builddir)/introspection/nmdbus-settings-org.freedesktop.NetworkManager.Settings.xml \
+	$(top_builddir)/introspection/nmdbus-device-ethernet-org.freedesktop.NetworkManager.Device.Wired.xml \
+	$(top_builddir)/introspection/nmdbus-ip4-config-org.freedesktop.NetworkManager.IP4Config.xml \
+	$(top_builddir)/man/NetworkManager.xml \
+	$(top_builddir)/man/NetworkManager.conf.xml \
+	$(top_builddir)/man/nmcli-examples.xml \
+	$(top_builddir)/man/nm-settings.xml \
+	$(top_builddir)/man/nm-settings-keyfile.xml \
+	$(top_builddir)/man/nm-settings-ifcfg-rh.xml
+
 @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 @GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(GTKDOC_DEPS_LIBS) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
@@ -486,7 +524,7 @@ REPORT_FILES = \
 CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) \
 	gtkdoc-check.test html/* tmpl/* xml/* \
 	NetworkManager-sections.txt NetworkManager-overrides.txt \
-	$(am__append_2) $(am__append_3)
+	$(am__append_2)
 @GTK_DOC_BUILD_HTML_FALSE@HTML_BUILD_STAMP = 
 @GTK_DOC_BUILD_HTML_TRUE@HTML_BUILD_STAMP = html-build.stamp
 @GTK_DOC_BUILD_PDF_FALSE@PDF_BUILD_STAMP = 
@@ -731,12 +769,7 @@ uninstall-am: uninstall-local
 # Top-level SGML file includes (depends on) settings-spec.xml
 @SETTING_DOCS_AVAILABLE_TRUE@$(DOC_MAIN_SGML_FILE): settings-spec.xml
 
-@ENABLE_GTK_DOC_TRUE@spec.html: $(XMLS) $(OTHER_FILES) html-build.stamp
-@ENABLE_GTK_DOC_TRUE@	$(XSLTPROC) --path "$(top_builddir)/introspection:$(top_srcdir)/introspection" $(top_srcdir)/tools/doc-generator.xsl $(top_builddir)/introspection/all.xml > spec.html
-@ENABLE_GTK_DOC_TRUE@	mkdir -p $(builddir)/html/
-@ENABLE_GTK_DOC_TRUE@	cp spec.html $(builddir)/html/
-
-@ENABLE_GTK_DOC_TRUE@all: $(GENERATED_FILES)
+@SETTING_DOCS_AVAILABLE_TRUE@all: $(GENERATED_FILES)
 
 gtkdoc-check.test: Makefile
 	$(AM_V_GEN)echo "#!/bin/sh -e" > $@; \