[pve-devel] [RFC manager 1/5] build: cleanup file generation

[Fabian Grünbichler]

should happen in the default 'all' target, not in 'install'.

Signed-off-by: Fabian Grünbichler <f.gruenbichler at proxmox.com>
---
 Makefile         | 1 +
 PVE/Makefile     | 1 +
 configs/Makefile | 2 +-
 www/Makefile     | 5 +++--
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index d6837cf3..f6e2d288 100644
--- a/Makefile
+++ b/Makefile
@@ -12,6 +12,7 @@ GITVERSION:=$(shell git rev-parse HEAD)
 DEB=${PACKAGE}_${VERSION}-${PACKAGERELEASE}_${ARCH}.deb
 
 all: ${SUBDIRS}
+	set -e && for i in ${SUBDIRS}; do ${MAKE} -C $$i; done
 
 check:
 	${MAKE} -C test check
diff --git a/PVE/Makefile b/PVE/Makefile
index 56d27d13..ad460458 100644
--- a/PVE/Makefile
+++ b/PVE/Makefile
@@ -15,6 +15,7 @@ PERLSOURCE = 			\
 	VZDump.pm
 
 all: pvecfg.pm ${SUBDIRS}
+	set -e && for i in ${SUBDIRS}; do ${MAKE} -C $$i; done
 
 REPOID=$(shell git rev-parse --short=8 HEAD)
 
diff --git a/configs/Makefile b/configs/Makefile
index 8ee5ba05..da30a230 100644
--- a/configs/Makefile
+++ b/configs/Makefile
@@ -1,6 +1,6 @@
 include ../defines.mk
 
-all:
+all: country.dat
 
 country.dat: country.pl
 	./country.pl > country.dat
diff --git a/www/Makefile b/www/Makefile
index 30becf3a..afe36487 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -2,8 +2,6 @@ include ../defines.mk
 SUBDIRS = images css manager6 touch mobile
 
 all: ${SUBDIRS} index.html.tpl
-
-%:
 	set -e && for i in ${SUBDIRS}; do ${MAKE} -C $$i $@; done
 
 .PHONY: install
@@ -11,3 +9,6 @@ install:
 	set -e && for i in ${SUBDIRS}; do ${MAKE} -C $$i $@; done
 	install -m 0644 index.html.tpl ${WWWBASEDIR}
 
+.PHONY: clean
+clean:
+	set -e && for i in ${SUBDIRS}; do ${MAKE} -C $$i $@; done
-- 
2.19.1