Imported Upstream version 0.9.10.0 upstream/0.9.10.0

1 files changed, 65 insertions, 22 deletions

diff --git a/man/Makefile.in b/man/Makefile.in
index d32adcf9..a48bf680 100644
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -77,16 +77,19 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-@ENABLE_GTK_DOC_TRUE@am__append_1 = nm-settings.5
-@ENABLE_GTK_DOC_FALSE@@INSTALL_PREGEN_MANPAGES_TRUE@am__append_2 = nm-settings.5
+@ENABLE_GTK_DOC_TRUE@am__append_1 = $(generated_man_pages)
+@ENABLE_GTK_DOC_TRUE@am__append_2 = \
+@ENABLE_GTK_DOC_TRUE@	$(docbook_autogenerated_man_pages)	\
+@ENABLE_GTK_DOC_TRUE@	$(docbook_generated_man_pages)
+
+@ENABLE_GTK_DOC_FALSE@@INSTALL_PREGEN_MANPAGES_TRUE@am__append_3 = $(generated_man_pages)
 subdir = man
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(srcdir)/NetworkManager.8.in \
-	$(srcdir)/NetworkManager.conf.5.in \
-	$(srcdir)/nm-system-settings.conf.5.in $(srcdir)/nm-tool.1.in \
+	$(srcdir)/nm-system-settings.conf.5.in \
 	$(srcdir)/nm-online.1.in $(srcdir)/nmcli.1.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_readline.m4 \
+	$(top_srcdir)/m4/compiler_warnings.m4 \
 	$(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/gnome-code-coverage.m4 \
 	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \
@@ -102,8 +105,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES = NetworkManager.8 NetworkManager.conf.5 \
-	nm-system-settings.conf.5 nm-tool.1 nm-online.1 nmcli.1
+CONFIG_CLEAN_FILES = nm-system-settings.conf.5 nm-online.1 nmcli.1
 CONFIG_CLEAN_VPATH_FILES =
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
@@ -185,12 +187,15 @@ CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
 DBUS_CFLAGS = @DBUS_CFLAGS@
+DBUS_GLIB_100_CFLAGS = @DBUS_GLIB_100_CFLAGS@
+DBUS_GLIB_100_LIBS = @DBUS_GLIB_100_LIBS@
 DBUS_LIBS = @DBUS_LIBS@
 DBUS_SYS_DIR = @DBUS_SYS_DIR@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
 DHCPCD_PATH = @DHCPCD_PATH@
+DISTRO_NETWORK_SERVICE = @DISTRO_NETWORK_SERVICE@
 DLLTOOL = @DLLTOOL@
 DNSMASQ_PATH = @DNSMASQ_PATH@
 DSYMUTIL = @DSYMUTIL@
@@ -215,7 +220,6 @@ GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
 GNUTLS_LIBS = @GNUTLS_LIBS@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
-GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -260,12 +264,16 @@ LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBM = @LIBM@
+LIBNDP_CFLAGS = @LIBNDP_CFLAGS@
+LIBNDP_LIBS = @LIBNDP_LIBS@
 LIBNL_CFLAGS = @LIBNL_CFLAGS@
 LIBNL_LIBS = @LIBNL_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@
 LIBSOUP_LIBS = @LIBSOUP_LIBS@
+LIBTEAMDCTL_CFLAGS = @LIBTEAMDCTL_CFLAGS@
+LIBTEAMDCTL_LIBS = @LIBTEAMDCTL_LIBS@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
@@ -282,6 +290,8 @@ MOC = @MOC@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
+NEWT_CFLAGS = @NEWT_CFLAGS@
+NEWT_LIBS = @NEWT_LIBS@
 NM = @NM@
 NMEDIT = @NMEDIT@
 NM_MAJOR_VERSION = @NM_MAJOR_VERSION@
@@ -309,11 +319,16 @@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POLKIT_CFLAGS = @POLKIT_CFLAGS@
 POLKIT_LIBS = @POLKIT_LIBS@
 POSUB = @POSUB@
+PPPD_PATH = @PPPD_PATH@
 PPPD_PLUGIN_DIR = @PPPD_PLUGIN_DIR@
+PPPOE_PATH = @PPPOE_PATH@
 QT_CFLAGS = @QT_CFLAGS@
 QT_LIBS = @QT_LIBS@
 RANLIB = @RANLIB@
+READLINE_LIBS = @READLINE_LIBS@
 SED = @SED@
+SELINUX_CFLAGS = @SELINUX_CFLAGS@
+SELINUX_LIBS = @SELINUX_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
@@ -328,6 +343,7 @@ UDEV_BASE_DIR = @UDEV_BASE_DIR@
 USE_NLS = @USE_NLS@
 UUID_CFLAGS = @UUID_CFLAGS@
 UUID_LIBS = @UUID_LIBS@
+VALGRIND_RULES = @VALGRIND_RULES@
 VAPIGEN = @VAPIGEN@
 VAPIGEN_MAKEFILE = @VAPIGEN_MAKEFILE@
 VAPIGEN_VAPIDIR = @VAPIGEN_VAPIDIR@
@@ -390,6 +406,7 @@ psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
+subdirs = @subdirs@
 sysconfdir = @sysconfdir@
 systemdsystemunitdir = @systemdsystemunitdir@
 target_alias = @target_alias@
@@ -400,11 +417,40 @@ with_dhclient = @with_dhclient@
 with_dhcpcd = @with_dhcpcd@
 with_netconfig = @with_netconfig@
 with_resolvconf = @with_resolvconf@
-man_MANS = NetworkManager.8 NetworkManager.conf.5 \
-	nm-system-settings.conf.5 nm-tool.1 nm-online.1 nmcli.1 \
-	$(am__append_1) $(am__append_2)
-CLEANFILES = nm-settings.5 nm-settings.xml
-@ENABLE_GTK_DOC_TRUE@XSLTPROC = xsltproc --xinclude --nonet
+with_valgrind = @with_valgrind@
+man_MANS = $(configure_generated_man_pages) $(am__append_1) \
+	$(am__append_3)
+CLEANFILES = nm-settings.xml $(am__append_2)
+EXTRA_DIST = $(docbook_generated_man_pages:.%=.xml) \
+	$(docbook_autogenerated_man_pages)
+XSLTPROC = xsltproc
+XSLTPROC_FLAGS = \
+	--xinclude \
+	--nonet \
+	--stringparam man.output.quietly 1 \
+	--stringparam funcsynopsis.style ansi \
+	--stringparam man.th.extra1.suppress 1 \
+	--stringparam man.authors.section.enabled 0 \
+	--stringparam man.copyright.section.enabled 0
+
+XSLTPROC_MAN_FLAGS = $(XSLTPROC_FLAGS) http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl
+configure_generated_man_pages = \
+	nmcli.1				\
+	nm-online.1			\
+	nm-system-settings.conf.5
+
+docbook_generated_man_pages = \
+	NetworkManager.8		\
+	NetworkManager.conf.5		\
+	nmcli-examples.5
+
+docbook_autogenerated_man_pages = \
+	nm-settings.5
+
+generated_man_pages = \
+	$(docbook_generated_man_pages)	\
+	$(docbook_autogenerated_man_pages)
+
 all: all-am
 
 .SUFFIXES:
@@ -438,14 +484,8 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
-NetworkManager.8: $(top_builddir)/config.status $(srcdir)/NetworkManager.8.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-NetworkManager.conf.5: $(top_builddir)/config.status $(srcdir)/NetworkManager.conf.5.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 nm-system-settings.conf.5: $(top_builddir)/config.status $(srcdir)/nm-system-settings.conf.5.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-nm-tool.1: $(top_builddir)/config.status $(srcdir)/nm-tool.1.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 nm-online.1: $(top_builddir)/config.status $(srcdir)/nm-online.1.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 nmcli.1: $(top_builddir)/config.status $(srcdir)/nmcli.1.in
@@ -745,8 +785,11 @@ uninstall-man: uninstall-man1 uninstall-man5 uninstall-man8
 	uninstall-man8
 
 
-@ENABLE_GTK_DOC_TRUE@nm-settings.5: nm-settings.xml
-@ENABLE_GTK_DOC_TRUE@	$(XSLTPROC) $(top_srcdir)/tools/manpages-docbook.xsl $(builddir)/nm-settings.xml
+@ENABLE_GTK_DOC_TRUE@%.8: %.xml
+@ENABLE_GTK_DOC_TRUE@	$(AM_V_GEN) xsltproc $(XSLTPROC_MAN_FLAGS) $<
+
+@ENABLE_GTK_DOC_TRUE@%.5: %.xml
+@ENABLE_GTK_DOC_TRUE@	$(AM_V_GEN) xsltproc $(XSLTPROC_MAN_FLAGS) $<
 
 @ENABLE_GTK_DOC_TRUE@nm-settings.xml: $(top_builddir)/tools/generate-settings-spec $(top_builddir)/libnm-util/libnm-util.la
 @ENABLE_GTK_DOC_TRUE@	rm -f $(builddir)/$@