buildsys: makefiles convert to use simple parenthesis

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>

diff --git a/Makefile b/Makefile
index e0b11a0d92191485b31ecb80aaadd013fd166ba7..2cdf22e6850514b1d66a0f4d6ef613c5ee8a63a1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,14 +2,14 @@ include /usr/share/dpkg/pkg-info.mk
 
 PACKAGE=pmg-gui
 
-DEB=${PACKAGE}_${DEB_VERSION_UPSTREAM_REVISION}_all.deb
+DEB=$(PACKAGE)_$(DEB_VERSION_UPSTREAM_REVISION)_all.deb
 
 DESTDIR=
-DOCDIR=${DESTDIR}/usr/share/doc/${PACKAGE}
-WWWBASEDIR=${DESTDIR}/usr/share/javascript/${PACKAGE}
-WWWCSSDIR=${WWWBASEDIR}/css
-WWWIMAGESDIR=${WWWBASEDIR}/images
-WWWJSDIR=${WWWBASEDIR}/js
+DOCDIR=$(DESTDIR)/usr/share/doc/$(PACKAGE)
+WWWBASEDIR=$(DESTDIR)/usr/share/javascript/$(PACKAGE)
+WWWCSSDIR=$(WWWBASEDIR)/css
+WWWIMAGESDIR=$(WWWBASEDIR)/images
+WWWJSDIR=$(WWWBASEDIR)/js
 
 IMAGES=                                \
        images/logo-128.png             \
@@ -22,11 +22,11 @@ export DEB_VERSION_UPSTREAM_REVISION
 all:
 
 .PHONY: deb
-deb ${DEB}:
+deb $(DEB):
        rm -rf build
        rsync -a * build
        cd build; dpkg-buildpackage -b -us -uc
-       lintian ${DEB}
+       lintian $(DEB)
 
 .PHONY: js/pmgmanagerlib.js js/mobile/pmgmanagerlib-mobile.js
 js/pmgmanagerlib.js:
@@ -34,21 +34,21 @@ js/pmgmanagerlib.js:
 js/mobile/pmgmanagerlib-mobile.js:
        make -C js/mobile pmgmanagerlib-mobile.js
 
-install: pmg-index.html.tt pmg-mobile-index.html.tt js/pmgmanagerlib.js js/mobile/pmgmanagerlib-mobile.js ${IMAGES} ${CSSFILES}
-       install -d -m 755 ${WWWBASEDIR}
-       install -d -m 755 ${WWWCSSDIR}
-       install -d -m 755 ${WWWIMAGESDIR}
-       install -d -m 755 ${WWWJSDIR}
-       install -m 0644 pmg-index.html.tt ${WWWBASEDIR}
-       install -m 0644 pmg-mobile-index.html.tt ${WWWBASEDIR}
-       install -m 0644 js/pmgmanagerlib.js ${WWWJSDIR}
-       install -m 0644 js/mobile/pmgmanagerlib-mobile.js ${WWWJSDIR}
-       for f in ${IMAGES}; do install -m 0644 "$$f" ${WWWIMAGESDIR}; done
-       for f in ${CSSFILES}; do install -m 0644 "$$f" ${WWWCSSDIR}; done
+install: pmg-index.html.tt pmg-mobile-index.html.tt js/pmgmanagerlib.js js/mobile/pmgmanagerlib-mobile.js $(IMAGES) $(CSSFILES)
+       install -d -m 755 $(WWWBASEDIR)
+       install -d -m 755 $(WWWCSSDIR)
+       install -d -m 755 $(WWWIMAGESDIR)
+       install -d -m 755 $(WWWJSDIR)
+       install -m 0644 pmg-index.html.tt $(WWWBASEDIR)
+       install -m 0644 pmg-mobile-index.html.tt $(WWWBASEDIR)
+       install -m 0644 js/pmgmanagerlib.js $(WWWJSDIR)
+       install -m 0644 js/mobile/pmgmanagerlib-mobile.js $(WWWJSDIR)
+       for f in $(IMAGES); do install -m 0644 "$$f" $(WWWIMAGESDIR); done
+       for f in $(CSSFILES); do install -m 0644 "$$f" $(WWWCSSDIR); done
 
 .PHONY: upload
-upload: ${DEB}
-       tar cf - ${DEB} | ssh -X repoman@repo.proxmox.com -- upload --product pmg --dist bullseye
+upload: $(DEB)
+       tar cf - $(DEB) | ssh -X repoman@repo.proxmox.com -- upload --product pmg --dist bullseye
 
 distclean: clean
        rm -f examples/simple-demo.pem
@@ -64,5 +64,5 @@ clean:
        find . -name '*~' -exec rm {} ';'
 
 .PHONY: dinstall
-dinstall: ${DEB}
-       dpkg -i ${DEB}
+dinstall: $(DEB)
+       dpkg -i $(DEB)

diff --git a/js/Makefile b/js/Makefile
index fad2bd67ea6cd41c25df9b82168a5551f3453c0b..082d94c330adc32cef94220adaacaa7a61227914 100644 (file)
--- a/js/Makefile
+++ b/js/Makefile
@@ -102,10 +102,10 @@ JSSRC=                                                    \
        Application.js
 
 OnlineHelpInfo.js: /usr/bin/asciidoc-pmg
-       /usr/bin/asciidoc-pmg scan-extjs ${JSSRC} >$@.tmp
+       /usr/bin/asciidoc-pmg scan-extjs $(JSSRC) >$@.tmp
        mv $@.tmp $@
 
-.lint-incremental: ${JSSRC}
+.lint-incremental: $(JSSRC)
        eslint $?
        touch "$@"
 
@@ -113,13 +113,13 @@ OnlineHelpInfo.js: /usr/bin/asciidoc-pmg
 lint: .lint-incremental
 
 .PHONY: check
-check: ${JSSRC}
-       eslint --strict ${JSSRC}
+check: $(JSSRC)
+       eslint --strict $(JSSRC)
        touch ".lint-incremental"
 
-pmgmanagerlib.js: OnlineHelpInfo.js ${JSSRC}
-       echo "// ${DEB_VERSION_UPSTREAM_REVISION}" > $@.tmp
-       cat OnlineHelpInfo.js ${JSSRC} >> $@.tmp
+pmgmanagerlib.js: OnlineHelpInfo.js $(JSSRC)
+       echo "// $(DEB_VERSION_UPSTREAM_REVISION)" > $@.tmp
+       cat OnlineHelpInfo.js $(JSSRC) >> $@.tmp
        mv $@.tmp $@
 
 all: pmgmanagerlib.js

diff --git a/js/mobile/Makefile b/js/mobile/Makefile
index 3e379d2f074a8a53f531f8701dffbad8fa7c4c6f..f07dfef6fec0856bf7c032030e5a109d63daaacd 100644 (file)
--- a/js/mobile/Makefile
+++ b/js/mobile/Makefile
@@ -15,7 +15,7 @@ lint: pmgmanagerlib-mobile.js
 .PHONY: check
 check: lint
 
-pmgmanagerlib-mobile.js: ${MOBILESRC}
+pmgmanagerlib-mobile.js: $(MOBILESRC)
        cat $^ >$@.tmp
        mv $@.tmp $@