summaryrefslogtreecommitdiff
path: root/Makerules
diff options
context:
space:
mode:
authorAndreas Schwab <schwab@redhat.com>2010-04-12 13:40:20 +0200
committerAndreas Schwab <schwab@redhat.com>2010-04-12 13:40:20 +0200
commit1fd194fb757480a11ebd877e17dd627c90d76dd1 (patch)
tree9ad22d95dd8673bc036d14b0055a8dcd6febe09e /Makerules
parent4ac4e460b116fb6da6e80124f4c4f6968eb86341 (diff)
parentea42a20caed5b343ff20a0d4622ae6c17b77161b (diff)
Merge remote branch 'origin/master' into fedora/master
Diffstat (limited to 'Makerules')
-rw-r--r--Makerules15
1 files changed, 9 insertions, 6 deletions
diff --git a/Makerules b/Makerules
index d5ff383770..9bfe55056d 100644
--- a/Makerules
+++ b/Makerules
@@ -111,13 +111,16 @@ endif # $(versioning) = yes
ifndef avoid-generated
before-compile := $(common-objpfx)libc-abis.h $(before-compile)
-libc-abis := $(firstword $(wildcard $(foreach D,$(add-ons), $(..)libc-abis)) \
- libc-abis)
-$(common-objpfx)libc-abis.h: $(..)scripts/gen-libc-abis $(libc-abis)
- $(SHELL) $(..)scripts/gen-libc-abis \
+$(common-objpfx)libc-abis.h: $(common-objpfx)libc-abis.stamp; @:
+$(common-objpfx)libc-abis.stamp: $(..)scripts/gen-libc-abis \
+ $(firstword $(wildcard $(sysdirs:=/libc-abis)) \
+ $(..)libc-abis) \
+ $(..)Makerules
+ $(SHELL) $< \
$(base-machine)-$(config-vendor)-$(config-os) \
- < $(libc-abis) > $@T
- $(move-if-change) $@T $@
+ < $(word 2,$^) > $(@:.stamp=.h)T
+ $(move-if-change) $(@:.stamp=.h)T $(@:.stamp=.h)
+ touch $@
common-generated += $(common-objpfx)libc-abis.h
endif # avoid-generated