export pvesm.1 with pve-doc-generator.mk

diff --git a/Makefile b/Makefile
index b0ffa2f4065236a7214a6325e78235278dd756de..f3981a6b093dfcd5f6efb859206874901503e921 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -14,6 +14,14 @@ DEB_SOURCES=                 \
        pve-doc-generator.mk    \
        attributes.txt          \
        pvesm.adoc              \
        pve-doc-generator.mk    \
        attributes.txt          \
        pvesm.adoc              \

+       pve-storage-dir.adoc    \
+       pve-storage-glusterfs.adoc      \
+       pve-storage-iscsi.adoc          \
+       pve-storage-iscsidirect.adoc    \
+       pve-storage-lvm.adoc            \
+       pve-storage-nfs.adoc            \
+       pve-storage-rbd.adoc            \
+       pve-storage-zfspool.adoc        \

        pveum.adoc              \
        vzdump.adoc             \
        pve-firewall.adoc       \
        pveum.adoc              \
        vzdump.adoc             \
        pve-firewall.adoc       \


@@ -34,7 +42,6 @@ GEN_SCRIPTS=                                  \
        gen-pve-firewall-vm-opts.pl             \
        gen-vm-conf-opts-adoc.pl
 
        gen-pve-firewall-vm-opts.pl             \
        gen-vm-conf-opts-adoc.pl
 

-PVESM_SOURCES=attributes.txt pvesm.adoc pvesm.1-synopsis.adoc $(shell ls pve-storage-*.adoc)

 PVEUM_SOURCES=attributes.txt pveum.adoc pveum.1-synopsis.adoc
 VZDUMP_SOURCES=attributes.txt vzdump.adoc vzdump.1-synopsis.adoc
 QM_SOURCES=attributes.txt qm.adoc qm.1-synopsis.adoc
 PVEUM_SOURCES=attributes.txt pveum.adoc pveum.1-synopsis.adoc
 VZDUMP_SOURCES=attributes.txt vzdump.adoc vzdump.1-synopsis.adoc
 QM_SOURCES=attributes.txt qm.adoc qm.1-synopsis.adoc


@@ -62,11 +69,11 @@ PVE_ADMIN_GUIDE_SOURCES=            \
        pmxcfs.adoc                     \
        pve-faq.adoc                    \
        ${PVE_FIREWALL_MAN8_SOURCES}    \
        pmxcfs.adoc                     \
        pve-faq.adoc                    \
        ${PVE_FIREWALL_MAN8_SOURCES}    \

+       ${PVESM_MAN1_SOURCES}           \

        ${QM_SOURCES}                   \
        ${PCT_SOURCES}                  \
        ${PVEAM_SOURCES}                \
        ${PVEUM_SOURCES}                \
        ${QM_SOURCES}                   \
        ${PCT_SOURCES}                  \
        ${PVEAM_SOURCES}                \
        ${PVEUM_SOURCES}                \

-       ${PVESM_SOURCES}                \

        ${VZDUMP_SOURCES}               \
        ${HA_SOURCES}                   \
        images/cluster-nwdiag.svg       \
        ${VZDUMP_SOURCES}               \
        ${HA_SOURCES}                   \
        images/cluster-nwdiag.svg       \

diff --git a/pve-doc-generator.mk b/pve-doc-generator.mk
index e8648188800976b54f724d424ed96f5fd9dfb37b..5387cc99b9820e69786b9d804d4b24d9b5bd42b0 100644 (file)
--- a/pve-doc-generator.mk
+++ b/pve-doc-generator.mk
@@ -5,6 +5,11 @@ DGDIR?=/usr/share/pve-doc-generator
 
 all:
 
 
 all:
 

+PVE_COMMON_DOC_SOURCES=                        \
+       attributes.txt                  \
+       pve-copyright.adoc              \
+       docinfo.xml
+

 PVE_FIREWALL_MAN8_SOURCES=             \
        pve-firewall.adoc               \
        pve-firewall.8-synopsis.adoc    \
 PVE_FIREWALL_MAN8_SOURCES=             \
        pve-firewall.adoc               \
        pve-firewall.8-synopsis.adoc    \


@@ -13,8 +18,20 @@ PVE_FIREWALL_MAN8_SOURCES=           \
        pve-firewall-vm-opts.adoc       \
        pve-firewall-rules-opts.adoc    \
        pve-firewall-macros.adoc        \
        pve-firewall-vm-opts.adoc       \
        pve-firewall-rules-opts.adoc    \
        pve-firewall-macros.adoc        \

-       attributes.txt                  \
-       docinfo.xml
+       ${PVE_COMMON_DOC_SOURCES}
+
+PVESM_MAN1_SOURCES=                    \
+       pvesm.adoc                      \
+       pvesm.1-synopsis.adoc           \
+       pve-storage-dir.adoc            \
+       pve-storage-glusterfs.adoc      \
+       pve-storage-iscsi.adoc          \
+       pve-storage-iscsidirect.adoc    \
+       pve-storage-lvm.adoc            \
+       pve-storage-nfs.adoc            \
+       pve-storage-rbd.adoc            \
+       pve-storage-zfspool.adoc        \
+       ${PVE_COMMON_DOC_SOURCES}

 
 attributes.txt docinfo.xml:
        cp ${DGDIR}/$@ $@.tmp
 
 attributes.txt docinfo.xml:
        cp ${DGDIR}/$@ $@.tmp


@@ -44,6 +61,10 @@ pve-firewall.8: ${PVE_FIREWALL_MAN8_SOURCES}
        a2x -a docinfo1 -a "manvolnum=8" -a "manversion=Release ${DOCRELEASE}" -f manpage pve-firewall.adoc
        test -n "$${NOVIEW}" || man -l $@
 
        a2x -a docinfo1 -a "manvolnum=8" -a "manversion=Release ${DOCRELEASE}" -f manpage pve-firewall.adoc
        test -n "$${NOVIEW}" || man -l $@
 

+pvesm.1: ${PVESM_MAN1_SOURCES}
+       a2x -a docinfo1 -a "manvolnum=1" -a "manversion=Release ${DOCRELEASE}" -f manpage pvesm.adoc
+       test -n "$${NOVIEW}" || man -l $@
+

 
 .PHONY: cleanup-docgen
 cleanup-docgen:
 
 .PHONY: cleanup-docgen
 cleanup-docgen: