diff options
| author | Chris Johns <chrisj@rtems.org> | 2018-04-11 13:26:58 +1000 |
|---|---|---|
| committer | Chris Johns <chrisj@rtems.org> | 2018-04-11 13:26:58 +1000 |
| commit | b8c59353552c2504c0e71e1f6f81dfa4b2a96e37 (patch) | |
| tree | 174f44a1fe3a268115a0b5c49da486994615b3ed | |
| parent | cpukit/mttpd: Add a callback to generate a per file HTTP etag (diff) | |
| download | rtems-b8c59353552c2504c0e71e1f6f81dfa4b2a96e37.tar.bz2 | |
build: Fix make clean.
Update #3254.
| -rw-r--r-- | c/src/automake/subdirs.am | 7 | ||||
| -rw-r--r-- | cpukit/automake/subdirs.am | 3 | ||||
| -rw-r--r-- | testsuites/automake/subdirs.am | 3 |
3 files changed, 7 insertions, 6 deletions
diff --git a/c/src/automake/subdirs.am b/c/src/automake/subdirs.am index 6ae7ff05a1..47d88cffcd 100644 --- a/c/src/automake/subdirs.am +++ b/c/src/automake/subdirs.am @@ -17,11 +17,9 @@ SUBDIRS_no_dot_no_wrapup_no_testsuites = $(filter-out testsuites,$(SUBDIRS_no_do SUBDIRS_wrapup = $(filter wrapup,$(SUBDIRS_no_dot)) SUBDIRS_testsuites = $(filter testsuites,$(SUBDIRS_no_dot)) -preinstall: $(preintstall_targets) - define CPUKITDIR .PHONY: $1 -$1: $(preintstall_targets) +$1: @+set fnord $(MAKEFLAGS); amf=$$$$2; \ subdir=$(2); \ target=`echo $(MAKECMDGOALS) | sed s/-recursive//`; \ @@ -62,4 +60,5 @@ $(if "$(SUBDIRS_testsuites)" "testsuites",testsuites: dot $(SUBDIRS_no_dot_no_te # # The general build all rule for automake. # -all-local: $(if "$(SUBDIRS_dot)" ".",dot) $(SUBDIRS_no_dot) +all-local: $(if "$(SUBDIRS_dot)" ".",dot) $(SUBDIRS_no_dot) +clean-local: $(if "$(SUBDIRS_dot)" ".",dot) $(SUBDIRS_no_dot) diff --git a/cpukit/automake/subdirs.am b/cpukit/automake/subdirs.am index 8c7be70e60..b36ad80735 100644 --- a/cpukit/automake/subdirs.am +++ b/cpukit/automake/subdirs.am @@ -49,4 +49,5 @@ $(foreach D,$(SUBDIRS_no_dot),$(eval $(call CPUKITDIR,$(D),$(D)))) # $(if "$(SUBDIRS_wrapup)" "wrapup",wrapup: dot $(foreach D,$(SUBDIRS_no_dot_no_wrapup),$(D)),) -all-local: $(if "$(SUBDIRS_dot)" ".",dot) $(SUBDIRS_no_dot) +all-local: $(if "$(SUBDIRS_dot)" ".",dot) $(SUBDIRS_no_dot) +clean-local: $(if "$(SUBDIRS_dot)" ".",dot) $(SUBDIRS_no_dot) diff --git a/testsuites/automake/subdirs.am b/testsuites/automake/subdirs.am index e0ddab46f0..a566774bab 100644 --- a/testsuites/automake/subdirs.am +++ b/testsuites/automake/subdirs.am @@ -24,4 +24,5 @@ endef $(foreach T,$(_SUBDIRS),$(eval $(call TESTDIR,$(strip $(T))))) -all-local: $(_SUBDIRS) +all-local: $(_SUBDIRS) +clean-local: $(_SUBDIRS) |