From c7dca629bb05f2602c29126af19d32c8d405a202 Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Wed, 17 May 2023 11:43:45 +0200 Subject: [PATCH] makefile: convert to use simple parenthesis Signed-off-by: Thomas Lamprecht --- Makefile | 57 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 28 insertions(+), 29 deletions(-) diff --git a/Makefile b/Makefile index eacdd01..cb857b7 100644 --- a/Makefile +++ b/Makefile @@ -3,49 +3,48 @@ export DEB_VERSION_UPSTREAM_REVISION export PACKAGE=proxmox-widget-toolkit -DEB=${PACKAGE}_${DEB_VERSION_UPSTREAM_REVISION}_all.deb -DEV_DEB=${PACKAGE}-dev_${DEB_VERSION_UPSTREAM_REVISION}_all.deb +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 +DEBS=$(DEB) $(DEV_DEB) +DSC=$(PACKAGE)_$(DEB_VERSION_UPSTREAM_REVISION).dsc -BUILDDIR ?= ${PACKAGE}-${DEB_VERSION_UPSTREAM} +BUILDDIR ?= $(PACKAGE)-$(DEB_VERSION_UPSTREAM) -${BUILDDIR}: GITVERSION:=$(shell git rev-parse HEAD) -${BUILDDIR}: - rm -rf ${BUILDDIR} ${BUILDDIR}.tmp - cp -a src/ ${BUILDDIR}.tmp - cp -a debian ${BUILDDIR}.tmp/ - echo "git clone git://git.proxmox.com/git/proxmox-widget-toolkit.git\\ngit checkout ${GITVERSION}" > ${BUILDDIR}.tmp/debian/SOURCE - mv ${BUILDDIR}.tmp/ ${BUILDDIR} +$(BUILDDIR): GITVERSION:=$(shell git rev-parse HEAD) +$(BUILDDIR): + rm -rf $(BUILDDIR) $(BUILDDIR).tmp + cp -a src/ $(BUILDDIR).tmp + cp -a debian $(BUILDDIR).tmp/ + echo "git clone git://git.proxmox.com/git/proxmox-widget-toolkit.git\\ngit checkout $(GITVERSION)" > $(BUILDDIR).tmp/debian/SOURCE + mv $(BUILDDIR).tmp/ $(BUILDDIR) .PHONY: deb -deb: ${DEBS} -${DEBS}: ${BUILDDIR} - cd ${BUILDDIR}; dpkg-buildpackage -b -us -uc - lintian ${DEBS} +deb: $(DEBS) +$(DEBS): $(BUILDDIR) + cd $(BUILDDIR); dpkg-buildpackage -b -us -uc + lintian $(DEBS) .PHONY: dsc -dsc: ${DSC} -${DSC}: ${BUILDDIR} - cd ${BUILDDIR}; dpkg-buildpackage -S -us -uc -d - lintian ${DSC} +dsc: $(DSC) +$(DSC): $(BUILDDIR) + cd $(BUILDDIR); dpkg-buildpackage -S -us -uc -d + lintian $(DSC) .PHONY: lint -lint: ${JSSRC} - ${MAKE} -C src lint +lint: $(JSSRC) + $(MAKE) -C src lint .PHONY: upload -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 +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 {} ';' + rm -rf $(BUILDDIR) $(BUILDDIR).tmp *.tar.gz *.dsc *.deb *.changes *.buildinfo .PHONY: dinstall -dinstall: ${DEBS} - dpkg -i ${DEBS} +dinstall: $(DEBS) + dpkg -i $(DEBS) -- 2.39.2