Commit 39253008 authored by Simon Marlow's avatar Simon Marlow
Browse files

eliminate "warning: overriding commnds..." from make when we're cleaning

parent 47e182d4
...@@ -34,6 +34,8 @@ $(call clean-target,$1,$2,$1/$2 $$($1_$2_INPLACE)) ...@@ -34,6 +34,8 @@ $(call clean-target,$1,$2,$1/$2 $$($1_$2_INPLACE))
.PHONY: clean_$1 .PHONY: clean_$1
clean_$1 : clean_$1_$2 clean_$1 : clean_$1_$2
# INPLACE_BIN etc. might be empty if we're cleaning
ifeq "$(findstring clean,$(MAKECMDGOALS))" ""
ifneq "$$(BINDIST)" "YES" ifneq "$$(BINDIST)" "YES"
$1/$2/$$($1_$2_PROG).prl: $1/$$($1_PERL_SRC) $$(UNLIT) $1/$2/$$($1_$2_PROG).prl: $1/$$($1_PERL_SRC) $$(UNLIT)
"$$(MKDIRHIER)" $1/$2 "$$(MKDIRHIER)" $1/$2
...@@ -53,5 +55,6 @@ $$($1_$2_INPLACE): $1/$2/$$($1_$2_PROG) ...@@ -53,5 +55,6 @@ $$($1_$2_INPLACE): $1/$2/$$($1_$2_PROG)
"$$(CP)" $$< $$@ "$$(CP)" $$< $$@
$$(EXECUTABLE_FILE) $$@ $$(EXECUTABLE_FILE) $$@
endif endif
endif
endef endef
...@@ -137,7 +137,7 @@ $(call all-target,$1_$2,$$($1_$2_INPLACE)) ...@@ -137,7 +137,7 @@ $(call all-target,$1_$2,$$($1_$2_INPLACE))
$(call clean-target,$1,$2_inplace,$$($1_$2_INPLACE)) $(call clean-target,$1,$2_inplace,$$($1_$2_INPLACE))
# INPLACE_BIN might be empty if we're distcleaning # INPLACE_BIN might be empty if we're distcleaning
ifneq "$$(INPLACE_BIN)" "" ifeq "$(findstring clean,$(MAKECMDGOALS))" ""
$$($1_$2_INPLACE) : $1/$2/build/tmp/$$($1_$2_PROG) $$(MKDIRHIER) $$($1_$2_INPLACE) : $1/$2/build/tmp/$$($1_$2_PROG) $$(MKDIRHIER)
"$$(MKDIRHIER)" $$(dir $$@) "$$(MKDIRHIER)" $$(dir $$@)
"$$(CP)" -p $$< $$@ "$$(CP)" -p $$< $$@
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment