diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | Makerules | 12 | ||||
| -rw-r--r-- | rpm/Makefile | 3 |
3 files changed, 16 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog index 377d4caebe..63863a5505 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ Tue Jun 18 17:56:44 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu> + * Makerules ($(common-objpfx)distinfo-$(subdir)): Change target from + distinfo to this. + (distinfo): Make phony target depending on that. + (TAGS, po/%.pot, dist): Change deps. + (common-clean): Remove that file. + * rpm/Makefile (distinfo): Change names. + * rpm/Makefile (clean): New target. * stdlib/test-canon.c: New test program contributed by David Mosberger. diff --git a/Makerules b/Makerules index f73bec7d6c..f995fe35c7 100644 --- a/Makerules +++ b/Makerules @@ -739,10 +739,10 @@ endif check: tests .PHONY: TAGS -TAGS: distinfo $(..)MakeTAGS +TAGS: $(common-objpfx)distinfo-$(subdir) $(..)MakeTAGS $(MAKE) $(addprefix -f ,$^) $@ -$(..)po/%.pot: distinfo $(..)MakeTAGS FORCE +$(..)po/%.pot: $(common-objpfx)distinfo-$(subdir) $(..)MakeTAGS FORCE $(MAKE) $(addprefix -f ,$(filter-out FORCE,$^)) $@ FORCE: @@ -774,6 +774,7 @@ endef # Also remove the dependencies and generated source files. common-clean: common-mostlyclean -rm -f $(addprefix $(objpfx),$(generated)) $(+depfiles) + -rm -f $(common-objpfx)distinfo-$(subdir) # Produce a file `stub-$(subdir)' which contains `#define __stub_FUNCTION' # for each function which is a stub. We grovel over all the .d files @@ -796,7 +797,7 @@ $(common-objpfx)stub-$(subdir): $(+depfiles) # Make the distribution tar file. .PHONY: dist -dist: distinfo $(..)Make-dist +dist: $(common-objpfx)distinfo-$(subdir) $(..)Make-dist $(MAKE) -f $< -f $(word 2,$^) $(Make-dist-args) # Avoid depending on source files found in sysdeps dirs, @@ -807,11 +808,12 @@ dist: $(filter-out %.c %.S %.s,$(distribute)) # environment get too large. Instead, we write all the information into # a generated makefile fragment `distinfo', and then include it with -f in # the sub-make that makes the distribution (above). -distinfo: Makefile $(..)Makerules +$(common-objpfx)distinfo-$(subdir): Makefile $(..)Makerules $(distinfo-vars) mv -f $@.new $@ -.PHONY: subdir_distinfo +.PHONY: subdir_distinfo distinfo subdir_distinfo: distinfo +distinfo: $(common-objpfx)distinfo-$(subdir) define distinfo-vars rm -f $@.new diff --git a/rpm/Makefile b/rpm/Makefile index 242c412bd5..535e14e56f 100644 --- a/rpm/Makefile +++ b/rpm/Makefile @@ -9,7 +9,8 @@ include ../Makeconfig include $(common-objpfx)soversions.mk include $(common-objpfx)version.mk -distinfo := $(wildcard $(subdirs:%=../%/distinfo)) +distinfo := $(common-objpfx)distinfo- \ + $(wildcard $(subdirs:%=$(common-objpfx)distinfo-%)) -include $(distinfo) config = $(config-machine)-$(config-vendor)-$(config-os) |