dirs.mk, subdirs.mk: Use SUBDIRS_TO_ITERATE over SUBDIRS

This commit is contained in:
Jan Lindemann 2010-12-04 13:59:24 +00:00 committed by Jan Lindemann
commit e7127ecbe4
2 changed files with 10 additions and 7 deletions

View file

@ -9,7 +9,7 @@ include $(MODDIR)/make/defs.mk
SUBDIRS ?= $(FIND_SUBDIRS) SUBDIRS ?= $(FIND_SUBDIRS)
ifeq ($(SUBDIRS),) ifeq ($(SUBDIRS_TO_ITERATE),)
all: all:
subdirs: subdirs:
@ -18,7 +18,7 @@ clean distclean:
install: install:
else else
.PHONY: $(SUBDIRS) .PHONY: $(SUBDIRS_TO_ITERATE)
all subdirs: all subdirs:
$(make_subdirs) $(make_subdirs)

View file

@ -2,17 +2,20 @@ all: all.dirs
install: install.dirs install: install.dirs
clean: clean.dirs clean.var clean: clean.dirs clean.var
distclean: distclean.dirs distclean.var distclean: distclean.dirs distclean.var
test: test.dirs
ifneq ($(SUBDIRS),) ifneq ($(SUBDIRS_TO_ITERATE),)
all.dirs: all.dirs:
set -e; for dir in $(filter-out $(IGNORE_SUBDIRS),$(SUBDIRS)); do make -C $$dir all; done set -e; for dir in $(SUBDIRS_TO_ITERATE); do make -C $$dir all; done
install.dirs: install.dirs:
set -e; for dir in $(filter-out $(IGNORE_SUBDIRS),$(SUBDIRS)); do make -C $$dir install; done set -e; for dir in $(SUBDIRS_TO_ITERATE); do make -C $$dir install; done
clean.dirs: clean.dirs:
set -e; for dir in $(filter-out $(IGNORE_SUBDIRS),$(SUBDIRS)); do make -C $$dir clean; done set -e; for dir in $(SUBDIRS_TO_ITERATE); do make -C $$dir clean; done
rm -f *.done rm -f *.done
distclean.dirs: distclean.dirs:
set -e; for dir in $(filter-out $(IGNORE_SUBDIRS),$(SUBDIRS)); do make -C $$dir distclean; done set -e; for dir in $(SUBDIRS_TO_ITERATE); do make -C $$dir distclean; done
test.dirs:
set -e; for dir in $(SUBDIRS_TO_ITERATE); do make -C $$dir test; done
else else