Imported Upstream version 1.0.0 upstream/1.0.0

1 files changed, 20 insertions, 11 deletions

diff --git a/docs/api/Makefile.in b/docs/api/Makefile.in
index ed0643e3..fb97c833 100644
--- a/docs/api/Makefile.in
+++ b/docs/api/Makefile.in
@@ -83,8 +83,11 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
+@SETTING_DOCS_AVAILABLE_TRUE@am__append_1 = settings-spec.xml
 DIST_COMMON = $(top_srcdir)/gtk-doc.make $(srcdir)/Makefile.in \
 	$(srcdir)/Makefile.am $(srcdir)/version.xml.in
+@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 \
@@ -136,6 +139,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BLUEZ5_CFLAGS = @BLUEZ5_CFLAGS@
+BLUEZ5_LIBS = @BLUEZ5_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -259,6 +264,7 @@ NEWT_CFLAGS = @NEWT_CFLAGS@
 NEWT_LIBS = @NEWT_LIBS@
 NM = @NM@
 NMEDIT = @NMEDIT@
+NM_CONFIG_DEFAULT_AUTH_POLKIT_TEXT = @NM_CONFIG_DEFAULT_AUTH_POLKIT_TEXT@
 NM_MAJOR_VERSION = @NM_MAJOR_VERSION@
 NM_MICRO_VERSION = @NM_MICRO_VERSION@
 NM_MINOR_VERSION = @NM_MINOR_VERSION@
@@ -278,6 +284,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
@@ -304,7 +311,7 @@ SYSTEMD_INHIBIT_LIBS = @SYSTEMD_INHIBIT_LIBS@
 SYSTEMD_LOGIN_CFLAGS = @SYSTEMD_LOGIN_CFLAGS@
 SYSTEMD_LOGIN_LIBS = @SYSTEMD_LOGIN_LIBS@
 SYSTEM_CA_PATH = @SYSTEM_CA_PATH@
-UDEV_BASE_DIR = @UDEV_BASE_DIR@
+UDEV_DIR = @UDEV_DIR@
 USE_NLS = @USE_NLS@
 UUID_CFLAGS = @UUID_CFLAGS@
 UUID_LIBS = @UUID_LIBS@
@@ -394,7 +401,7 @@ OTHER_FILES = \
 	$(top_srcdir)/tools/doc-generator.xsl \
 	$(top_srcdir)/introspection/generic-types.xml
 
-GENERATED_FILES = spec.html settings-spec.xml
+GENERATED_FILES = spec.html $(am__append_1)
 
 ####################################
 
@@ -411,6 +418,9 @@ MKDB_OPTIONS = --sgml-mode --output-format=xml
 # Extra options to supply to gtkdoc-mktmpl
 MKTMPL_OPTIONS = 
 
+# Extra options to supply to gtkdoc-mkhtml
+MKHTML_OPTIONS = --path="$(abs_srcdir)"
+
 # Non-autogenerated SGML files to be included in $(DOC_MAIN_SGML_FILE)
 content_files = \
 	version.xml \
@@ -440,7 +450,7 @@ SETUP_FILES = \
 
 ####################################
 EXTRA_DIST = $(HTML_IMAGES) $(SETUP_FILES) version.xml.in \
-	$(GENERATED_FILES)
+	settings-spec.xsl $(GENERATED_FILES)
 DOC_STAMPS = setup-build.stamp scan-build.stamp tmpl-build.stamp sgml-build.stamp \
 	html-build.stamp pdf-build.stamp \
 	tmpl.stamp sgml.stamp html.stamp pdf.stamp
@@ -459,7 +469,7 @@ REPORT_FILES = \
 
 CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) html/* \
 	tmpl/* xml/* NetworkManager-sections.txt \
-	NetworkManager-overrides.txt $(GENERATED_FILES)
+	NetworkManager-overrides.txt $(am__append_2) $(am__append_3)
 @ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_FALSE@HTML_BUILD_STAMP = 
 @ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_TRUE@HTML_BUILD_STAMP = html-build.stamp
 @ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_FALSE@PDF_BUILD_STAMP = 
@@ -701,20 +711,19 @@ uninstall-am: uninstall-local
 	uninstall-am uninstall-local
 
 
+@SETTING_DOCS_AVAILABLE_TRUE@settings-spec.xml: settings-spec.xsl $(top_builddir)/libnm/nm-setting-docs.xml
+@SETTING_DOCS_AVAILABLE_TRUE@	$(AM_V_GEN) xsltproc --output $@ $^
+
+# 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@settings-spec.xml: $(top_builddir)/tools/generate-settings-spec $(top_builddir)/libnm-util/libnm-util.la
-@ENABLE_GTK_DOC_TRUE@	rm -f $(builddir)/settings-spec.xml
-@ENABLE_GTK_DOC_TRUE@	$(top_builddir)/tools/generate-settings-spec book $(builddir)/settings-spec.xml
-
 @ENABLE_GTK_DOC_TRUE@all: $(GENERATED_FILES)
 
-# Top-level SGML file includes (depends on) settings-spec.xml
-$(DOC_MAIN_SGML_FILE): settings-spec.xml
-
 @ENABLE_GTK_DOC_TRUE@all-local: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
 @ENABLE_GTK_DOC_FALSE@all-local: