qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* 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.
This commit is contained in:
Roland McGrath 1996-06-18 22:23:37 +00:00
parent 96383fc79d
commit 36dbcbc98d
3 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,5 +1,12 @@
Tue Jun 18 17:56:44 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu> 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. * rpm/Makefile (clean): New target.
* stdlib/test-canon.c: New test program contributed by David Mosberger. * stdlib/test-canon.c: New test program contributed by David Mosberger.

12
Makerules
View File

@ -739,10 +739,10 @@ endif
check: tests check: tests
.PHONY: TAGS .PHONY: TAGS
TAGS: distinfo $(..)MakeTAGS TAGS: $(common-objpfx)distinfo-$(subdir) $(..)MakeTAGS
$(MAKE) $(addprefix -f ,$^) $@ $(MAKE) $(addprefix -f ,$^) $@
$(..)po/%.pot: distinfo $(..)MakeTAGS FORCE $(..)po/%.pot: $(common-objpfx)distinfo-$(subdir) $(..)MakeTAGS FORCE
$(MAKE) $(addprefix -f ,$(filter-out FORCE,$^)) $@ $(MAKE) $(addprefix -f ,$(filter-out FORCE,$^)) $@
FORCE: FORCE:
@ -774,6 +774,7 @@ endef
# Also remove the dependencies and generated source files. # Also remove the dependencies and generated source files.
common-clean: common-mostlyclean common-clean: common-mostlyclean
-rm -f $(addprefix $(objpfx),$(generated)) $(+depfiles) -rm -f $(addprefix $(objpfx),$(generated)) $(+depfiles)
-rm -f $(common-objpfx)distinfo-$(subdir)
# Produce a file `stub-$(subdir)' which contains `#define __stub_FUNCTION' # Produce a file `stub-$(subdir)' which contains `#define __stub_FUNCTION'
# for each function which is a stub. We grovel over all the .d files # 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. # Make the distribution tar file.
.PHONY: dist .PHONY: dist
dist: distinfo $(..)Make-dist dist: $(common-objpfx)distinfo-$(subdir) $(..)Make-dist
$(MAKE) -f $< -f $(word 2,$^) $(Make-dist-args) $(MAKE) -f $< -f $(word 2,$^) $(Make-dist-args)
# Avoid depending on source files found in sysdeps dirs, # 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 # environment get too large. Instead, we write all the information into
# a generated makefile fragment `distinfo', and then include it with -f in # a generated makefile fragment `distinfo', and then include it with -f in
# the sub-make that makes the distribution (above). # the sub-make that makes the distribution (above).
distinfo: Makefile $(..)Makerules $(common-objpfx)distinfo-$(subdir): Makefile $(..)Makerules
$(distinfo-vars) $(distinfo-vars)
mv -f $@.new $@ mv -f $@.new $@
.PHONY: subdir_distinfo .PHONY: subdir_distinfo distinfo
subdir_distinfo: distinfo subdir_distinfo: distinfo
distinfo: $(common-objpfx)distinfo-$(subdir)
define distinfo-vars define distinfo-vars
rm -f $@.new rm -f $@.new

3
rpm/Makefile
View File

@ -9,7 +9,8 @@ include ../Makeconfig
include $(common-objpfx)soversions.mk include $(common-objpfx)soversions.mk
include $(common-objpfx)version.mk include $(common-objpfx)version.mk
distinfo := $(wildcard $(subdirs:%=../%/distinfo)) distinfo := $(common-objpfx)distinfo- \
$(wildcard $(subdirs:%=$(common-objpfx)distinfo-%))
-include $(distinfo) -include $(distinfo)
config = $(config-machine)-$(config-vendor)-$(config-os) config = $(config-machine)-$(config-vendor)-$(config-os)