Patch to remove more EGCS references
Joseph S. Myers
jsm28@cam.ac.uk
Sat Nov 4 17:50:00 GMT 2000
On Sat, 4 Nov 2000, Mark Mitchell wrote:
> Well, we really should have a way of building a source distribution,
> and that's what `make dist' is for. I assume that we're going to use
> some version of the snapshot script, instead?
There must be some such script which was used to build the 2.95
distributions, since the present "make dist" targets are simply irrelevant
to the current source tree structure and instead relate to a 2.8
structure.
> Anyhow, yes, let's go ahead and nuke these. We'll need some way of
> generating a source distribution for the release, but I think it will
> likely be a separate script that does `cvs export' followed by
> generating some files.
Here is the patch.
Bootstrapped with no regressions on i686-pc-linux-gnu. OK to commit?
gcc/ChangeLog:
2000-11-05 Joseph S. Myers <jsm28@cam.ac.uk>
* Makefile.in: Remove all targets related to building
distributions and diffs, or INSTALL.
* INSTALL, install1.texi: Remove.
* configure.in: Remove mention of distdir.
* configure: Regenerate.
* objc/Make-lang.in: Remove mention of distdir.
gcc/ch/ChangeLog:
2000-11-05 Joseph S. Myers <jsm28@cam.ac.uk>
* Make-lang.in (CHILL.distdir): Remove.
gcc/cp/ChangeLog:
2000-11-05 Joseph S. Myers <jsm28@cam.ac.uk>
* Make-lang.in (c++.distdir): Remove.
gcc/f/ChangeLog:
2000-11-05 Joseph S. Myers <jsm28@cam.ac.uk>
* Make-lang.in: Remove f77.distdir and f/INSTALL.
* INSTALL, install0.texi: Remove.
gcc/java/ChangeLog:
2000-11-05 Joseph S. Myers <jsm28@cam.ac.uk>
* Make-lang.in (java.distdir): Remove.
--- Makefile.in.orig Fri Nov 3 23:01:52 2000
+++ Makefile.in Sat Nov 4 00:18:47 2000
@@ -49,7 +49,7 @@
# Languages should create dependencies of $(INTL_TARGETS) on generated
# sources in Make-lang.in. Example:
# $(INTL_TARGETS): $(srcdir)/cp/parse.c
-INTL_TARGETS = intl.all intl.install intl.distdir
+INTL_TARGETS = intl.all intl.install
# Selection of languages to be made during stage1 build.
# This is overridden by configure.
@@ -700,7 +700,6 @@
"bindir=$(bindir)" \
"libsubdir=$(libsubdir)" \
"datadir=$(datadir)" \
- "distdir=../tmp/\$$(subdir)" \
"localedir=$(localedir)"
FLAGS_TO_PASS = $(ORDINARY_FLAGS_TO_PASS) "CC=@cc_set_by_configure@"
PREPEND_DOTDOT_TO_RELATIVE_PATHS = sed \
@@ -831,7 +830,7 @@
# all.build, all.cross, start.encap, rest.encap,
# info, dvi,
# install-normal, install-common, install-info, install-man,
-# uninstall, distdir,
+# uninstall,
# mostlyclean, clean, distclean, extraclean, maintainer-clean,
# stage1, stage2, stage3, stage4
#
@@ -893,7 +892,7 @@
# config.status does not exist before failing.
config.status: $(srcdir)/configure version.c
@if [ ! -f config.status ] ; then \
- echo You must configure gcc. Look at the INSTALL file for details.; \
+ echo You must configure gcc. Look at http://gcc.gnu.org/install/ for details.; \
false; \
else \
LANGUAGES="$(CONFIG_LANGUAGES)" $(SHELL) config.status --recheck; \
@@ -1815,7 +1814,7 @@
# Make sure all the headers are there for xgettext to scan.
$(INTL_TARGETS): $(srcdir)/c-parse.c
-intl.all intl.install intl.uninstall intl.distdir \
+intl.all intl.install intl.uninstall \
intl.mostlyclean intl.clean intl.distclean intl.maintainer-clean:
@for d in $(INTL_SUBDIRS); do \
target=`expr $@ : 'intl.\(.*\)'` && \
@@ -1824,12 +1823,6 @@
if [ $$? -eq 0 ] ; then true ; else exit 1 ; fi ; \
done
-# intl.distdir doesn't copy the intl makefiles (since they aren't distributed),
-# but we need them for the `make extraclean' in distdir-finish.
-intl.distdir-fixup:
- for d in $(INTL_SUBDIRS); do \
- ln $$d/Makefile tmp/$$d || cp $$d/Makefile tmp/$$d || exit; \
- done
#
# Remake cpp and protoize.
@@ -2161,10 +2154,6 @@
texindex cpp.??
TEXINPUTS=${texidir}:$(srcdir):$$TEXINPUTS tex cpp.texi
-
-INSTALL: $(srcdir)/install1.texi $(srcdir)/install.texi
- (cd $(srcdir) && $(MAKEINFO) -D INSTALLONLY \
- --no-split --no-headers -o INSTALL install1.texi)
#
# Deletion of files made during compilation.
# There are four levels of this:
@@ -2719,106 +2708,6 @@
etags *.y *.h *.c; \
mv tmp-tags/* .; \
rmdir tmp-tags)
-
-# Create the distribution tar.gz file.
-dist: tmp-gcc.xtar
- gzip --best < tmp-gcc.xtar > tmp-gcc.xtar.gz
- mv tmp-gcc.xtar.gz gcc-$(version).tar.gz
-
-tmp-gcc.xtar: distdir
-# Make the distribution.
- tar -chf tmp-gcc.xtar gcc-$(version)
-
-distdir-cvs: force
- if [ -d $(srcdir)/CVS ]; then (cd $(srcdir) && cvs -r update); fi
-
-# This target exists to do the initial work before the language specific
-# stuff gets done.
-distdir-start: doc $(srcdir)/INSTALL $(srcdir)/c-parse.y \
- $(srcdir)/c-parse.c $(srcdir)/config.in $(srcdir)/version.c TAGS
- @case '$(USE_NLS)' in \
- yes) ;; \
- *) echo "configure with --enable-nls before making a distribution"; \
- exit 1;; \
- esac
- @if grep -s "for version ${mainversion}" gcc.texi > /dev/null; \
- then true; \
- else echo "You must update the version number in \`gcc.texi'"; sleep 10;\
- fi
-# Update the version number in README
- $(AWK) '$$1 " " $$2 " " $$3 == "This directory contains" \
- { $$6 = version; print $$0 } \
- $$1 " " $$2 " " $$3 != "This directory contains"' \
- version=$(version) $(srcdir)/README > tmp.README
- mv tmp.README README
- -rm -rf gcc-$(version) tmp
-# Put all the files in a temporary subdirectory
-# which has the name that we want to have in the tar file.
- mkdir tmp
- mkdir tmp/config
- mkdir tmp/ginclude
- mkdir tmp/objc
- mkdir tmp/intl
- mkdir tmp/po
- for file in `(cd $(srcdir) && echo *[0-9a-zA-Z+])`; do \
- test -f $(srcdir)/$$file && $(LN_S) $(srcdir)/$$file tmp; \
- done
- if test "$(srcdir)" != "." ; then \
- for file in c-parse.c ; do \
- test -f ./$$file && $(LN_S) ../$$file tmp; \
- done; \
- fi
- for file in `(cd $(srcdir)/config && echo *[0-9a-zA-Z+])`; do \
- if test -d $(srcdir)/config/$$file \
- && test "$$file" != RCS && test "$$file" != CVS; then \
- mkdir tmp/config/$$file; \
- for subfile in `(cd $(srcdir)/config/$$file && echo *[0-9a-zA-Z+])`; do \
- $(LN_S) $(srcdir)/config/$$file/$$subfile tmp/config/$$file; \
- done; \
- else \
- $(LN_S) $(srcdir)/config/$$file tmp/config; \
- fi; \
- done
- for file in `(cd $(srcdir)/ginclude && echo *[0-9a-zA-Z+])`; do \
- $(LN_S) $(srcdir)/ginclude/$$file tmp/ginclude; \
- done
- for file in `(cd $(srcdir)/objc && echo *[0-9a-zA-Z+])`; do \
- $(LN_S) $(srcdir)/objc/$$file tmp/objc; \
- done
- $(LN_S) .gdbinit tmp
-
-# Finish making `distdir', after the languages have done their thing.
-distdir-finish:
- mv tmp gcc-$(version)
-# Get rid of everything we don't want in the distribution. We'd want
-# this to use Makefile.in, but it doesn't have the `lang.foo' targets
-# expanded.
- (cd gcc-$(version) && make extraclean distdir-check VERSION_DEP=)
-
-distdir-check:
- ($(AWK) '/^[^#]/{print} /^#[A-Za-z]/{print substr($$1, 2)}' | sort) \
- < po/POTFILES.in > tmp.POTFILES
- ls [A-Za-z]*.[ch] [a-z]*/[A-Za-z]*.[ch] \
- [a-z]*/[a-z]*/[A-Za-z]*.[ch] | sort > tmp.src
- diff tmp.POTFILES tmp.src || { \
- echo "po/POTFILES.in and sources do not match -- please fix"; \
- exit 1; \
- }
- rm -f tmp.*
-
-distdir: distdir-cvs distdir-start intl.distdir intl.distdir-fixup \
- lang.distdir distdir-finish
-
-# make diff oldversion=M.N
-# creates a diff file between an older distribution and this one.
-# The -P option assumes this is GNU diff.
-diff:
- diff -rc2P -x c-parse.y -x c-parse.c \
- -x TAGS -x INSTALL -x configure -x config.in \
- -x "gcc.??" -x "gcc.??s" -x gcc.aux -x "gcc.info*" \
- -x "cpp.??" -x "cpp.??s" -x cpp.aux -x "cpp.info*" \
- $(LANG_DIFF_EXCLUDES) \
- gcc-$(oldversion) gcc-$(version) > gcc-$(oldversion)-$(version).diff
# A list of files to be destroyed during "lean" builds.
VOL_FILES=`echo $(BACKEND) $(OBJS) $(C_OBJS) $(LIBCPP_OBJS) *.c *.h gen*`
--- configure.in.orig Thu Nov 2 22:26:31 2000
+++ configure.in Sat Nov 4 00:15:52 2000
@@ -5033,7 +5033,7 @@
target_list="all.build all.cross start.encap rest.encap \
info dvi \
install-normal install-common install-info install-man \
- uninstall distdir \
+ uninstall \
mostlyclean clean distclean extraclean maintainer-clean \
stage1 stage2 stage3 stage4"
for t in $target_list
--- ch/Make-lang.in.orig Fri Nov 3 23:01:52 2000
+++ ch/Make-lang.in Sat Nov 4 00:21:47 2000
@@ -24,7 +24,7 @@
# foo.all.build, foo.all.cross, foo.start.encap, foo.rest.encap,
# foo.info, foo.dvi,
# foo.install-normal, foo.install-common, foo.install-info, foo.install-man,
-# foo.uninstall, foo.distdir,
+# foo.uninstall,
# foo.mostlyclean, foo.clean, foo.distclean, foo.extraclean,
# foo.maintainer-clean, foo.stage1, foo.stage2, foo.stage3, foo.stage4
#
@@ -184,15 +184,3 @@
-mv ch/*.o stage3/ch
CHILL.stage4: stage4-start
-mv ch/*.o stage4/ch
-#
-# Maintenance hooks:
-
-# This target creates the files that can be rebuilt, but go in the
-# distribution anyway. It then copies the files to the distdir directory.
-CHILL.distdir:
- mkdir tmp/ch
- cd ch ; $(MAKE) $(LANG_FLAGS_TO_PASS) $(CXX_FLAGS_TO_PASS) hash.h
- cd ch; \
- for file in *[0-9a-zA-Z+]; do \
- ln $$file ../tmp/ch >/dev/null 2>&1 || cp $$file ../tmp/ch; \
- done
--- cp/Make-lang.in.orig Fri Oct 27 21:41:18 2000
+++ cp/Make-lang.in Sat Nov 4 00:21:43 2000
@@ -25,7 +25,7 @@
# foo.all.build, foo.all.cross, foo.start.encap, foo.rest.encap,
# foo.info, foo.dvi,
# foo.install-normal, foo.install-common, foo.install-info, foo.install-man,
-# foo.uninstall, foo.distdir,
+# foo.uninstall,
# foo.mostlyclean, foo.clean, foo.distclean, foo.extraclean,
# foo.maintainer-clean, foo.stage1, foo.stage2, foo.stage3, foo.stage4
#
@@ -225,24 +225,6 @@
-mv cp/*$(objext) stage3/cp
c++.stage4: stage4-start
-mv cp/*$(objext) stage4/cp
-#
-# Maintenance hooks:
-
-# This target creates the files that can be rebuilt, but go in the
-# distribution anyway. It then copies the files to the distdir directory.
-c++.distdir:
- mkdir tmp/cp
- mkdir tmp/cp/inc
- cd cp ; $(MAKE) $(LANG_FLAGS_TO_PASS) $(CXX_FLAGS_TO_PASS) parse.c hash.h
- cd cp; \
- for file in *[0-9a-zA-Z+]; do \
- $(LN) $$file ../tmp/cp; \
- done
- cd cp/inc; \
- for file in *[0-9a-zA-Z+]; do \
- ln $$file ../../tmp/cp/inc >/dev/null 2>&1 \
- || cp $$file ../../tmp/cp/inc; \
- done
#
# .o: .h dependencies.
--- f/Make-lang.in.orig Fri Oct 27 21:41:21 2000
+++ f/Make-lang.in Sat Nov 4 00:21:37 2000
@@ -24,7 +24,7 @@
# foo.all.build, foo.all.cross, foo.start.encap, foo.rest.encap,
# foo.info, foo.dvi,
# foo.install-normal, foo.install-common, foo.install-info, foo.install-man,
-# foo.uninstall, foo.distdir,
+# foo.uninstall,
# foo.mostlyclean, foo.clean, foo.distclean, foo.extraclean,
# foo.maintainer-clean, foo.stage1, foo.stage2, foo.stage3, foo.stage4
#
@@ -56,7 +56,7 @@
f77.install-normal \
f77.install-common f77.install-info f77.install-man \
f77.uninstall f77.mostlyclean f77.clean f77.distclean \
- f77.extraclean f77.maintainer-clean f77.distdir f77.rebuilt \
+ f77.extraclean f77.maintainer-clean f77.rebuilt \
f77.stage1 f77.stage2 f77.stage3 f77.stage4
g77spec.o: $(srcdir)/f/g77spec.c $(srcdir)/f/version.h system.h $(GCC_H)
@@ -233,15 +233,11 @@
cd $(srcdir)/f; $(MAKEINFO) -D BUGSONLY --no-header --no-split \
--no-validate -o BUGS bugs0.texi
-$(srcdir)/f/INSTALL: f/install0.texi f/g77install.texi f/root.texi
- cd $(srcdir)/f; $(MAKEINFO) -D INSTALLONLY --no-header --no-split \
- --no-validate -o INSTALL install0.texi
-
$(srcdir)/f/NEWS: f/news0.texi f/news.texi f/root.texi
cd $(srcdir)/f; $(MAKEINFO) -D NEWSONLY --no-header --no-split \
--no-validate -o NEWS news0.texi
-f77.rebuilt: f/g77.info $(srcdir)/f/BUGS $(srcdir)/f/INSTALL \
+f77.rebuilt: f/g77.info $(srcdir)/f/BUGS \
$(srcdir)/f/NEWS
#
@@ -364,7 +360,7 @@
-rm -f lang-f77 f/Makefile
f77.extraclean:
f77.maintainer-clean:
- -rm -f f/g77.info* f/g77.*aux f/TAGS f/BUGS f/INSTALL f/NEWS f/intdoc.texi
+ -rm -f f/g77.info* f/g77.*aux f/TAGS f/BUGS f/NEWS f/intdoc.texi
#
# Stage hooks:
# The main makefile has already created stage?/f.
@@ -387,23 +383,6 @@
f77.stage4: stage4-start
-if [ -f lang-f77 ]; then \
mv -f $(G77STAGESTUFF) stage4/f; \
- fi
-#
-# Maintenance hooks:
-
-# This target creates the files that can be rebuilt, but go in the
-# distribution anyway. It then copies the files to the distdir directory.
-f77.distdir: f77.rebuilt
- case "$(LANGUAGES)" in \
- *[fF]77*) touch lang-f77;; \
- *) rm -f lang-f77;; \
- esac
- -if [ -f lang-f77 ]; then \
- mkdir tmp/f; \
- cd f; \
- for file in *[0-9a-zA-Z+]; do \
- $(LN_S) $$file ../tmp/f; \
- done; \
fi
#
--- java/Make-lang.in.orig Fri Nov 3 23:54:41 2000
+++ java/Make-lang.in Sat Nov 4 00:21:20 2000
@@ -29,7 +29,7 @@
# foo.all.build, foo.all.cross, foo.start.encap, foo.rest.encap,
# foo.info, foo.dvi,
# foo.install-normal, foo.install-common, foo.install-info, foo.install-man,
-# foo.uninstall, foo.distdir,
+# foo.uninstall,
# foo.mostlyclean, foo.clean, foo.distclean, foo.extraclean,
# foo.maintainer-clean, foo.stage1, foo.stage2, foo.stage3, foo.stage4
#
@@ -209,17 +209,6 @@
-mv java/*$(objext) stage3/java
java.stage4: stage4-start
-mv java/*$(objext) stage4/java
-#
-# Maintenance hooks:
-
-# This target creates the files that can be rebuilt, but go in the
-# distribution anyway. It then copies the files to the distdir directory.
-java.distdir: java/parse.c java/hash.h
- mkdir tmp/java
- cd java; \
- for file in *[0-9a-zA-Z+]; do \
- ln $$file ../tmp/java >/dev/null 2>&1 || cp $$file ../tmp/java; \
- done
#
# .o:.h dependencies.
--- objc/Make-lang.in.orig Fri Oct 27 21:41:22 2000
+++ objc/Make-lang.in Sat Nov 4 00:22:10 2000
@@ -24,7 +24,7 @@
# foo.all.build, foo.all.cross, foo.start.encap, foo.rest.encap,
# foo.info, foo.dvi,
# foo.install-normal, foo.install-common, foo.install-info, foo.install-man,
-# foo.uninstall, foo.distdir,
+# foo.uninstall,
# foo.mostlyclean, foo.clean, foo.distclean, foo.extraclean,
# foo.maintainer-clean, foo.stage1, foo.stage2, foo.stage3, foo.stage4
#
@@ -141,15 +141,3 @@
objc.stage4: stage4-start
-mv objc/*$(objext) stage4/objc
-mv cc1obj$(exeext) stage4
-
-#
-# Maintenance hooks:
-
-# This target creates the files that can be rebuilt, but go in the
-# distribution anyway. It then copies the files to the distdir directory.
-objc.distdir: $(srcdir)/objc/objc-parse.c
- mkdir tmp/objc
- cd objc; \
- for file in *[0-9a-zA-Z+]; do \
- ln $$file ../tmp/objc >/dev/null 2>&1 || cp $$file ../tmp/objc; \
- done
--
Joseph S. Myers
jsm28@cam.ac.uk
More information about the Gcc-patches
mailing list