From 9a6cbb2614ef84ece3b637db4af3add6ce75491f Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Sat, 6 May 2023 17:00:07 +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 9591e35..b4d8a33 100644 --- a/Makefile +++ b/Makefile @@ -3,54 +3,54 @@ include /usr/share/dpkg/pkg-info.mk PACKAGE=novnc-pve SRCDIR=novnc -BUILDDIR=${SRCDIR}.tmp +BUILDDIR=$(SRCDIR).tmp GITVERSION:=$(shell git rev-parse HEAD) -DEB=${PACKAGE}_${DEB_VERSION_UPSTREAM_REVISION}_all.deb -DSC=${PACKAGE}_${DEB_VERSION_UPSTREAM_REVISION}.dsc +DEB=$(PACKAGE)_$(DEB_VERSION_UPSTREAM_REVISION)_all.deb +DSC=$(PACKAGE)_$(DEB_VERSION_UPSTREAM_REVISION).dsc all: -${SRCDIR}/vnc.html: submodule -${BUILDDIR}: $(SRCDIR)/vnc.html - rm -rf ${BUILDDIR} - cp -rpa ${SRCDIR} ${BUILDDIR} - cp -a debian ${BUILDDIR} - echo "git clone git://git.proxmox.com/git/novnc-pve.git\\ngit checkout ${GITVERSION}" > ${BUILDDIR}/debian/SOURCE +$(SRCDIR)/vnc.html: submodule +$(BUILDDIR): $(SRCDIR)/vnc.html + rm -rf $(BUILDDIR) + cp -rpa $(SRCDIR) $(BUILDDIR) + cp -a debian $(BUILDDIR) + echo "git clone git://git.proxmox.com/git/novnc-pve.git\\ngit checkout $(GITVERSION)" > $(BUILDDIR)/debian/SOURCE .PHONY: deb -deb: ${DEB} -${DEB}: ${BUILDDIR} - cd ${BUILDDIR}; dpkg-buildpackage -b -uc -us - lintian ${DEB} - @echo ${DEB} +deb: $(DEB) +$(DEB): $(BUILDDIR) + cd $(BUILDDIR); dpkg-buildpackage -b -uc -us + lintian $(DEB) + @echo $(DEB) .PHONY: dsc -dsc: ${DSC} -${DSC}: ${BUILDDIR} - cd ${BUILDDIR}; dpkg-buildpackage -S -uc -us -d - lintian ${DSC} +dsc: $(DSC) +$(DSC): $(BUILDDIR) + cd $(BUILDDIR); dpkg-buildpackage -S -uc -us -d + lintian $(DSC) .PHONY: submodule submodule: - test -f "${SRCDIR}/package.json" || git submodule update --init + test -f "$(SRCDIR)/package.json" || git submodule update --init .PHONY: download -download ${SRCDIR}: +download $(SRCDIR): git submodule foreach 'git pull --ff-only origin master' .PHONY: upload -upload: ${DEB} - tar cf - ${DEB}|ssh -X repoman@repo.proxmox.com -- upload --product pmg,pve --dist bullseye +upload: $(DEB) + tar cf - $(DEB)|ssh -X repoman@repo.proxmox.com -- upload --product pmg,pve --dist bullseye .PHONY: distclean distclean: clean .PHONY: clean clean: - rm -rf *~ debian/*~ *.deb ${BUILDDIR} *.changes *.dsc *.buildinfo ${PACKAGE}*.tar.gz + rm -rf *~ debian/*~ *.deb $(BUILDDIR) *.changes *.dsc *.buildinfo $(PACKAGE)*.tar.gz .PHONY: dinstall dinstall: deb - dpkg -i ${DEB} + dpkg -i $(DEB) -- 2.39.2