simplify package build system (single debian dir)

[pve-docs.git] / Makefile

diff --git a/Makefile b/Makefile
index 5dd686269919b6c5f93c5bec17978fbde416337e..206a29e432223155cdc9dc40ff8957a1af55d1b9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -6,14 +6,12 @@ GEN_PACKAGE=pve-doc-generator
 DOC_PACKAGE=pve-docs
 
 # also update debian/changelog
-GEN_PKGREL=1
-# also update doc-debian/changelog
-DOC_PKGREL=2
+PKGREL=5
 
 GITVERSION:=$(shell cat .git/refs/heads/master)
 
-GEN_DEB=${GEN_PACKAGE}_${DOCRELEASE}-${GEN_PKGREL}_amd64.deb
-DOC_DEB=${DOC_PACKAGE}_${DOCRELEASE}-${DOC_PKGREL}_all.deb
+GEN_DEB=${GEN_PACKAGE}_${DOCRELEASE}-${PKGREL}_amd64.deb
+DOC_DEB=${DOC_PACKAGE}_${DOCRELEASE}-${PKGREL}_all.deb
 
 CHAPTER_LIST=          \
        sysadmin        \
@@ -29,6 +27,16 @@ CHAPTER_LIST=                \
        pve-faq         \
        pve-bibliography
 
+STORAGE_TYPES=         \
+       dir             \
+       glusterfs       \
+       iscsi           \
+       iscsidirect     \
+       lvm             \
+       lvmthin         \
+       nfs             \
+       rbd             \
+       zfspool
 
 COMMAND_LIST=          \
        pvesubscription \
@@ -76,6 +84,8 @@ GEN_DEB_SOURCES=                              \
 GEN_SCRIPTS=                                   \
        gen-datacenter.cfg.5-opts.pl            \
        gen-pct.conf.5-opts.pl                  \
+       gen-pct-network-opts.pl                 \
+       gen-pct-mountpoint-opts.pl              \
        gen-qm.conf.5-opts.pl                   \
        gen-vzdump.conf.5-opts.pl               \
        gen-pve-firewall-cluster-opts.pl        \
@@ -130,6 +140,11 @@ PVE_ADMIN_GUIDE_SOURCES=                   \
        GFDL.adoc                               \
        attributes.txt
 
+WIKI_IMPORTS=                                                          \
+       $(addsuffix -plain.html, $(addprefix chapter-, ${CHAPTER_LIST}))\
+       $(addsuffix .5-plain.html, ${CONFIG_LIST})                      \
+       $(addsuffix -plain.html, $(addprefix pve-storage-, ${STORAGE_TYPES}))
+
 INDEX_INCLUDES=                                                                \
        pve-admin-guide.pdf                                             \
        pve-admin-guide.html                                            \
@@ -137,9 +152,7 @@ INDEX_INCLUDES=                                                             \
        $(addsuffix .1.html, ${COMMAND_LIST})                           \
        $(addsuffix .8.html, ${SERVICE_LIST})                           \
        $(addsuffix .5.html, ${CONFIG_LIST})                            \
-       $(addsuffix .html, $(addprefix chapter-, ${CHAPTER_LIST}))      \
-       $(addsuffix -plain.html, $(addprefix chapter-, ${CHAPTER_LIST}))\
-       $(addsuffix .5-plain.html, ${CONFIG_LIST})
+       $(addsuffix .html, $(addprefix chapter-, ${CHAPTER_LIST}))
 
 ADOC_STDARG= -a icons -a data-uri -a "date=$(shell date)" -a "revnumber=${DOCRELEASE}"
 ADOC_MAN1_HTML_ARGS=-a "manvolnum=1" ${ADOC_STDARG}
@@ -157,7 +170,10 @@ chapter-%.html: %.adoc ${PVE_COMMON_DOC_SOURCES}
        asciidoc ${ADOC_STDARG} -a toc -o $@ $*.adoc
 
 chapter-%-plain.html: %.adoc ${PVE_COMMON_DOC_SOURCES}
-       asciidoc -s ${ADOC_STDARG} -o chapter-$*-plain.html $*.adoc
+       asciidoc -s -a wiki ${ADOC_STDARG} -o $@ $*.adoc
+
+pve-storage-%-plain.html: pve-storage-%.adoc ${PVE_COMMON_DOC_SOURCES}
+       asciidoc -s -a wiki -a 'leveloffset=-1' ${ADOC_STDARG} -o $@ pve-storage-$*.adoc
 
 %.1.html: %.adoc %.1-synopsis.adoc ${PVE_COMMON_DOC_SOURCES}
        asciidoc ${ADOC_MAN1_HTML_ARGS} -o $@ $*.adoc
@@ -211,32 +227,28 @@ deb:
        make ${GEN_DEB};
        make ${DOC_DEB};
 
-${DOC_DEB}: index.html ${INDEX_INCLUDES} ${API_VIEWER_SOURCES}
-       rm -rf build
-       mkdir build
-       rsync -a doc-debian/ build/debian
-       mkdir -p build/usr/share/${DOC_PACKAGE}
-       mkdir -p build/usr/share/doc/${DOC_PACKAGE}
-       echo "git clone git://git.proxmox.com/git/pve-docs.git\\ngit checkout ${GITVERSION}" > build/usr/share/doc/${DOC_PACKAGE}/SOURCE
-       # install doc files
-       install -m 0644 ${INDEX_INCLUDES} build/usr/share/${DOC_PACKAGE}
-       # install api doc viewer
-       mkdir build/usr/share/${DOC_PACKAGE}/api-viewer
-       install -m 0644 ${API_VIEWER_SOURCES} build/usr/share/${DOC_PACKAGE}/api-viewer
-       cd build; dpkg-buildpackage -rfakeroot -b -us -uc
-       lintian ${DOC_DEB}
-
-${GEN_DEB}: ${GEN_DEB_SOURCES}
+${GEN_DEB} ${DOC_DEB}: index.html ${INDEX_INCLUDES} ${WIKI_IMPORTS} ${API_VIEWER_SOURCES} ${GEN_DEB_SOURCES}
        rm -rf build
        mkdir build
        rsync -a debian/ build/debian
+       echo "git clone git://git.proxmox.com/git/pve-docs.git\\ngit checkout ${GITVERSION}" > build/debian/SOURCE
+       # install files for pve-doc-generator package
        mkdir -p build/usr/share/${GEN_PACKAGE}
        mkdir -p build/usr/share/doc/${GEN_PACKAGE}
-       echo "git clone git://git.proxmox.com/git/pve-docs.git\\ngit checkout ${GITVERSION}" > build/usr/share/doc/${GEN_PACKAGE}/SOURCE
        install -m 0644 ${GEN_DEB_SOURCES} build/usr/share/${GEN_PACKAGE}
        install -m 0755 ${GEN_SCRIPTS} build/usr/share/${GEN_PACKAGE}
+       # install files for pvedocs package
+       mkdir -p build/usr/share/${DOC_PACKAGE}
+       mkdir -p build/usr/share/doc/${DOC_PACKAGE}
+       install -m 0644 index.html ${INDEX_INCLUDES} build/usr/share/${DOC_PACKAGE}
+       install -m 0644 ${WIKI_IMPORTS} build/usr/share/${DOC_PACKAGE}
+       # install api doc viewer
+       mkdir build/usr/share/${DOC_PACKAGE}/api-viewer
+       install -m 0644 ${API_VIEWER_SOURCES} build/usr/share/${DOC_PACKAGE}/api-viewer
+       # build debain package
        cd build; dpkg-buildpackage -rfakeroot -b -us -uc
        lintian ${GEN_DEB}
+       lintian ${DOC_DEB}
 
 .PHONY: upload
 upload: ${GEN_DEB} ${DOC_DEB}
@@ -253,7 +265,7 @@ upload: ${GEN_DEB} ${DOC_DEB}
 update: clean
        rm -f *.5-opts.adoc *.1-synopsis.adoc *.8-synopsis.adoc
        rm -f api-viewer/apidata.js
-       rm -f pve-firewall-macros.adoc
+       rm -f pve-firewall-macros.adoc pct-network-opts.adoc pct-mountpoint-opts.adoc
        make all
 
 clean: