accept-phase: fix conn_count "leak"

[pve-http-server.git] / Makefile

diff --git a/Makefile b/Makefile
index 9c838075256510122e4f102c855f97f28a3ec45d..3d6f7396d49e57ebd2041e0f7d741edbdce12bc2 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,4 @@
 include /usr/share/dpkg/pkg-info.mk
-include /usr/share/dpkg/architecture.mk
 
 PACKAGE=libpve-http-server-perl
 
@@ -13,25 +12,6 @@ DESTDIR=
 PERL5DIR=${DESTDIR}/usr/share/perl5
 DOCDIR=${DESTDIR}/usr/share/doc/${PACKAGE}
 
-WWWBASEDIR=${DESTDIR}/usr/share/${PACKAGE}
-WWWCSSDIR=${WWWBASEDIR}/css
-WWWFONTSDIR=${WWWBASEDIR}/fonts
-WWWJSDIR=${WWWBASEDIR}/js
-
-# bootstrap library
-BTVER=3.4.1
-BTDIR=bootstrap-${BTVER}-dist
-BTSRC=${BTDIR}.zip
-
-BTDATA =                                                       \
-       ${BTDIR}/css/bootstrap.min.css                          \
-       ${BTDIR}/css/bootstrap-theme.min.css                    \
-       ${BTDIR}/js/bootstrap.min.js                            \
-       ${BTDIR}/fonts/glyphicons-halflings-regular.ttf
-
-JQVER=3.4.1
-JQSRC=jquery-${JQVER}.min.js
-
 all:
 
 .PHONY: deb
@@ -43,22 +23,7 @@ ${DEB}:
        cd ${BUILDDIR}; dpkg-buildpackage -b -us -uc
        lintian ${DEB}
 
-download_bootstrap:
-       rm -f ${BTSRC}$ ${BTSRC}.tmp
-       wget https://github.com/twbs/bootstrap/releases/download/v${BTVER}/${BTSRC} -O ${BTSRC}.tmp
-       mv ${BTSRC}.tmp ${BTSRC}
-
-download_jquery:
-       rm -f ${JQSRC} ${JQSRC}.tmp
-       wget https://code.jquery.com/jquery-${JQVER}.min.js -O ${JQSRC}.tmp
-       mv ${JQSRC}.tmp ${JQSRC}
-
-${BTDATA}: ${BTDIR}
-${BTDIR}: ${BTSRC}
-       rm -rf ${BTDIR}
-       unzip -x ${BTSRC}
-
-install: ${BTDATA}
+install: PVE
        install -d -m 755 ${PERL5DIR}/PVE/APIServer
        install -m 0644 PVE/APIServer/AnyEvent.pm ${PERL5DIR}/PVE/APIServer
        install -m 0644 PVE/APIServer/Formatter.pm ${PERL5DIR}/PVE/APIServer
@@ -67,27 +32,17 @@ install: ${BTDATA}
        install -m 0644 PVE/APIServer/Formatter/Standard.pm ${PERL5DIR}/PVE/APIServer/Formatter
        install -m 0644 PVE/APIServer/Formatter/Bootstrap.pm ${PERL5DIR}/PVE/APIServer/Formatter
        install -m 0644 PVE/APIServer/Formatter/HTML.pm ${PERL5DIR}/PVE/APIServer/Formatter
-       # install bootstrap and jquery
-       install -d -m 755 ${WWWBASEDIR}
-       install -d -m 755 ${WWWCSSDIR}
-       install -m 0644 -o www-data -g www-data ${BTDIR}/css/bootstrap.min.css ${WWWCSSDIR}
-       install -m 0644 -o www-data -g www-data ${BTDIR}/css/bootstrap-theme.min.css ${WWWCSSDIR}
-       install -d -m 755 ${WWWJSDIR}
-       install -m 0644 -o www-data -g www-data ${BTDIR}/js/bootstrap.min.js ${WWWJSDIR}
-       install -m 0644 -o www-data -g www-data ${JQSRC} ${WWWJSDIR}
-       install -d -m 755 ${WWWFONTSDIR}
-       install -m 0644 ${BTDIR}/fonts/glyphicons-halflings-regular.ttf ${WWWFONTSDIR}
-
 
 .PHONY: upload
 upload: ${DEB}
-       tar cf - ${DEB} | ssh -X repoman@repo.proxmox.com -- upload --product pve,pmg --dist stretch
+       tar cf - ${DEB} | ssh -X repoman@repo.proxmox.com -- upload --product pve,pmg --dist buster
 
+.PHONY: clean distclean
 distclean: clean
        rm -f examples/simple-demo.pem
 
 clean:
-       rm -rf ./build *.deb *.changes *.buildinfo ${BTDIR} examples/simple-demo.lck
+       rm -rf ${PACKAGE}-*/ *.deb *.changes *.buildinfo ${BTDIR} examples/simple-demo.lck
        find . -name '*~' -exec rm {} ';'
 
 .PHONY: dinstall