ui: network: add columns for vlan-id and vlan-raw-device

[proxmox-widget-toolkit.git] / Makefile

diff --git a/Makefile b/Makefile
index f3bd2cf5046d9b07c92245b9261add3850683c11..eacdd010c3555e675179bd21b4c274aba62a5940 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,17 @@
 include /usr/share/dpkg/pkg-info.mk
+export DEB_VERSION_UPSTREAM_REVISION
 
 export PACKAGE=proxmox-widget-toolkit
-BUILDDIR ?= ${PACKAGE}-${DEB_VERSION_UPSTREAM}
+
 DEB=${PACKAGE}_${DEB_VERSION_UPSTREAM_REVISION}_all.deb
+DEV_DEB=${PACKAGE}-dev_${DEB_VERSION_UPSTREAM_REVISION}_all.deb
+
+DEBS=${DEB} ${DEV_DEB}
 DSC=${PACKAGE}_${DEB_VERSION_UPSTREAM_REVISION}.dsc
 
-GITVERSION:=$(shell git rev-parse HEAD)
+BUILDDIR ?= ${PACKAGE}-${DEB_VERSION_UPSTREAM}
 
+${BUILDDIR}: GITVERSION:=$(shell git rev-parse HEAD)
 ${BUILDDIR}:
        rm -rf ${BUILDDIR} ${BUILDDIR}.tmp
        cp -a src/ ${BUILDDIR}.tmp
@@ -15,10 +20,10 @@ ${BUILDDIR}:
        mv ${BUILDDIR}.tmp/ ${BUILDDIR}
 
 .PHONY: deb
-deb: ${DEB}
-${DEB}: ${BUILDDIR}
+deb: ${DEBS}
+${DEBS}: ${BUILDDIR}
        cd ${BUILDDIR}; dpkg-buildpackage -b -us -uc
-       lintian ${DEB}
+       lintian ${DEBS}
 
 .PHONY: dsc
 dsc: ${DSC}
@@ -31,14 +36,16 @@ lint: ${JSSRC}
        ${MAKE} -C src lint
 
 .PHONY: upload
-upload: ${DEB}
-       tar cf - ${DEB} | ssh -X repoman@repo.proxmox.com -- upload --product pve,pmg,pbs --dist buster
+upload: ${DEBS}
+       tar cf - ${DEB} | ssh -X repoman@repo.proxmox.com -- upload --product pve,pmg,pbs --dist bullseye
+       tar cf - ${DEV_DEB} | ssh -X repoman@repo.proxmox.com -- upload --product devel --dist bullseye
 
 distclean: clean
 clean:
+       $(MAKE) -C src clean
        rm -rf ${BUILDDIR} ${BUILDDIR}.tmp *.tar.gz *.dsc *.deb *.changes *.buildinfo
        find . -name '*~' -exec rm {} ';'
 
 .PHONY: dinstall
-dinstall: ${DEB}
-       dpkg -i ${DEB}
+dinstall: ${DEBS}
+       dpkg -i ${DEBS}