From d174283d1f3f31c596fb4b3e521762b8e14b998b Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Tue, 23 May 2023 13:16:30 +0200 Subject: [PATCH] makefile: convert to use simple parenthesis Signed-off-by: Thomas Lamprecht --- Makefile | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/Makefile b/Makefile index 7ea47ec..b904fe7 100644 --- a/Makefile +++ b/Makefile @@ -4,20 +4,20 @@ include /usr/share/dpkg/architecture.mk PACKAGE=pve-xtermjs CRATENAME=termproxy -export VERSION=${DEB_VERSION_UPSTREAM_REVISION} +export VERSION=$(DEB_VERSION_UPSTREAM_REVISION) XTERMJSVER=4.16.0 -XTERMJSTGZ=xterm-${XTERMJSVER}.tgz +XTERMJSTGZ=xterm-$(XTERMJSVER).tgz FITADDONVER=0.5.0 -FITADDONTGZ=xterm-addon-fit-${FITADDONVER}.tgz +FITADDONTGZ=xterm-addon-fit-$(FITADDONVER).tgz SRCDIR=src GITVERSION:=$(shell git rev-parse HEAD) -DEB=${PACKAGE}_${DEB_VERSION_UPSTREAM_REVISION}_${DEB_BUILD_ARCH}.deb -DBG_DEB=${PACKAGE}-dbgsym_${DEB_VERSION_UPSTREAM_REVISION}_${DEB_BUILD_ARCH}.deb -DSC=rust-${CRATENAME}_${DEB_VERSION_UPSTREAM_REVISION}.dsc +DEB=$(PACKAGE)_$(DEB_VERSION_UPSTREAM_REVISION)_$(DEB_BUILD_ARCH).deb +DBG_DEB=$(PACKAGE)-dbgsym_$(DEB_VERSION_UPSTREAM_REVISION)_$(DEB_BUILD_ARCH).deb +DSC=rust-$(CRATENAME)_$(DEB_VERSION_UPSTREAM_REVISION).dsc ifeq ($(BUILD_MODE), release) CARGO_BUILD_ARGS += --release @@ -50,44 +50,44 @@ build: rm build/Cargo.lock find build/debian -name "*.hint" -delete cp build/debian/control debian/control - echo "git clone git://git.proxmox.com/git/pve-xtermjs.git\\ngit checkout ${GITVERSION}" > build/debian/SOURCE + echo "git clone git://git.proxmox.com/git/pve-xtermjs.git\\ngit checkout $(GITVERSION)" > build/debian/SOURCE .PHONY: deb -deb: ${DEB} -${DEB} ${DBG_DEB}: build +deb: $(DEB) +$(DEB) $(DBG_DEB): build cd build; dpkg-buildpackage -b -uc -us --no-pre-clean - lintian ${DEB} - @echo ${DEB} + lintian $(DEB) + @echo $(DEB) .PHONY: dsc -dsc: ${DSC} +dsc: $(DSC) $(DSC): build cd build; dpkg-buildpackage -S -us -uc -d -nc - lintian ${DSC} + lintian $(DSC) X_EXCLUSIONS=--exclude=addons/attach --exclude=addons/fullscreen --exclude=addons/search \ --exclude=addons/terminado --exclude=addons/webLinks --exclude=addons/zmodem .PHONY: download download: - wget https://registry.npmjs.org/xterm/-/${XTERMJSTGZ} -O ${XTERMJSTGZ}.tmp - wget https://registry.npmjs.org/xterm-addon-fit/-/${FITADDONTGZ} -O ${FITADDONTGZ}.tmp - mv ${XTERMJSTGZ}.tmp ${XTERMJSTGZ} - mv ${FITADDONTGZ}.tmp ${FITADDONTGZ} - tar -C $(SRCDIR)/www -xf ${XTERMJSTGZ} package/lib package/css --strip-components=2 ${X_EXCLUSIONS} - tar -C $(SRCDIR)/www -xf ${FITADDONTGZ} package/lib --strip-components=2 ${X_EXCLUSIONS} - rm ${XTERMJSTGZ} ${FITADDONTGZ} + wget https://registry.npmjs.org/xterm/-/$(XTERMJSTGZ) -O $(XTERMJSTGZ).tmp + wget https://registry.npmjs.org/xterm-addon-fit/-/$(FITADDONTGZ) -O $(FITADDONTGZ).tmp + mv $(XTERMJSTGZ).tmp $(XTERMJSTGZ) + mv $(FITADDONTGZ).tmp $(FITADDONTGZ) + tar -C $(SRCDIR)/www -xf $(XTERMJSTGZ) package/lib package/css --strip-components=2 $(X_EXCLUSIONS) + tar -C $(SRCDIR)/www -xf $(FITADDONTGZ) package/lib --strip-components=2 $(X_EXCLUSIONS) + rm $(XTERMJSTGZ) $(FITADDONTGZ) .PHONY: upload -upload: ${DEB} ${DBG_DEB} - tar cf - ${DEB} ${DBG_DEB} |ssh -X repoman@repo.proxmox.com -- upload --product pmg,pve,pbs --dist bullseye +upload: $(DEB) $(DBG_DEB) + tar cf - $(DEB) $(DBG_DEB) |ssh -X repoman@repo.proxmox.com -- upload --product pmg,pve,pbs --dist bullseye .PHONY: distclean distclean: clean .PHONY: clean clean: - rm -rf *~ debian/*~ ${PACKAGE}-*/ build/ *.deb *.changes *.dsc *.tar.?z *.buildinfo + rm -rf *~ debian/*~ $(PACKAGE)-*/ build/ *.deb *.changes *.dsc *.tar.?z *.buildinfo .PHONY: dinstall dinstall: deb - dpkg -i ${DEB} + dpkg -i $(DEB) -- 2.39.2