From: Roland McGrath <roland@gnu.org>
Date: Sun, 20 Jun 2004 01:42:52 +0000 (+0000)
Subject: 2004-06-18  Roland McGrath  <roland@frob.com>
X-Git-Tag: upstream/2.30~17858
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b960842876ae1d7f777045a9871dc866b6052bdc;p=external%2Fglibc.git

2004-06-18  Roland McGrath  <roland@frob.com>

	* Makerules (compile-mkdep-flags): Add -MT $@.
	* Makefile (dist, tag-for-dist): New targets.
	(files-for-dist, tag-of-stem): New variables.
	(glibc-%.tar glibc-linuxthreads-%.tar): New pattern rule.
	Make tar files using cvs export.
	(%.bz2, %.gz, tag-%): New pattern rules.
	(distribute): Variable removed.
	(+subdir_targets): Remove distinfo targets.
	(echo_subdirs, echo-distinfo, parent_echo-distinfo): Targets removed.
	(rpm/%): Pattern rule removed.
	* rpm/Makefile, rpm/rpmrc, rpm/template: Ancient cruft files removed.
	* Rules (subdir_echo-headers, subdir_echo-distinfo, subdir_dist):
	Targets removed.
	* Makerules (dist, subdir_distinfo): Targets removed.
	($(objpfx)distinfo): Depend on $(distribute).
	* Make-dist: File removed.
---

diff --git a/Makerules b/Makerules
index 72ce04a..c29c340 100644
--- a/Makerules
+++ b/Makerules
@@ -364,7 +364,7 @@ endif # $(versioning) = yes
 endif # sysd-sorted-done
 
 # Generate .dT files as we compile.
-compile-mkdep-flags = -MD -MP -MF $@.dt
+compile-mkdep-flags = -MD -MP -MF $@.dt -MT $@
 compile-command.S = $(compile.S) $(OUTPUT_OPTION) $(compile-mkdep-flags)
 compile-command.s = $(COMPILE.s) $< $(OUTPUT_OPTION) $(compile-mkdep-flags)
 compile-command.c = $(compile.c) $(OUTPUT_OPTION) $(compile-mkdep-flags)
@@ -1399,27 +1399,13 @@ else
 	> $@
 endif
 
-# Make the distribution tar file.
-
-.PHONY: dist
-dist: $(objpfx)distinfo $(..)Make-dist
-	$(MAKE) -f $< -f $(word 2,$^) $(Make-dist-args)
-
-# Avoid depending on source files found in sysdeps dirs,
-# because the references affect implicit rule selection.
-dist: $(filter-out %.c %.S %.s,$(distribute))
-
-# We used to simply export all these variables, but that frequently made the
-# 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).
+# This information is not used for making distributions any more.
+# But it's used by MakeTAGS for making TAGS files and the .pot files.
 $(objpfx)distinfo: Makefile $(..)Makerules \
 		   $(wildcard $(foreach dir,$(sysdirs),$(dir)/Makefile))
 	$(make-target-directory)
 	$(distinfo-vars)
 	mv -f $@.new $@
-.PHONY: subdir_distinfo
-subdir_distinfo: $(objpfx)distinfo
 
 define distinfo-vars
 rm -f $@.new