X-Git-Url: https://git.proxmox.com/?p=pve-firewall.git;a=blobdiff_plain;f=Makefile;h=cbd841080de9d998bff05165590383560b774bec;hp=7477d96cd26a9d3002d60a8f7fadd69db520bb04;hb=43e338257ce96d04750119dc5ddf1945f4c994e7;hpb=bb272dd311e39cd0d76a01d28c600363e95bc731

diff --git a/Makefile b/Makefile
index 7477d96..cbd8410 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,5 @@
-RELEASE=3.3
-
-VERSION=1.0
-PKGREL=1
+VERSION=2.0
+PKGREL=33
 
 PACKAGE=pve-firewall
 
@@ -13,7 +11,7 @@ DOCDIR=${PREFIX}/share/doc
 MAN1DIR=${MANDIR}/man1/
 PERLDIR=${PREFIX}/share/perl5
 
-ARCH=all
+ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
 GITVERSION:=$(shell cat .git/refs/heads/master)
 
 DEB=${PACKAGE}_${VERSION}-${PKGREL}_${ARCH}.deb
@@ -26,7 +24,8 @@ dinstall: deb
 
 
 .PHONY: deb
-deb ${DEB}: 
+deb: ${DEB}
+${DEB}: check
 	rm -rf build
 	rsync -a src/ build
 	rsync -a debian/ build/debian
@@ -35,9 +34,15 @@ deb ${DEB}:
 	cd build; dpkg-buildpackage -rfakeroot -b -us -uc
 	lintian ${DEB}
 
+.PHONY: check
+check: 
+	make -C test check
+
 .PHONY: clean
 clean: 	
-	rm -rf *~ debian/*~ src/*~ *.deb *.changes build ${PACKAGE}-*.tar.gz
+	make -C src clean
+	make -C test clean
+	rm -rf *~ debian/*~ example/*~ *.deb *.changes build ${PACKAGE}-*.tar.gz
 
 .PHONY: distclean
 distclean: clean
@@ -45,11 +50,4 @@ distclean: clean
 
 .PHONY: upload
 upload: ${DEB}
-	umount /pve/${RELEASE}; mount /pve/${RELEASE} -o rw 
-	mkdir -p /pve/${RELEASE}/extra
-	rm -f /pve/${RELEASE}/extra/${PACKAGE}_*.deb
-	rm -f /pve/${RELEASE}/extra/Packages*
-	cp ${DEB} /pve/${RELEASE}/extra
-	cd /pve/${RELEASE}/extra; dpkg-scanpackages . /dev/null > Packages; gzip -9c Packages > Packages.gz
-	umount /pve/${RELEASE}; mount /pve/${RELEASE} -o ro
-
+	tar cf - ${DEB} | ssh repoman@repo.proxmox.com upload