X-Git-Url: https://git.proxmox.com/?p=pve-docs.git;a=blobdiff_plain;f=Makefile;h=7590df3aba411095ea85b2dae2396b550ed529c6;hp=9196915979546214e27952c3efe5bc14304e0b67;hb=500f1e1f534cc2b4e6c970ee259acc8367f59781;hpb=672abac1d7a724a160935c56c6f1a3ca3518c035

diff --git a/Makefile b/Makefile
index 9196915..7590df3 100644
--- a/Makefile
+++ b/Makefile
@@ -11,9 +11,28 @@ GITVERSION:=$(shell cat .git/refs/heads/master)
 
 DEB=${PACKAGE}_${DOCRELEASE}-${PKGREL}_amd64.deb
 
-COMMAND_LIST=pvecm qm qmrestore pct pveam pvesm pveum vzdump ha-manager
-
-SERVICE_LIST=pve-firewall pve-ha-crm pve-ha-lrm pvestatd
+COMMAND_LIST=		\
+	pvesubscription	\
+	pvecm 		\
+	qm 		\
+	qmrestore 	\
+	pveceph		\
+	pct 		\
+	pveam 		\
+	pvesm 		\
+	pveum 		\
+	vzdump 		\
+	ha-manager
+
+SERVICE_LIST=		\
+	pve-firewall 	\
+	pve-ha-crm 	\
+	pve-ha-lrm 	\
+	pvestatd 	\
+	pmxcfs 		\
+	pveproxy	\
+	spiceproxy	\
+	pvedaemon
 
 CONFIG_LIST=datacenter.cfg qm.conf pct.conf
 
@@ -31,6 +50,7 @@ DEB_SOURCES=					\
 	pve-storage-nfs.adoc			\
 	pve-storage-rbd.adoc			\
 	pve-storage-zfspool.adoc		\
+	pmxcfs.8-cli.adoc			\
 	pve-copyright.adoc			\
 	docinfo.xml
 
@@ -38,15 +58,13 @@ GEN_SCRIPTS=					\
 	gen-datacenter.cfg.5-opts.pl		\
 	gen-pct.conf.5-opts.pl			\
 	gen-qm.conf.5-opts.pl			\
+	gen-vzdump.conf.5-opts.pl		\
 	gen-pve-firewall-cluster-opts.pl	\
 	gen-pve-firewall-host-opts.pl		\
 	gen-pve-firewall-macros-adoc.pl		\
 	gen-pve-firewall-rules-opts.pl		\
 	gen-pve-firewall-vm-opts.pl
 
-VZDUMP_SOURCES=attributes.txt vzdump.adoc vzdump.1-synopsis.adoc
-PVEAM_SOURCES=attributes.txt pveam.adoc pveam.1-synopsis.adoc
-
 SYSADMIN_SOURCES=				\
 	getting-help.adoc			\
 	pve-package-repos.adoc			\
@@ -62,6 +80,7 @@ PVE_ADMIN_GUIDE_SOURCES=			\
 	pve-admin-guide.adoc			\
 	pve-intro.adoc				\
 	pmxcfs.adoc 				\
+	pmxcfs.8-cli.adoc			\
 	pve-faq.adoc				\
 	${PVE_FIREWALL_MAN8_SOURCES}		\
 	${PVESM_MAN1_SOURCES}			\
@@ -71,10 +90,16 @@ PVE_ADMIN_GUIDE_SOURCES=			\
 	${QM_MAN1_SOURCES}			\
 	${QMRESTORE_MAN1_SOURCES}		\
 	${HA_MANAGER_MAN1_SOURCES}		\
+	${PVESTATD_MAN8_SOURCES}		\
+	${PVEDAEMON_MAN8_SOURCES}		\
+	${PVEPROXY_MAN8_SOURCES}		\
+	${SPICEPROXY_MAN8_SOURCES}		\
 	${PVE_HA_CRM_MAN8_SOURCES}		\
 	${PVE_HA_LRM_MAN8_SOURCES}		\
-	${PVEAM_SOURCES}			\
-	${VZDUMP_SOURCES}			\
+	${VZDUMP_MAN1_SOURCES}			\
+	${PVEAM_MAN1_SOURCES}			\
+	${PVESUBSCRIPTION_MAN1_SOURCES}		\
+	${PVECEPH_MAN1_SOURCES}			\
 	images/cluster-nwdiag.svg		\
 	images/node-nwdiag.svg			\
 	pve-bibliography.adoc			\
@@ -96,28 +121,20 @@ all: pve-admin-guide.html
 %-nwdiag.svg: %.nwdiag
 	nwdiag -T svg $*.nwdiag -o $@;
 
-%.1: %.adoc %.1-synopsis.adoc docinfo.xml attributes.txt
-	a2x -a docinfo1 -a "manvolnum=1" -a "manversion=Release ${DOCRELEASE}" -f manpage $*.adoc
-	test -n "$${NOVIEW}" || man -l $@
-
-%.1.html: %.adoc %.1-synopsis.adoc docinfo.xml attributes.txt
+%.1.html: %.adoc %.1-synopsis.adoc ${PVE_COMMON_DOC_SOURCES}
 	asciidoc ${ADOC_MAN1_HTML_ARGS} -o $@ $*.adoc
 	test -n "$${NOVIEW}" || $(BROWSER) $@ &
 
 
-%.8-synopsis.adoc:
-	perl -e "use PVE::Service::$(subst -,_,$*);print PVE::Service::$(subst -,_,$*)->generate_asciidoc_synopsys();" > $@.tmp
-	mv $@.tmp $@
-
-%.8: %.adoc %.8-synopsis.adoc docinfo.xml
-	a2x -a docinfo1 -a "manvolnum=8" -a "manversion=Release ${DOCRELEASE}" -f manpage $*.adoc
-	test -n "$${NOVIEW}" || man -l $@
+pmxcfs.8.html: pmxcfs.adoc pmxcfs.8-cli.adoc ${PVE_COMMON_DOC_SOURCES}
+	asciidoc ${ADOC_MAN8_HTML_ARGS} -o $@ pmxcfs.adoc
+	test -n "$${NOVIEW}" || $(BROWSER) $@ &
 
-%.8.html: %.adoc %.8-synopsis.adoc docinfo.xml
+%.8.html: %.adoc %.8-synopsis.adoc ${PVE_COMMON_DOC_SOURCES}
 	asciidoc ${ADOC_MAN8_HTML_ARGS} -o $@ $*.adoc
 	test -n "$${NOVIEW}" || $(BROWSER) $@ &
 
-%.5.html: %.adoc %.5-opts.adoc docinfo.xml
+%.5.html: %.adoc %.5-opts.adoc ${PVE_COMMON_DOC_SOURCES}
 	asciidoc ${ADOC_MAN5_HTML_ARGS} -o $@ $*.adoc
 	test -n "$${NOVIEW}" || $(BROWSER) $@ &
 
@@ -145,7 +162,7 @@ dinstall: ${DEB}
 	dpkg -i ${DEB}
 
 .PHONY: deb
-${DEB} deb:
+${DEB} deb: ${DEB_SOURCES}
 	rm -rf build
 	mkdir build
 	rsync -a debian/ build/debian