Prevent calling make with unsupported targets, fix build of individual images

This commit is contained in:
Matthias Schiffer 2013-02-17 21:01:28 +01:00
parent 9ac754a92c
commit bae01b742b

View File

@ -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