update python stuff a little to match the newest DBUS interfaces

[catta] / man / Makefile.am

diff --git a/man/Makefile.am b/man/Makefile.am
index 946a15f43296c12a7edaac50130619e220f047d5..d80c88573f57d581ba260f6477dadd85a011566f 100644 (file)
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -20,23 +20,14 @@
 pkgsysconfdir=$(sysconfdir)/avahi
 servicedir=$(pkgsysconfdir)/services
 
+if BUILD_MANPAGES
+
 man_MANS = \
        avahi-daemon.8 \
        avahi-dnsconfd.8 \
-       avahi-daemon.conf.5 
-
-if HAVE_PYTHON
-
-man_MANS += \
-       avahi-browse.1 \
-       avahi-publish-service.1 \
-       avahi-publish-address.1 \
-       avahi-resolve-address.1 \
-       avahi-resolve-host-name.1 \
-       avahi-discover.1 \
-       avahi-bookmarks.1
-
-endif
+       avahi-daemon.conf.5 \
+       avahi-dnsconfd.action.8 \
+       avahi.service.5
 
 noinst_DATA = \
        avahi-browse.1.xml \
@@ -48,27 +39,28 @@ noinst_DATA = \
        avahi-discover.1.xml \
        avahi-bookmarks.1.xml \
        avahi-dnsconfd.8.xml \
-       avahi-daemon.conf.5.xml 
-
-EXTRA_DIST = \
-       $(man_MANS) \
-       avahi-browse.1.xml.in \
-       avahi-publish-service.1.xml.in \
-       avahi-publish-address.1.xml.in \
-       avahi-resolve-address.1.xml.in \
-       avahi-resolve-host-name.1.xml.in \
-       avahi-daemon.8.xml.in \
-       avahi-discover.1.xml.in \
-       avahi-bookmarks.1.xml.in \
-       avahi-dnsconfd.8.xml.in \
-       avahi-daemon.5.conf.xml.in \
-       xmltoman.css \
-       xmltoman.xsl \
-       xmltoman.dtd
+       avahi-daemon.conf.5.xml \
+       avahi-dnsconfd.action.8.xml \
+       avahi.service.5.xml
 
 CLEANFILES = \
        $(noinst_DATA)
 
+if HAVE_PYTHON
+if HAVE_DBUS
+
+man_MANS += \
+       avahi-browse.1 \
+       avahi-publish-service.1 \
+       avahi-publish-address.1 \
+       avahi-resolve-address.1 \
+       avahi-resolve-host-name.1 \
+       avahi-discover.1 \
+       avahi-bookmarks.1
+
+endif
+endif
+
 avahi-browse.1.xml: avahi-browse.1.xml.in Makefile
        sed -e 's,@PACKAGE_BUGREPORT\@,$(PACKAGE_BUGREPORT),g' \
         -e 's,@PACKAGE_URL\@,$(PACKAGE_URL),g' $< > $@
@@ -113,6 +105,17 @@ avahi-daemon.conf.5.xml: avahi-daemon.conf.5.xml.in Makefile
                -e 's,@PACKAGE_BUGREPORT\@,$(PACKAGE_BUGREPORT),g' \
         -e 's,@PACKAGE_URL\@,$(PACKAGE_URL),g' $< > $@
 
+avahi-dnsconfd.action.8.xml: avahi-dnsconfd.action.8.xml.in Makefile
+       sed     -e 's,@pkgsysconfdir\@,$(pkgsysconfdir),g' \
+               -e 's,@PACKAGE_BUGREPORT\@,$(PACKAGE_BUGREPORT),g' \
+        -e 's,@PACKAGE_URL\@,$(PACKAGE_URL),g' $< > $@
+
+avahi.service.5.xml: avahi.service.5.xml.in Makefile
+       sed     -e 's,@pkgsysconfdir\@,$(pkgsysconfdir),g' \
+               -e 's,@servicedir\@,$(servicedir),g' \
+               -e 's,@PACKAGE_BUGREPORT\@,$(PACKAGE_BUGREPORT),g' \
+        -e 's,@PACKAGE_URL\@,$(PACKAGE_URL),g' $< > $@
+
 
 if USE_XMLTOMAN
 
@@ -148,4 +151,36 @@ avahi-dnsconfd.8: avahi-dnsconfd.8.xml Makefile
 avahi-daemon.conf.5: avahi-daemon.conf.5.xml Makefile
        xmltoman $< > $@
 
+avahi-dnsconfd.action.8: avahi-dnsconfd.action.8.xml Makefile
+       xmltoman $< > $@
+
+avahi.service.5: avahi.service.5.xml Makefile
+       xmltoman $< > $@
+
+
+xmllint: $(noinst_DATA)
+       for f in $(noinst_DATA) ; do \
+                       xmllint --noout --valid "$$f" || exit 1 ; \
+       done
+
+endif
+
 endif
+
+EXTRA_DIST = \
+       $(man_MANS) \
+       avahi-browse.1.xml.in \
+       avahi-publish-service.1.xml.in \
+       avahi-publish-address.1.xml.in \
+       avahi-resolve-address.1.xml.in \
+       avahi-resolve-host-name.1.xml.in \
+       avahi-daemon.8.xml.in \
+       avahi-discover.1.xml.in \
+       avahi-bookmarks.1.xml.in \
+       avahi-dnsconfd.8.xml.in \
+       avahi-daemon.conf.5.xml.in \
+       avahi-dnsconfd.action.8.xml.in \
+       avahi.service.5.xml.in \
+       xmltoman.css \
+       xmltoman.xsl \
+       xmltoman.dtd