From 8f461035438bea11b66a52efd6718d2207b464df Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Tue, 27 Sep 2016 15:39:56 +0200 Subject: [PATCH] Makefile: fix distclean target As some Makefiles in sub directories do not implement the distclean target, namely: PVE/Service/Makefile PVE/CLI/Makefile This target is broken. As all other implementations just redirect to the 'clean' target I do not implement the missing ones but rather remove all such targets. Keep it just in the top level directory, for consistence sake with other pve repos, and redirect it there directly to the clean target. Signed-off-by: Thomas Lamprecht --- Makefile | 1 - PVE/API2/Formatter/Makefile | 3 --- PVE/API2/Makefile | 3 --- PVE/Makefile | 4 ---- PVE/Status/Makefile | 3 --- PVE/VZDump/Makefile | 3 --- aplinfo/Makefile | 3 --- bin/Makefile | 4 ---- bin/init.d/Makefile | 3 --- bin/ocf/Makefile | 3 --- bin/test/Makefile | 3 --- www/bootstrap/Makefile | 3 --- www/css/Makefile | 3 --- www/css/fonts/Makefile | 3 --- www/images/Makefile | 3 --- www/manager6/Makefile | 3 --- www/mobile/Makefile | 3 --- 17 files changed, 51 deletions(-) diff --git a/Makefile b/Makefile index afff8c49..caedbe69 100644 --- a/Makefile +++ b/Makefile @@ -92,7 +92,6 @@ install: country.dat vznet.conf vzdump.conf vzdump-hook-script.pl pve-apt.conf m .PHONY: distclean distclean: clean - set -e && for i in ${SUBDIRS}; do ${MAKE} -C $$i $@; done .PHONY: clean clean: diff --git a/PVE/API2/Formatter/Makefile b/PVE/API2/Formatter/Makefile index cc4a9230..08a0666b 100644 --- a/PVE/API2/Formatter/Makefile +++ b/PVE/API2/Formatter/Makefile @@ -7,9 +7,6 @@ PERLSOURCE = \ all: -.PHONY: distclean -distclean: clean - .PHONY: clean clean: rm -rf *~ diff --git a/PVE/API2/Makefile b/PVE/API2/Makefile index a759d065..9777d281 100644 --- a/PVE/API2/Makefile +++ b/PVE/API2/Makefile @@ -16,9 +16,6 @@ PERLSOURCE = \ all: -.PHONY: distclean -distclean: clean - .PHONY: clean clean: rm -rf *~ diff --git a/PVE/Makefile b/PVE/Makefile index 879f864a..598023a5 100644 --- a/PVE/Makefile +++ b/PVE/Makefile @@ -28,10 +28,6 @@ pvecfg.pm: pvecfg.pm.in %: set -e && for i in ${SUBDIRS}; do ${MAKE} -C $$i $@; done -.PHONY: distclean -distclean: clean - 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 diff --git a/PVE/Status/Makefile b/PVE/Status/Makefile index 8ff6902d..f3731ef9 100644 --- a/PVE/Status/Makefile +++ b/PVE/Status/Makefile @@ -7,9 +7,6 @@ PERLSOURCE = \ all: -.PHONY: distclean -distclean: clean - .PHONY: clean clean: rm -rf *~ diff --git a/PVE/VZDump/Makefile b/PVE/VZDump/Makefile index af1cc8f3..cb87fed2 100644 --- a/PVE/VZDump/Makefile +++ b/PVE/VZDump/Makefile @@ -5,9 +5,6 @@ PERLSOURCE = \ all: -.PHONY: distclean -distclean: clean - .PHONY: clean clean: rm -rf *~ diff --git a/aplinfo/Makefile b/aplinfo/Makefile index 32bfded9..d6e4e91a 100644 --- a/aplinfo/Makefile +++ b/aplinfo/Makefile @@ -36,9 +36,6 @@ trustedkeys.gpg: ${TRUSTED_KEYS} gpg --fingerprint --batch --no-tty --homedir tempgpg --import ${TRUSTED_KEYS} gpg --batch --no-tty --homedir tempgpg --export > trustedkeys.gpg -.PHONY: distclean -distclean: clean - .PHONY: clean clean: rm -rf *~ aplinfo.dat.gz aplinfo.dat.asc tempgpg diff --git a/bin/Makefile b/bin/Makefile index 9d52bf66..6f3355c8 100644 --- a/bin/Makefile +++ b/bin/Makefile @@ -86,10 +86,6 @@ install: ${SCRIPTS} ${CLI_MANS} ${SERVICE_MANS} pvemailforward $(addsuffix .serv for i in ${SERVICES}; do install -m 0644 -D $$i.service-bash-completion ${BASHCOMPLDIR}/$$i; done set -e && for i in ${SUBDIRS}; do ${MAKE} -C $$i $@; done -.PHONY: distclean -distclean: clean - set -e && for i in ${SUBDIRS}; do ${MAKE} -C $$i $@; done - .PHONY: clean clean: make cleanup-docgen diff --git a/bin/init.d/Makefile b/bin/init.d/Makefile index 1e66e25e..76498b7b 100644 --- a/bin/init.d/Makefile +++ b/bin/init.d/Makefile @@ -26,9 +26,6 @@ install: ${SCRIPTS} install -d ${SERVICEDIR} install -m 0644 ${SERVICES} ${SERVICEDIR} -.PHONY: distclean -distclean: clean - .PHONY: clean clean: rm -rf *~ diff --git a/bin/ocf/Makefile b/bin/ocf/Makefile index 543d2184..87ac5fa1 100644 --- a/bin/ocf/Makefile +++ b/bin/ocf/Makefile @@ -9,9 +9,6 @@ install: ${SCRIPTS} install -d ${HARADIR} install -m 0755 ${SCRIPTS} ${HARADIR} -.PHONY: distclean -distclean: clean - .PHONY: clean clean: rm -rf *~ diff --git a/bin/test/Makefile b/bin/test/Makefile index 91fe61a4..5007c096 100644 --- a/bin/test/Makefile +++ b/bin/test/Makefile @@ -14,9 +14,6 @@ install: ${SCRIPTS} install -d ${DOCDIR}/examples install -m 0755 ${SCRIPTS} ${DOCDIR}/examples -.PHONY: distclean -distclean: clean - .PHONY: clean clean: rm -rf *~ diff --git a/www/bootstrap/Makefile b/www/bootstrap/Makefile index b9c49865..7dd5a23f 100644 --- a/www/bootstrap/Makefile +++ b/www/bootstrap/Makefile @@ -25,9 +25,6 @@ install: ${BTDATA} install -m 0644 -o www-data -g www-data ${BTDIR}/js/bootstrap.min.js ${WWWJSDIR} install -m 0644 ${BTDIR}/fonts/glyphicons-halflings-regular.ttf ${WWWIMAGEDIR} -.PHONY: distclean -distclean: clean - .PHONY: clean clean: rm -rf *~ ${BTDIR} diff --git a/www/css/Makefile b/www/css/Makefile index 8b7915cd..fd46a8c1 100644 --- a/www/css/Makefile +++ b/www/css/Makefile @@ -8,9 +8,6 @@ install: ext6-pve.css font-awesome.css install -m 0644 -o www-data -g www-data $? ${WWWCSSDIR} set -e && ${MAKE} -C fonts install -.PHONY: distclean -distclean: clean - .PHONY: clean clean: rm -rf *~ diff --git a/www/css/fonts/Makefile b/www/css/fonts/Makefile index 305dbee6..b14d3422 100644 --- a/www/css/fonts/Makefile +++ b/www/css/fonts/Makefile @@ -7,9 +7,6 @@ install: README fontawesome-webfont.ttf FontAwesome.otf fontawesome-webfont.woff install -d ${WWWFONTSDIR} install -m 0644 -o www-data -g www-data $? ${WWWFONTSDIR} -.PHONY: distclean -distclean: clean - .PHONY: clean clean: rm -rf *~ diff --git a/www/images/Makefile b/www/images/Makefile index 393ee365..dcb48e53 100644 --- a/www/images/Makefile +++ b/www/images/Makefile @@ -73,9 +73,6 @@ install: ${IMAGES} install -d ${WWWIMAGEDIR} install -m 0644 -o www-data -g www-data ${IMAGES} ${WWWIMAGEDIR} -.PHONY: distclean -distclean: clean - .PHONY: clean clean: rm -rf *~ diff --git a/www/manager6/Makefile b/www/manager6/Makefile index eb8c7bb0..558ddfd0 100644 --- a/www/manager6/Makefile +++ b/www/manager6/Makefile @@ -219,9 +219,6 @@ install: pvemanagerlib.js install -d ${WWWEXT6DIR} install -m 0644 -o www-data -g www-data pvemanagerlib.js ${WWWEXT6DIR} -.PHONY: distclean -distclean: clean - .PHONY: clean clean: find . -name '*~' -exec rm {} ';' diff --git a/www/mobile/Makefile b/www/mobile/Makefile index cf67c576..479f186d 100644 --- a/www/mobile/Makefile +++ b/www/mobile/Makefile @@ -35,9 +35,6 @@ install: pvemanager-mobile.js install -m 0644 pvemanager-mobile.js ${WWWTOUCHDIR} chown -R www-data:www-data ${WWWTOUCHDIR} -.PHONY: distclean -distclean: clean - .PHONY: clean clean: rm -rf *~ pvemanager-mobile.js -- 2.39.5