[pve-devel] [RFC manager] Makefile: fix distclean target

Thomas Lamprecht t.lamprecht at proxmox.com
Tue Sep 27 15:39:56 CEST 2016


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 <t.lamprecht at proxmox.com>
---

RFC as this is my proposal only, we could also remove the distclean
altogether or add it to the remaining Makefiles so that its not
actually broken

(I run into this quite often as I'm used to the distclean target and
my auto completion sees that the manager implements one and thus
suggest it to me...)

 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/ext6/Makefile           | 3 ---
 www/images/Makefile         | 3 ---
 www/manager6/Makefile       | 3 ---
 www/mobile/Makefile         | 3 ---
 www/touch/Makefile          | 3 ---
 19 files changed, 57 deletions(-)

diff --git a/Makefile b/Makefile
index afff8c4..caedbe6 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 cc4a923..08a0666 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 a759d06..9777d28 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 879f864..598023a 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 8ff6902..f3731ef 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 af1cc8f..cb87fed 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 32bfded..d6e4e91 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 9d52bf6..6f3355c 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 1e66e25..76498b7 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 543d218..87ac5fa 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 91fe61a..5007c09 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 b9c4986..7dd5a23 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 8b7915c..fd46a8c 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 305dbee..b14d342 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/ext6/Makefile b/www/ext6/Makefile
index 94f1c2a..77bbce0 100644
--- a/www/ext6/Makefile
+++ b/www/ext6/Makefile
@@ -26,9 +26,6 @@ install: ${EXTDATA}
 	cp -a ${EXT_THEME} ${WWWEXT6DIR}
 	chown -R www-data:www-data ${WWWEXT6DIR}
 
-.PHONY: distclean
-distclean: clean
-
 .PHONY: clean
 clean:
 	rm -rf *~
diff --git a/www/images/Makefile b/www/images/Makefile
index 393ee36..dcb48e5 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 eb8c7bb..558ddfd 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 cf67c57..479f186 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
diff --git a/www/touch/Makefile b/www/touch/Makefile
index 702ebbe..ad2b120 100644
--- a/www/touch/Makefile
+++ b/www/touch/Makefile
@@ -26,9 +26,6 @@ install: ${TOUCHDATA}
 	chown -R www-data:www-data ${WWWTOUCHDIR}
 	find ${WWWTOUCHDIR} -type f -exec chmod -R 0644 '{}' ';'
 
-.PHONY: distclean
-distclean: clean
-
 .PHONY: clean
 clean:
 	rm -rf *~ ${TOUCHDIR}
-- 
2.1.4




More information about the pve-devel mailing list