summaryrefslogtreecommitdiff
path: root/Makerules
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2000-03-19 23:33:48 +0000
committerRoland McGrath <roland@gnu.org>2000-03-19 23:33:48 +0000
commitba7e89ec3321d67584eea5857853309846a73806 (patch)
tree3e3376be6e9adf8680fc47b24878d39a971b6a77 /Makerules
parent6b3c3a3525b6571c546a8a9aad8f3a53a055dc2a (diff)
* Makeconfig (soversions.i): New target, input-reading parts of
soversions.mk generation moved here; result is a canonicalized list "LIB VERSION [SET]" for this configuration. (soversions.mk): Use that as input. Don't emit map-firstversions. * Makerules (version-renames.def): New target, generated from soversions.i with contents that was in $(map-firstversions). (Versions.all): Don't depend on soversions.mk, depend on version-renames.def instead; just cat it into the input.
Diffstat (limited to 'Makerules')
-rw-r--r--Makerules13
1 files changed, 8 insertions, 5 deletions
diff --git a/Makerules b/Makerules
index 202c92239f..8535d10ddd 100644
--- a/Makerules
+++ b/Makerules
@@ -290,13 +290,16 @@ ifneq ($(sysd-versions-subdirs),$(all-subdirs) $(config-sysdirs))
sysd-versions-force = FORCE
FORCE:
endif
+$(common-objpfx)version-renames.def: $(common-objpfx)soversions.i
+ while read lib version setname; do \
+ test -z "$$setname" || echo "$$lib : $$setname"; \
+ done < $< > $@T; exit 0
+ mv -f $@T $@
$(common-objpfx)Versions.all: $(..)scripts/firstversions.awk \
+ $(common-objpfx)version-renames.def \
$(..)Versions.def \
- $(wildcard $(add-ons:%=$(..)%/Versions.def)) \
- $(common-objpfx)soversions.mk
- { $(foreach map,$(map-firstversions),echo '$(subst :, : ,$(map))';) \
- cat $(filter-out $< $(common-objpfx)soversions.mk,$^); \
- } | LC_ALL=C $(AWK) -f $< > $@T
+ $(wildcard $(add-ons:%=$(..)%/Versions.def))
+ cat $(filter-out $<,$^) | LC_ALL=C $(AWK) -f $< > $@T
mv -f $@T $@
$(common-objpfx)sysd-versions: $(common-objpfx)Versions.all \
$(..)scripts/versions.awk \