From 5d223aa31ddca5b2f33d8d36efed44923dc10ff4 Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Mon, 22 May 2023 14:39:25 +0200 Subject: [PATCH] makefile: convert to use simple parenthesis Signed-off-by: Thomas Lamprecht --- Makefile | 34 ++++++++++++++++---------------- src/Makefile | 36 +++++++++++++++++----------------- src/PVE/API2/Firewall/Makefile | 6 +++--- src/PVE/API2/Makefile | 4 ++-- src/PVE/Firewall/Makefile | 8 ++++---- src/PVE/Makefile | 6 +++--- src/PVE/Service/Makefile | 8 ++++---- 7 files changed, 51 insertions(+), 51 deletions(-) diff --git a/Makefile b/Makefile index c5a6158..d83dff0 100644 --- a/Makefile +++ b/Makefile @@ -3,12 +3,12 @@ include /usr/share/dpkg/architecture.mk PACKAGE=pve-firewall -BUILDDIR ?= ${PACKAGE}-${DEB_VERSION_UPSTREAM} +BUILDDIR ?= $(PACKAGE)-$(DEB_VERSION_UPSTREAM) GITVERSION:=$(shell git rev-parse HEAD) -DEB=${PACKAGE}_${DEB_VERSION_UPSTREAM_REVISION}_${DEB_BUILD_ARCH}.deb -DSC=${PACKAGE}_${DEB_VERSION_UPSTREAM_REVISION}.dsc -DEB2=${PACKAGE}-dbgsym_${DEB_VERSION_UPSTREAM_REVISION}_${DEB_BUILD_ARCH}.deb +DEB=$(PACKAGE)_$(DEB_VERSION_UPSTREAM_REVISION)_$(DEB_BUILD_ARCH).deb +DSC=$(PACKAGE)_$(DEB_VERSION_UPSTREAM_REVISION).dsc +DEB2=$(PACKAGE)-dbgsym_$(DEB_VERSION_UPSTREAM_REVISION)_$(DEB_BUILD_ARCH).deb DEBS=$(DEB) $(DEB2) all: $(DEBS) @@ -17,23 +17,23 @@ all: $(DEBS) dinstall: deb dpkg -i $(DEBS) -${BUILDDIR}: - rm -rf ${BUILDDIR} - rsync -a src/ debian ${BUILDDIR} - echo "git clone git://git.proxmox.com/git/pve-firewall.git\\ngit checkout ${GITVERSION}" > ${BUILDDIR}/debian/SOURCE +$(BUILDDIR): + rm -rf $(BUILDDIR) + rsync -a src/ debian $(BUILDDIR) + echo "git clone git://git.proxmox.com/git/pve-firewall.git\\ngit checkout $(GITVERSION)" > $(BUILDDIR)/debian/SOURCE .PHONY: deb deb: $(DEBS) $(DEB2): $(DEB) -$(DEB): ${BUILDDIR} check - cd ${BUILDDIR}; dpkg-buildpackage -b -us -uc - lintian ${DEBS} +$(DEB): $(BUILDDIR) check + 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: check check: @@ -44,8 +44,8 @@ distclean: clean clean: make -C src clean make -C test clean - rm -rf *~ debian/*~ example/*~ *.deb *.changes *.buildinfo ${BUILDDIR} ${PACKAGE}*.tar.gz *.dsc + rm -rf *~ debian/*~ example/*~ *.deb *.changes *.buildinfo $(BUILDDIR) $(PACKAGE)*.tar.gz *.dsc .PHONY: upload upload: $(DEBS) - tar cf - $(DEBS) | ssh repoman@repo.proxmox.com -- upload --product pve --dist bullseye --arch ${DEB_BUILD_ARCH} + tar cf - $(DEBS) | ssh repoman@repo.proxmox.com -- upload --product pve --dist bullseye --arch $(DEB_BUILD_ARCH) diff --git a/src/Makefile b/src/Makefile index 7b654a1..aaece5a 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,13 +1,13 @@ DESTDIR= PREFIX= /usr -BINDIR=${DESTDIR}/${PREFIX}/bin -SBINDIR=${DESTDIR}/${PREFIX}/sbin -MANDIR=${DESTDIR}/${PREFIX}/share/man -DOCDIR=${DESTDIR}/${PREFIX}/share/doc/pve-firewall -MAN1DIR=${MANDIR}/man1/ -MAN8DIR=${MANDIR}/man8/ -BASHCOMPLDIR=${DESTDIR}/${PREFIX}/share/bash-completion/completions -ZSHCOMPLDIR=${DESTDIR}/${PREFIX}/share/zsh/vendor-completions +BINDIR=$(DESTDIR)/$(PREFIX)/bin +SBINDIR=$(DESTDIR)/$(PREFIX)/sbin +MANDIR=$(DESTDIR)/$(PREFIX)/share/man +DOCDIR=$(DESTDIR)/$(PREFIX)/share/doc/pve-firewall +MAN1DIR=$(MANDIR)/man1/ +MAN8DIR=$(MANDIR)/man8/ +BASHCOMPLDIR=$(DESTDIR)/$(PREFIX)/share/bash-completion/completions +ZSHCOMPLDIR=$(DESTDIR)/$(PREFIX)/share/zsh/vendor-completions -include /usr/share/pve-doc-generator/pve-doc-generator.mk @@ -31,20 +31,20 @@ pvefw-logger: pvefw-logger.c .PHONY: install install: pve-firewall pve-firewall.8 pve-firewall.bash-completion pve-firewall.zsh-completion pvefw-logger make -C PVE install - install -d -m 0755 ${SBINDIR} - install -m 0755 pve-firewall ${SBINDIR} - install -m 0755 pvefw-logger ${SBINDIR} - install -d ${MAN8DIR} - install -m 0644 pve-firewall.8 ${MAN8DIR} - install -m 0644 -D pve-firewall.bash-completion ${BASHCOMPLDIR}/pve-firewall - install -m 0644 -D pve-firewall.zsh-completion ${ZSHCOMPLDIR}/_pve-firewall - install -d -m 0755 ${DESTDIR}/usr/lib/sysctl.d/ - install -m 0644 pve-firewall-sysctl.conf ${DESTDIR}/usr/lib/sysctl.d/pve-firewall.conf + install -d -m 0755 $(SBINDIR) + install -m 0755 pve-firewall $(SBINDIR) + install -m 0755 pvefw-logger $(SBINDIR) + install -d $(MAN8DIR) + install -m 0644 pve-firewall.8 $(MAN8DIR) + install -m 0644 -D pve-firewall.bash-completion $(BASHCOMPLDIR)/pve-firewall + install -m 0644 -D pve-firewall.zsh-completion $(ZSHCOMPLDIR)/_pve-firewall + install -d -m 0755 $(DESTDIR)/usr/lib/sysctl.d/ + install -m 0644 pve-firewall-sysctl.conf $(DESTDIR)/usr/lib/sysctl.d/pve-firewall.conf .PHONY: clean clean: make -C PVE clean - rm -f *.xml.tmp *.1 *.5 *.8 *(synopsis,opts).adoc docinfo.xml *~ + rm -f *.xml.tmp *.1 *.5 *.8 *{synopsis,opts}.adoc docinfo.xml *~ rm -rf pvefw-logger diff --git a/src/PVE/API2/Firewall/Makefile b/src/PVE/API2/Firewall/Makefile index 7b2c345..e916755 100644 --- a/src/PVE/API2/Firewall/Makefile +++ b/src/PVE/API2/Firewall/Makefile @@ -1,6 +1,6 @@ DESTDIR= PREFIX=/usr -PERLDIR=${DESTDIR}/${PREFIX}/share/perl5 +PERLDIR=$(DESTDIR)/$(PREFIX)/share/perl5 LIB_SOURCES= \ Aliases.pm \ @@ -15,8 +15,8 @@ all: .PHONY: install install: - install -d -m 0755 ${PERLDIR}/PVE/API2/Firewall - for i in ${LIB_SOURCES}; do install -D -m 0644 $$i ${PERLDIR}/PVE/API2/Firewall/$$i; done + install -d -m 0755 $(PERLDIR)/PVE/API2/Firewall + for i in $(LIB_SOURCES); do install -D -m 0644 $$i $(PERLDIR)/PVE/API2/Firewall/$$i; done .PHONY: clean diff --git a/src/PVE/API2/Makefile b/src/PVE/API2/Makefile index 3c8f956..194b8ea 100644 --- a/src/PVE/API2/Makefile +++ b/src/PVE/API2/Makefile @@ -1,12 +1,12 @@ DESTDIR= PREFIX=/usr -PERLDIR=${DESTDIR}/${PREFIX}/share/perl5 +PERLDIR=$(DESTDIR)/$(PREFIX)/share/perl5 all: .PHONY: install install: - install -d -m 0755 ${PERLDIR}/PVE/API2 + install -d -m 0755 $(PERLDIR)/PVE/API2 make -C Firewall install .PHONY: clean diff --git a/src/PVE/Firewall/Makefile b/src/PVE/Firewall/Makefile index 1707cb5..3274bc6 100644 --- a/src/PVE/Firewall/Makefile +++ b/src/PVE/Firewall/Makefile @@ -1,12 +1,12 @@ DESTDIR= PREFIX=/usr -PERLDIR=${DESTDIR}/${PREFIX}/share/perl5 +PERLDIR=$(DESTDIR)/$(PREFIX)/share/perl5 SOURCES=Helpers.pm .PHONY: install -install: ${SOURCES} - install -d -m 0755 ${PERLDIR}/PVE/Firewall - for i in ${SOURCES}; do install -D -m 0644 $$i ${PERLDIR}/PVE/Firewall/$$i; done +install: $(SOURCES) + install -d -m 0755 $(PERLDIR)/PVE/Firewall + for i in $(SOURCES); do install -D -m 0644 $$i $(PERLDIR)/PVE/Firewall/$$i; done clean: diff --git a/src/PVE/Makefile b/src/PVE/Makefile index 4edde9e..2657086 100644 --- a/src/PVE/Makefile +++ b/src/PVE/Makefile @@ -1,6 +1,6 @@ DESTDIR= PREFIX= /usr -PERLDIR=${DESTDIR}/${PREFIX}/share/perl5 +PERLDIR=$(DESTDIR)/$(PREFIX)/share/perl5 LIB_SOURCES= \ FirewallSimulator.pm \ @@ -10,8 +10,8 @@ all: .PHONY: install install: - install -d -m 0755 ${PERLDIR}/PVE - for i in ${LIB_SOURCES}; do install -D -m 0644 $$i ${PERLDIR}/PVE/$$i; done + install -d -m 0755 $(PERLDIR)/PVE + for i in $(LIB_SOURCES); do install -D -m 0644 $$i $(PERLDIR)/PVE/$$i; done make -C API2 install make -C Service install make -C Firewall install diff --git a/src/PVE/Service/Makefile b/src/PVE/Service/Makefile index 423f322..e1bee4a 100644 --- a/src/PVE/Service/Makefile +++ b/src/PVE/Service/Makefile @@ -1,12 +1,12 @@ DESTDIR= PREFIX=/usr -PERLDIR=${DESTDIR}/${PREFIX}/share/perl5 +PERLDIR=$(DESTDIR)/$(PREFIX)/share/perl5 SOURCES=pve_firewall.pm .PHONY: install -install: ${SOURCES} - install -d -m 0755 ${PERLDIR}/PVE/Service - for i in ${SOURCES}; do install -D -m 0644 $$i ${PERLDIR}/PVE/Service/$$i; done +install: $(SOURCES) + install -d -m 0755 $(PERLDIR)/PVE/Service + for i in $(SOURCES); do install -D -m 0644 $$i $(PERLDIR)/PVE/Service/$$i; done clean: -- 2.39.2