From 480d827b660a4e13fd5b9a4bacb3df57cad1a5aa Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Mon, 27 Mar 2000 19:42:09 +0000 Subject: 2000-03-27 Roland McGrath * Makeconfig (preprocess-versions): New canned sequence for running cpp on shlib-versions and the like. (soversions.i): Use it. * Makerules (Versions.all, sysd-versions): Use it to preprocess the Versions.def and Versions files. --- Makerules | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'Makerules') diff --git a/Makerules b/Makerules index edbf8a5b81..6f5e43320c 100644 --- a/Makerules +++ b/Makerules @@ -297,7 +297,8 @@ $(common-objpfx)Versions.all: $(..)scripts/firstversions.awk \ { while read lib version setname; do \ test -z "$$setname" || echo "$$lib : $$setname"; \ done < $(word 2,$^); \ - cat $(filter-out $< $(word 2,$^),$^); \ + cat $(filter-out $< $(word 2,$^),$^) \ + | $(preprocess-versions); \ } | LC_ALL=C $(AWK) -f $< > $@T mv -f $@T $@ $(common-objpfx)sysd-versions: $(common-objpfx)Versions.all \ @@ -306,9 +307,11 @@ $(common-objpfx)sysd-versions: $(common-objpfx)Versions.all \ $(wildcard $(sysdirs:%=%/Versions)) \ $(sysd-versions-force) { echo 'sysd-versions-subdirs = $(all-subdirs) $(config-sysdirs)' ; \ - LC_ALL=C $(AWK) -v buildroot=$(common-objpfx) -v defsfile=$< \ - -v move_if_change='$(move-if-change)' \ - -f $(filter-out $< $(sysd-versions-force),$^); \ + cat $(filter-out $< $(word 2,$^) $(sysd-versions-force),$^) \ + | $(preprocess-versions) \ + | LC_ALL=C $(AWK) -v buildroot=$(common-objpfx) -v defsfile=$< \ + -v move_if_change='$(move-if-change)' \ + -f $(word 2,$^); \ } > $@T mv -f $@T $@ endif # avoid-generated -- cgit 1.4.1