From c66ffd1daf26036c5dd2145b5b7d2555c43cc919 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Fri, 9 May 2014 08:52:25 +0200 Subject: [PATCH] make: nicer gluon-tools dependencies --- Makefile | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 8cf8e51b..0da5004f 100644 --- a/Makefile +++ b/Makefile @@ -59,22 +59,18 @@ include $(GLUONDIR)/include/profiles.mk CheckExternal := test -d $(GLUON_OPENWRTDIR) || (echo 'You don'"'"'t seem to have obtained the external repositories needed by Gluon; please call `make update` first!'; false) -all: FORCE - @$(CheckExternal) +gluon-tools: FORCE +@$(SUBMAKE) -C $(TOPDIR) prepare-tmpinfo OPENWRT_BUILD=0 +@$(GLUONMAKE) gluon-tools GLUON_TOOLS=0 + +all: gluon-tools +@$(GLUONMAKE) prepare +@$(GLUONMAKE) images -download prepare images: FORCE - @$(CheckExternal) - +@$(SUBMAKE) -C $(TOPDIR) prepare-tmpinfo OPENWRT_BUILD=0 - +@$(GLUONMAKE) gluon-tools GLUON_TOOLS=0 +download prepare images: gluon-tools +@$(GLUONMAKE) $@ -manifest: FORCE - @$(CheckExternal) - +@$(GLUONMAKE) gluon-tools GLUON_TOOLS=0 +manifest: gluon-tools [ -n "$(GLUON_BRANCH)" ] || (echo 'Please set GLUON_BRANCH to create a manifest.'; false) +@$(GLUONMAKE) $@