build: cleanup file generation

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

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>

diff --git a/Makefile b/Makefile
index d6837cf35b5bba667d3f17ae8ca4428599f13535..f6e2d288ca45bd0bd77f178c87c9eeed37e093b3 100644 (file)
--- 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 56d27d1320da8a5e6bfb85724f979f9970d8884d..ad46045836d1280329349809bd7b6c8bd855fa54 100644 (file)
--- 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 8ee5ba05b5078ec21cb639037822848d131b1ff3..da30a230368eaac8751b1ad75ee4e6c63c93305b 100644 (file)
--- 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 30becf3a8d8a6097a6cc588c6736c89d8d652818..afe36487f40c89d876ec377a26fbd5869d87c0d2 100644 (file)
--- 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