X-Git-Url: https://code.delx.au/pulseaudio/blobdiff_plain/2ee9276d97f15ea965fb8a88f2aa184355b9903a..997e369691496be4ecfe38e3516f7e007ed69a7b:/man/Makefile.am

diff --git a/man/Makefile.am b/man/Makefile.am
index 9b229f52..d80ba6ad 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -15,26 +15,9 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 # USA.
 
-pulseconfdir=$(sysconfdir)/pulse
-
-CLEANFILES = \
+DISTCLEANFILES = \
 	$(noinst_DATA)
 
-dist_man_MANS = \
-	pulseaudio.1 \
-	esdcompat.1 \
-	pax11publish.1 \
-	paplay.1 \
-	pacat.1 \
-	pacmd.1 \
-	pactl.1 \
-	pasuspender.1 \
-	padsp.1 \
-	pabrowse.1 \
-	pulse-daemon.conf.5 \
-	pulse-client.conf.5 \
-	default.pa.5
-
 noinst_DATA = \
 	pulseaudio.1.xml \
 	esdcompat.1.xml \
@@ -45,28 +28,40 @@ noinst_DATA = \
 	pactl.1.xml \
 	pasuspender.1.xml \
 	padsp.1.xml \
-	pabrowse.1.xml \
 	pulse-daemon.conf.5.xml \
 	pulse-client.conf.5.xml \
-	default.pa.5.xml
+	default.pa.5.xml \
+	pulse-cli-syntax.5.xml \
+	start-pulseaudio-x11.1.xml
+
+xmllint: $(noinst_DATA)
+	for f in $(noinst_DATA) ; do \
+			xmllint --noout --valid "$$f" || exit 1 ; \
+	done
 
 if BUILD_MANPAGES
 
-CLEANFILES += \
-	$(dist_man_MANS)
+dist_man_MANS = \
+	pulseaudio.1 \
+	esdcompat.1 \
+	pax11publish.1 \
+	paplay.1 \
+	pacat.1 \
+	pacmd.1 \
+	pactl.1 \
+	pasuspender.1 \
+	padsp.1 \
+	pulse-daemon.conf.5 \
+	pulse-client.conf.5 \
+	default.pa.5 \
+	pulse-cli-syntax.5 \
+	start-pulseaudio-x11.1
 
-%.xml: %.xml.in Makefile
-	sed -e 's,@pulseconfdir\@,$(pulseconfdir),g' \
-	    -e 's,@PACKAGE_BUGREPORT\@,$(PACKAGE_BUGREPORT),g' \
-            -e 's,@PACKAGE_URL\@,$(PACKAGE_URL),g' $< > $@
+CLEANFILES = \
+	$(dist_man_MANS)
 
 %: %.xml Makefile
-	perl $(srcdir)/xmltoman $< > $@ || rm -f $@
-
-xmllint: $(noinst_DATA)
-	for f in $(noinst_DATA) ; do \
-			xmllint --noout --valid "$$f" || exit 1 ; \
-	done
+	$(AM_V_GEN) perl $(srcdir)/xmltoman $< > $@ || rm -f $@
 
 endif
 
@@ -80,10 +75,11 @@ EXTRA_DIST = \
 	pactl.1.xml.in \
 	pasuspender.1.xml.in \
 	padsp.1.xml.in \
-	pabrowse.1.xml.in \
 	pulse-daemon.conf.5.xml.in \
 	pulse-client.conf.5.xml.in \
 	default.pa.5.xml.in \
+	pulse-cli-syntax.5.xml.in \
+	start-pulseaudio-x11.1.xml.in \
 	xmltoman \
 	xmltoman.css \
 	xmltoman.xsl \