makefile: convert to use simple parenthesis

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2023-05-29 14:11:36 +02:00
parent 228e723a84
commit 147d67c495
22 changed files with 144 additions and 146 deletions

View File

@ -2,8 +2,8 @@ include /usr/share/dpkg/pkg-info.mk
include /usr/share/dpkg/architecture.mk
include defines.mk
export PVERELEASE=${DEB_VERSION_UPSTREAM}
export VERSION=${DEB_VERSION_UPSTREAM_REVISION}
export PVERELEASE=$(DEB_VERSION_UPSTREAM)
export VERSION=$(DEB_VERSION_UPSTREAM_REVISION)
DESTDIR=
@ -14,20 +14,20 @@ GITVERSION:=$(shell git rev-parse HEAD)
# possibly set via debian/rules(.env)
REPOID?=$(shell git rev-parse --short=8 HEAD)
DEB=${PACKAGE}_${VERSION}_${DEB_BUILD_ARCH}.deb
DEB=$(PACKAGE)_$(VERSION)_$(DEB_BUILD_ARCH).deb
all: ${SUBDIRS}
set -e && for i in ${SUBDIRS}; do ${MAKE} -C $$i; done
all: $(SUBDIRS)
set -e && for i in $(SUBDIRS); do $(MAKE) -C $$i; done
.PHONY: check
check: bin test www
${MAKE} -C bin check
${MAKE} -C test check
${MAKE} -C www check
$(MAKE) -C bin check
$(MAKE) -C test check
$(MAKE) -C www check
.PHONY: dinstall
dinstall: ${DEB}
dpkg -i ${DEB}
dinstall: $(DEB)
dpkg -i $(DEB)
.PHONY: deb
deb: $(DEB)
@ -35,34 +35,33 @@ $(DEB):
rm -rf dest
mkdir dest
rsync -a * dest
echo "git clone git://git.proxmox.com/git/pve-manager.git\\ngit checkout ${GITVERSION}" > dest/debian/SOURCE
echo "REPOID_GENERATED=${REPOID}" > dest/debian/rules.env
echo "git clone git://git.proxmox.com/git/pve-manager.git\\ngit checkout $(GITVERSION)" > dest/debian/SOURCE
echo "REPOID_GENERATED=$(REPOID)" > dest/debian/rules.env
cd dest; dpkg-buildpackage -b -us -uc
lintian ${DEB}
lintian $(DEB)
.PHONY: upload
upload: ${DEB} check
upload: $(DEB) check
# check if working directory is clean
git diff --exit-code --stat && git diff --exit-code --stat --staged
tar cf - ${DEB} | ssh -X repoman@repo.proxmox.com upload --product pve --dist bullseye
tar cf - $(DEB) | ssh -X repoman@repo.proxmox.com upload --product pve --dist bullseye
.PHONY: install
install: vzdump-hook-script.pl
install -d -m 0700 -o www-data -g www-data ${DESTDIR}/var/log/pveproxy
install -d ${DOCDIR}/examples
install -d ${DESTDIR}/var/lib/${PACKAGE}
install -d ${DESTDIR}/var/lib/vz/images
install -d ${DESTDIR}/var/lib/vz/template/cache
install -d ${DESTDIR}/var/lib/vz/template/iso
install -m 0644 vzdump-hook-script.pl ${DOCDIR}/examples/vzdump-hook-script.pl
install -m 0644 spice-example-sh ${DOCDIR}/examples/spice-example-sh
set -e && for i in ${SUBDIRS}; do ${MAKE} -C $$i $@; done
install -d -m 0700 -o www-data -g www-data $(DESTDIR)/var/log/pveproxy
install -d $(DOCDIR)/examples
install -d $(DESTDIR)/var/lib/$(PACKAGE)
install -d $(DESTDIR)/var/lib/vz/images
install -d $(DESTDIR)/var/lib/vz/template/cache
install -d $(DESTDIR)/var/lib/vz/template/iso
install -m 0644 vzdump-hook-script.pl $(DOCDIR)/examples/vzdump-hook-script.pl
install -m 0644 spice-example-sh $(DOCDIR)/examples/spice-example-sh
set -e && for i in $(SUBDIRS); do $(MAKE) -C $$i $@; done
.PHONY: distclean
distclean: clean
.PHONY: clean
clean:
set -e && for i in ${SUBDIRS}; do ${MAKE} -C $$i $@; done
find . -name '*~' -exec rm {} ';'
set -e && for i in $(SUBDIRS); do $(MAKE) -C $$i $@; done
rm -rf dest country.dat *.deb *.buildinfo *.changes ca-tmp

View File

@ -17,6 +17,6 @@ clean:
rm -rf *~
.PHONY: install
install: ${PERLSOURCE}
install -d ${PERLLIBDIR}/PVE/API2/Ceph
install -m 0644 ${PERLSOURCE} ${PERLLIBDIR}/PVE/API2/Ceph
install: $(PERLSOURCE)
install -d $(PERLLIBDIR)/PVE/API2/Ceph
install -m 0644 $(PERLSOURCE) $(PERLLIBDIR)/PVE/API2/Ceph

View File

@ -15,6 +15,6 @@ clean:
rm -rf *~
.PHONY: install
install: ${PERLSOURCE}
install -d ${PERLLIBDIR}/PVE/API2/Cluster
install -m 0644 ${PERLSOURCE} ${PERLLIBDIR}/PVE/API2/Cluster
install: $(PERLSOURCE)
install -d $(PERLLIBDIR)/PVE/API2/Cluster
install -m 0644 $(PERLSOURCE) $(PERLLIBDIR)/PVE/API2/Cluster

View File

@ -12,5 +12,5 @@ clean:
.PHONY: install
install:
install -d ${PERLLIBDIR}/PVE/API2/Hardware
install -m 0644 ${PERLSOURCE} ${PERLLIBDIR}/PVE/API2/Hardware
install -d $(PERLLIBDIR)/PVE/API2/Hardware
install -m 0644 $(PERLSOURCE) $(PERLLIBDIR)/PVE/API2/Hardware

View File

@ -30,10 +30,10 @@ all:
.PHONY: clean
clean:
rm -rf *~
set -e && for i in ${SUBDIRS}; do ${MAKE} -C $$i $@; done
set -e && for i in $(SUBDIRS); do $(MAKE) -C $$i $@; done
.PHONY: install
install: ${PERLSOURCE}
install -d ${PERLLIBDIR}/PVE/API2
install -m 0644 ${PERLSOURCE} ${PERLLIBDIR}/PVE/API2
set -e && for i in ${SUBDIRS}; do ${MAKE} -C $$i $@; done
install: $(PERLSOURCE)
install -d $(PERLLIBDIR)/PVE/API2
install -m 0644 $(PERLSOURCE) $(PERLLIBDIR)/PVE/API2
set -e && for i in $(SUBDIRS); do $(MAKE) -C $$i $@; done

View File

@ -5,9 +5,9 @@ SOURCES=vzdump.pm pvesubscription.pm pveceph.pm pveam.pm pvesr.pm pvenode.pm pve
all:
.PHONY: install
install: ${SOURCES}
install -d -m 0755 ${PERLLIBDIR}/PVE/CLI
for i in ${SOURCES}; do install -D -m 0644 $$i ${PERLLIBDIR}/PVE/CLI/$$i; done
install: $(SOURCES)
install -d -m 0755 $(PERLLIBDIR)/PVE/CLI
for i in $(SOURCES); do install -D -m 0644 $$i $(PERLLIBDIR)/PVE/CLI/$$i; done
clean:

View File

@ -11,6 +11,6 @@ clean:
rm -rf *~
.PHONY: install
install: ${PERLSOURCE}
install -d ${PERLLIBDIR}/PVE/Ceph
install -m 0644 ${PERLSOURCE} ${PERLLIBDIR}/PVE/Ceph
install: $(PERLSOURCE)
install -d $(PERLLIBDIR)/PVE/Ceph
install -m 0644 $(PERLSOURCE) $(PERLLIBDIR)/PVE/Ceph

View File

@ -10,6 +10,6 @@ clean:
rm -rf *~
.PHONY: install
install: ${PERLSOURCE}
install -d ${PERLLIBDIR}/PVE/Jobs
install -m 0644 ${PERLSOURCE} ${PERLLIBDIR}/PVE/Jobs
install: $(PERLSOURCE)
install -d $(PERLLIBDIR)/PVE/Jobs
install -m 0644 $(PERLSOURCE) $(PERLLIBDIR)/PVE/Jobs

View File

@ -16,24 +16,24 @@ PERLSOURCE = \
Report.pm \
VZDump.pm
all: pvecfg.pm ${SUBDIRS}
set -e && for i in ${SUBDIRS}; do ${MAKE} -C $$i; done
all: pvecfg.pm $(SUBDIRS)
set -e && for i in $(SUBDIRS); do $(MAKE) -C $$i; done
pvecfg.pm: pvecfg.pm.in
sed -e s/@VERSION@/${VERSION}/ -e s/@PVERELEASE@/${PVERELEASE}/ -e s/@PACKAGE@/${PACKAGE}/ -e s/@REPOID@/${REPOID}/ $< >$@.tmp
sed -e s/@VERSION@/$(VERSION)/ -e s/@PVERELEASE@/$(PVERELEASE)/ -e s/@PACKAGE@/$(PACKAGE)/ -e s/@REPOID@/$(REPOID)/ $< >$@.tmp
mv $@.tmp $@
%:
set -e && for i in ${SUBDIRS}; do ${MAKE} -C $$i $@; done
set -e && for i in $(SUBDIRS); do $(MAKE) -C $$i $@; done
.PHONY: clean
clean:
set -e && for i in ${SUBDIRS}; do ${MAKE} -C $$i $@; done
set -e && for i in $(SUBDIRS); do $(MAKE) -C $$i $@; done
rm -rf *~ pvecfg.pm pvecfg.pm.tmp
.PHONY: install
install: pvecfg.pm ${PERLSOURCE}
install -d ${PERLLIBDIR}/PVE
install -m 0644 pvecfg.pm ${PERLLIBDIR}/PVE/
install -m 0644 ${PERLSOURCE} ${PERLLIBDIR}/PVE/
set -e && for i in ${SUBDIRS}; do ${MAKE} -C $$i $@; done
install: pvecfg.pm $(PERLSOURCE)
install -d $(PERLLIBDIR)/PVE
install -m 0644 pvecfg.pm $(PERLLIBDIR)/PVE/
install -m 0644 $(PERLSOURCE) $(PERLLIBDIR)/PVE/
set -e && for i in $(SUBDIRS); do $(MAKE) -C $$i $@; done

View File

@ -5,8 +5,8 @@ SOURCES=pvestatd.pm pveproxy.pm pvedaemon.pm spiceproxy.pm pvescheduler.pm
all:
.PHONY: install
install: ${SOURCES}
install -d -m 0755 ${PERLLIBDIR}/PVE/Service
for i in ${SOURCES}; do install -D -m 0644 $$i ${PERLLIBDIR}/PVE/Service/$$i; done
install: $(SOURCES)
install -d -m 0755 $(PERLLIBDIR)/PVE/Service
for i in $(SOURCES); do install -D -m 0644 $$i $(PERLLIBDIR)/PVE/Service/$$i; done
clean:

View File

@ -12,6 +12,6 @@ clean:
rm -rf *~
.PHONY: install
install: ${PERLSOURCE}
install -d ${PERLLIBDIR}/PVE/Status
install -m 0644 ${PERLSOURCE} ${PERLLIBDIR}/PVE/Status
install: $(PERLSOURCE)
install -d $(PERLLIBDIR)/PVE/Status
install -m 0644 $(PERLSOURCE) $(PERLLIBDIR)/PVE/Status

View File

@ -11,8 +11,8 @@ all:
.PHONY: install
install: aplinfo.dat trustedkeys.gpg
install -D -m 0644 aplinfo.dat ${DESTDIR}${DOCDIR}/aplinfo.dat
install -D -m 0644 trustedkeys.gpg ${DESTDIR}${DOCDIR}/trustedkeys.gpg
install -D -m 0644 aplinfo.dat $(DESTDIR)$(DOCDIR)/aplinfo.dat
install -D -m 0644 trustedkeys.gpg $(DESTDIR)$(DOCDIR)/trustedkeys.gpg
.PHONY: update
update:
@ -20,7 +20,7 @@ update:
wget http://download.proxmox.com/images/aplinfo-pve-7.dat -O aplinfo.dat.tmp
mv aplinfo.dat.tmp aplinfo.dat
trustedkeys.gpg: ${TRUSTED_KEYS}
trustedkeys.gpg: $(TRUSTED_KEYS)
sq keyring join -o $@.tmp *.pubkey proxmox-release-bookworm.gpg
mv $@.tmp $@

View File

@ -10,8 +10,8 @@ SERVICES = pvestatd pveproxy pvedaemon spiceproxy pvescheduler
CLITOOLS = vzdump pvesubscription pveceph pveam pvesr pvenode pvesh pve6to7
SCRIPTS = \
${SERVICES} \
${CLITOOLS} \
$(SERVICES) \
$(CLITOOLS) \
pvebanner \
pveversion \
pveupgrade \
@ -19,28 +19,28 @@ SCRIPTS = \
pveperf \
pvereport
SERVICE_MANS = $(addsuffix .8, ${SERVICES})
SERVICE_MANS = $(addsuffix .8, $(SERVICES))
CLI_MANS = \
$(addsuffix .1, ${CLITOOLS}) \
$(addsuffix .1, $(CLITOOLS)) \
pveversion.1 \
pveupgrade.1 \
pveperf.1 \
pvereport.1 \
BASH_COMPLETIONS = \
$(addsuffix .service-bash-completion, ${SERVICES}) \
$(addsuffix .bash-completion, ${CLITOOLS}) \
$(addsuffix .service-bash-completion, $(SERVICES)) \
$(addsuffix .bash-completion, $(CLITOOLS)) \
ZSH_COMPLETIONS = \
$(addsuffix .service-zsh-completion, ${SERVICES}) \
$(addsuffix .zsh-completion, ${CLITOOLS}) \
$(addsuffix .service-zsh-completion, $(SERVICES)) \
$(addsuffix .zsh-completion, $(CLITOOLS)) \
all: ${SERVICE_MANS} ${CLI_MANS}
all: $(SERVICE_MANS) $(CLI_MANS)
%.1: %.1.pod
rm -f $@
cat $<|pod2man -n $* -s 1 -r ${VERSION} -c"Proxmox Documentation" - >$@.tmp
cat $<|pod2man -n $* -s 1 -r $(VERSION) -c"Proxmox Documentation" - >$@.tmp
mv $@.tmp $@
%.1.pod:
@ -56,28 +56,28 @@ pveupgrade.1.pod: pveupgrade
pvereport.1.pod: pvereport
.PHONY: check
check: $(addsuffix .service-api-verified, ${SERVICES}) $(addsuffix .api-verified, ${CLITOOLS})
check: $(addsuffix .service-api-verified, $(SERVICES)) $(addsuffix .api-verified, $(CLITOOLS))
rm -f *.service-api-verified *.api-verified
.PHONY: install
install: ${SCRIPTS} ${CLI_MANS} ${SERVICE_MANS} ${BASH_COMPLETIONS} ${ZSH_COMPLETIONS}
install -d ${BINDIR}
install -m 0755 ${SCRIPTS} ${BINDIR}
install -d ${USRSHARE}/helpers
install -m 0755 pve-startall-delay ${USRSHARE}/helpers
install -d ${MAN1DIR}
install -m 0644 ${CLI_MANS} ${MAN1DIR}
install -d ${MAN8DIR}
install -m 0644 ${SERVICE_MANS} ${MAN8DIR}
for i in ${CLITOOLS}; do install -m 0644 -D $$i.bash-completion ${BASHCOMPLDIR}/$$i; done
for i in ${SERVICES}; do install -m 0644 -D $$i.service-bash-completion ${BASHCOMPLDIR}/$$i; done
for i in ${CLITOOLS}; do install -m 0644 -D $$i.zsh-completion ${ZSHCOMPLDIR}/_$$i; done
for i in ${SERVICES}; do install -m 0644 -D $$i.service-zsh-completion ${ZSHCOMPLDIR}/_$$i; done
install: $(SCRIPTS) $(CLI_MANS) $(SERVICE_MANS) $(BASH_COMPLETIONS) $(ZSH_COMPLETIONS)
install -d $(BINDIR)
install -m 0755 $(SCRIPTS) $(BINDIR)
install -d $(USRSHARE)/helpers
install -m 0755 pve-startall-delay $(USRSHARE)/helpers
install -d $(MAN1DIR)
install -m 0644 $(CLI_MANS) $(MAN1DIR)
install -d $(MAN8DIR)
install -m 0644 $(SERVICE_MANS) $(MAN8DIR)
for i in $(CLITOOLS); do install -m 0644 -D $$i.bash-completion $(BASHCOMPLDIR)/$$i; done
for i in $(SERVICES); do install -m 0644 -D $$i.service-bash-completion $(BASHCOMPLDIR)/$$i; done
for i in $(CLITOOLS); do install -m 0644 -D $$i.zsh-completion $(ZSHCOMPLDIR)/_$$i; done
for i in $(SERVICES); do install -m 0644 -D $$i.service-zsh-completion $(ZSHCOMPLDIR)/_$$i; done
.PHONY: clean
clean:
make cleanup-docgen
rm -rf *~ *.tmp ${CLI_MANS} ${SERVICE_MANS} *.1.pod *.8.pod \
rm -rf *~ *.tmp $(CLI_MANS) $(SERVICE_MANS) *.1.pod *.8.pod \
*.bash-completion *.service-bash-completion \
*.zsh-completion *.service-zsh-completion \
*.api-verified *.service-api-verified

View File

@ -7,12 +7,12 @@ country.dat: country.pl
.PHONY: install
install: country.dat vzdump.conf pve-sources.list pve-initramfs.conf pve-blacklist.conf pve.logrotate
install -D -m 0644 pve.logrotate ${DESTDIR}/etc/logrotate.d/pve
install -D -m 0644 pve-sources.list ${DESTDIR}/etc/apt/sources.list.d/pve-enterprise.list
install -D -m 0644 pve-blacklist.conf ${DESTDIR}/etc/modprobe.d/pve-blacklist.conf
install -D -m 0644 vzdump.conf ${DESTDIR}/etc/vzdump.conf
install -D -m 0644 pve-initramfs.conf ${DESTDIR}/etc/initramfs-tools/conf.d/pve-initramfs.conf
install -D -m 0644 country.dat ${DESTDIR}/usr/share/${PACKAGE}/country.dat
install -D -m 0644 pve.logrotate $(DESTDIR)/etc/logrotate.d/pve
install -D -m 0644 pve-sources.list $(DESTDIR)/etc/apt/sources.list.d/pve-enterprise.list
install -D -m 0644 pve-blacklist.conf $(DESTDIR)/etc/modprobe.d/pve-blacklist.conf
install -D -m 0644 vzdump.conf $(DESTDIR)/etc/vzdump.conf
install -D -m 0644 pve-initramfs.conf $(DESTDIR)/etc/initramfs-tools/conf.d/pve-initramfs.conf
install -D -m 0644 country.dat $(DESTDIR)/usr/share/$(PACKAGE)/country.dat
clean:
rm -f country.dat

View File

@ -4,10 +4,10 @@ all:
.PHONY: install
install: mtu bridgevlan bridgevlanport vlan vlan-down
install -D -m 0755 mtu ${DESTDIR}/etc/network/if-up.d/mtu
install -D -m 0755 bridgevlan ${DESTDIR}/etc/network/if-up.d/bridgevlan
install -D -m 0755 bridgevlanport ${DESTDIR}/etc/network/if-up.d/bridgevlanport
install -D -m 0755 vlan ${DESTDIR}/etc/network/if-pre-up.d/vlan
install -D -m 0755 vlan-down ${DESTDIR}/etc/network/if-post-down.d/vlan
install -D -m 0755 mtu $(DESTDIR)/etc/network/if-up.d/mtu
install -D -m 0755 bridgevlan $(DESTDIR)/etc/network/if-up.d/bridgevlan
install -D -m 0755 bridgevlanport $(DESTDIR)/etc/network/if-up.d/bridgevlanport
install -D -m 0755 vlan $(DESTDIR)/etc/network/if-pre-up.d/vlan
install -D -m 0755 vlan-down $(DESTDIR)/etc/network/if-post-down.d/vlan
clean:

View File

@ -16,20 +16,20 @@ SERVICES= \
pvescheduler.service
.PHONY: install
install: ${SERVICES}
install -d ${SERVICEDIR}
install -m 0644 ${SERVICES} ${SERVICEDIR}
install -d ${SERVICEDIR}/ceph-mon@.service.d
install -m 0644 ceph-after-pve-cluster.conf ${SERVICEDIR}/ceph-mon@.service.d
install -d ${SERVICEDIR}/ceph-mgr@.service.d
install -m 0644 ceph-after-pve-cluster.conf ${SERVICEDIR}/ceph-mgr@.service.d
install -d ${SERVICEDIR}/ceph-osd@.service.d
install -m 0644 ceph-after-pve-cluster.conf ${SERVICEDIR}/ceph-osd@.service.d
install -d ${SERVICEDIR}/ceph-volume@.service.d
install -m 0644 ceph-after-pve-cluster.conf ${SERVICEDIR}/ceph-volume@.service.d
install -d ${SERVICEDIR}/ceph-mds@.service.d
install -m 0644 ceph-after-pve-cluster.conf ${SERVICEDIR}/ceph-mds@.service.d
install -d ${DESTDIR}/usr/share/doc/${PACKAGE}/examples/
install: $(SERVICES)
install -d $(SERVICEDIR)
install -m 0644 $(SERVICES) $(SERVICEDIR)
install -d $(SERVICEDIR)/ceph-mon@.service.d
install -m 0644 ceph-after-pve-cluster.conf $(SERVICEDIR)/ceph-mon@.service.d
install -d $(SERVICEDIR)/ceph-mgr@.service.d
install -m 0644 ceph-after-pve-cluster.conf $(SERVICEDIR)/ceph-mgr@.service.d
install -d $(SERVICEDIR)/ceph-osd@.service.d
install -m 0644 ceph-after-pve-cluster.conf $(SERVICEDIR)/ceph-osd@.service.d
install -d $(SERVICEDIR)/ceph-volume@.service.d
install -m 0644 ceph-after-pve-cluster.conf $(SERVICEDIR)/ceph-volume@.service.d
install -d $(SERVICEDIR)/ceph-mds@.service.d
install -m 0644 ceph-after-pve-cluster.conf $(SERVICEDIR)/ceph-mds@.service.d
install -d $(DESTDIR)/usr/share/doc/$(PACKAGE)/examples/
.PHONY: clean
clean:

View File

@ -5,15 +5,15 @@ all:
.PHONY: install
install:
set -e && for i in ${SUBDIRS}; do ${MAKE} -C $$i $@; done
install -m 0644 index.html.tpl ${WWWBASEDIR}
install -d ${WWWJSDIR}
install -m 0644 u2f-api.js ${WWWJSDIR}
set -e && for i in $(SUBDIRS); do $(MAKE) -C $$i $@; done
install -m 0644 index.html.tpl $(WWWBASEDIR)
install -d $(WWWJSDIR)
install -m 0644 u2f-api.js $(WWWJSDIR)
.PHONY: check
check:
${MAKE} -C manager6 $@
$(MAKE) -C manager6 $@
.PHONY: clean
clean:
set -e && for i in ${SUBDIRS}; do ${MAKE} -C $$i $@; done
set -e && for i in $(SUBDIRS); do $(MAKE) -C $$i $@; done

View File

@ -4,8 +4,8 @@ all:
.PHONY: install
install: ext6-pve.css
install -d ${WWWCSSDIR}
install -m 0644 $? ${WWWCSSDIR}
install -d $(WWWCSSDIR)
install -m 0644 $? $(WWWCSSDIR)
.PHONY: clean
clean:

View File

@ -4,8 +4,8 @@ all:
.PHONY: install
install: README fontawesome-webfont.ttf FontAwesome.otf fontawesome-webfont.woff2 fontawesome-webfont.svg fontawesome-webfont.woff fontawesome-webfont.eot
install -d ${WWWFONTSDIR}
install -m 0644 $? ${WWWFONTSDIR}
install -d $(WWWFONTSDIR)
install -m 0644 $? $(WWWFONTSDIR)
.PHONY: clean
clean:

View File

@ -46,7 +46,7 @@ GNOME_IMAGES = \
computer-template.png \
computer.png
IMAGES = ${GNOME_IMAGES} \
IMAGES = $(GNOME_IMAGES) \
virt-viewer.png \
tigervnc.png \
novnc.png \
@ -89,9 +89,9 @@ icon-sdn.svg: icon-sdn.dot
fdp -Tsvg $< > $@
.PHONY: install
install: ${IMAGES}
install -d ${WWWIMAGEDIR}
install -m 0644 ${IMAGES} ${WWWIMAGEDIR}
install: $(IMAGES)
install -d $(WWWIMAGEDIR)
install -m 0644 $(IMAGES) $(WWWIMAGEDIR)
.PHONY: clean
clean:

View File

@ -302,32 +302,31 @@ WIDGETKIT=/usr/share/javascript/proxmox-widget-toolkit/proxmoxlib.js
all:
.lint-incremental: ${JSSRC}
.lint-incremental: $(JSSRC)
eslint $?
touch "$@"
.PHONY: lint
check: lint
lint: ${JSSRC}
eslint --strict ${JSSRC}
lint: $(JSSRC)
eslint --strict $(JSSRC)
touch ".lint-incremental"
pvemanagerlib.js: .lint-incremental OnlineHelpInfo.js ${JSSRC}
cat OnlineHelpInfo.js ${JSSRC} >$@.tmp
pvemanagerlib.js: .lint-incremental OnlineHelpInfo.js $(JSSRC)
cat OnlineHelpInfo.js $(JSSRC) >$@.tmp
mv $@.tmp $@
OnlineHelpInfo.js: ${JSSRC} ${WIDGETKIT}
OnlineHelpInfo.js: $(JSSRC) $(WIDGETKIT)
/usr/bin/asciidoc-pve scan-extjs $^ >$@.tmp
mv $@.tmp $@
.PHONY: install
install: pvemanagerlib.js
install -d ${WWWJSDIR}
install -m 0644 pvemanagerlib.js ${WWWJSDIR}
install -d $(WWWJSDIR)
install -m 0644 pvemanagerlib.js $(WWWJSDIR)
.PHONY: clean
clean:
find . -name '*~' -exec rm {} ';'
rm -rf pvemanagerlib.js OnlineHelpInfo.js .lint-incremental

View File

@ -28,16 +28,16 @@ JSSRC= \
all:
pvemanager-mobile.js: ${JSSRC}
cat ${JSSRC} >$@.tmp
pvemanager-mobile.js: $(JSSRC)
cat $(JSSRC) >$@.tmp
mv $@.tmp $@
.PHONY: install
install: pvemanager-mobile.js index.html.tpl pve.css
install -d ${WWWTOUCHDIR}
install -m 0644 index.html.tpl ${WWWTOUCHDIR}
install -m 0644 pve.css ${WWWTOUCHDIR}
install -m 0644 pvemanager-mobile.js ${WWWTOUCHDIR}
install -d $(WWWTOUCHDIR)
install -m 0644 index.html.tpl $(WWWTOUCHDIR)
install -m 0644 pve.css $(WWWTOUCHDIR)
install -m 0644 pvemanager-mobile.js $(WWWTOUCHDIR)
.PHONY: clean
clean: