fence config parser: early return on ignored devices

[pve-ha-manager.git] / Makefile

diff --git a/Makefile b/Makefile
index 5e39f4b0e3040129adcdf1159c1b42824f78bc2c..89fa8a486c01dee0d181ffb1ae513d7fd6ddf05c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,9 @@
 VERSION=2.0
 PACKAGE=pve-ha-manager
 SIMPACKAGE=pve-ha-simulator
-PKGREL=3
+PKGREL=6
 
-GITVERSION:=$(shell cat .git/refs/heads/master)
+GITVERSION:=$(shell git rev-parse HEAD)
 
 ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
 
@@ -11,41 +11,28 @@ DEB=${PACKAGE}_${VERSION}-${PKGREL}_${ARCH}.deb
 SIMDEB=${SIMPACKAGE}_${VERSION}-${PKGREL}_all.deb
 
 
-all: ${DEB} ${SIMDEB}
+all: deb
 
-.PHONY: dinstall simdeb
+.PHONY: dinstall
 dinstall: $(DEB) $(SIMDEB)
        dpkg -i ${DEB} ${SIMDEB}
 
-
-.PHONY: simdeb
-simdeb: ${SIMDEB}
-${SIMDEB}:
-       rm -rf build
-       mkdir build
-       rsync -a src/ build
-       rsync -a simdebian/ build/debian
-       cp changelog.Debian build/debian/changelog
-       echo "git clone git://git.proxmox.com/git/pve-ha-manager.git\\ngit checkout ${GITVERSION}" > build/debian/SOURCE
-       cd build; dpkg-buildpackage -rfakeroot -b -us -uc
-       lintian ${SIMDEB}
-
 .PHONY: deb
-deb: ${DEB}
+deb: ${DEB} ${SIMDEB}
 ${DEB}:
        rm -rf build
        mkdir build
        rsync -a src/ build
        rsync -a debian/ build/debian
-       cp changelog.Debian build/debian/changelog
        echo "git clone git://git.proxmox.com/git/pve-ha-manager.git\\ngit checkout ${GITVERSION}" > build/debian/SOURCE
-       cd build; dpkg-buildpackage -rfakeroot -b -us -uc
+       cd build; dpkg-buildpackage -b -us -uc
        lintian ${DEB}
+       lintian ${SIMDEB}
 
 .PHONY: clean
 clean:
        make -C src clean
-       rm -rf build *.deb ${PACKAGE}-*.tar.gz *.changes 
+       rm -rf build *.deb ${PACKAGE}-*.tar.gz *.changes *.buildinfo
        find . -name '*~' -exec rm {} ';'
 
 .PHONY: distclean