From bae01b742bc44b48ce8a769bd6609244e32d17c0 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Sun, 17 Feb 2013 21:01:28 +0100 Subject: [PATCH] Prevent calling make with unsupported targets, fix build of individual images --- Makefile | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/Makefile b/Makefile index b0232587..78aab6c6 100644 --- a/Makefile +++ b/Makefile @@ -4,6 +4,31 @@ LC_ALL:=C LANG:=C export LC_ALL LANG +ifneq ($(GLUON_BUILD),1) + +override GLUON_BUILD=1 +export GLUON_BUILD +TARGETS := all prepare images +SUBMAKE := $(MAKE) --no-print-directory + +FORCE: ; + +$(TARGETS): FORCE + @$(SUBMAKE) $@ + +image/%:: FORCE + @$(SUBMAKE) $@ + +clean: FORCE + @$(SUBMAKE) clean-gluon + +cleanall: FORCE + @$(SUBMAKE) clean + +.PHONY: FORCE + +else + GLUONMAKE = $(SUBMAKE) -C $(GLUON_OPENWRTDIR) -f $(GLUONDIR)/Makefile ifneq ($(OPENWRT_BUILD),1) @@ -38,6 +63,9 @@ prepare: FORCE images: FORCE +@$(GLUONMAKE) images +image/%:: FORCE + +@$(GLUONMAKE) $@ + clean: clean-gluon clean-gluon: @@ -130,3 +158,4 @@ images: $(patsubst %,image/%,$(PROFILES)) .PHONY: all images prepare clean cleanall endif +endif