PATCH: gcc/Makefile.in

[Nathan Sidwell]

Hi,
attached is a patch to gcc/Makefile.in which allows `make
maintainer-clean' to work. The current behaviour causes config.cache to
disappear halfway through. (although INTL_DISTCLEAN is ok, the distclean
rule depends on clean, which causes intl.clean to happen)

Ok?

nathan
-- 
Dr Nathan Sidwell :: Computer Science Department :: Bristol University
        I have seen the death of PhotoShop -- it is called GIMP
nathan@acm.org  http://www.cs.bris.ac.uk/~nathan/  nathan@cs.bris.ac.uk
1999-09-21  Nathan Sidwell  <nathan@acm.org>

	* Makefile.in (INTL_MOSTLYCLEAN, INTL_CLEAN): New variables.
	(mostlyclean): Depend on INTL_MOSTLYCLEAN.
	(clean): Depend on INTL_CLEAN.
	(maintainer-clean): Adjust.

Index: gcc/Makefile.in
===================================================================
RCS file: /cvs/egcs/egcs/gcc/Makefile.in,v
retrieving revision 1.309
diff -c -3 -p -r1.309 Makefile.in
*** Makefile.in	1999/09/20 09:59:33	1.309
--- Makefile.in	1999/09/21 10:46:08
*************** INSTALL: $(srcdir)/install1.texi $(srcdi
*** 2304,2311 ****
  # We remove as much from the language subdirectories as we can
  # (less duplicated code).
  
! 
! mostlyclean: intl.mostlyclean lang.mostlyclean
  	-rm -f $(STAGESTUFF)
  # Delete the temporary source copies for cross compilation.
  	-rm -f $(HOST_PREFIX_1)rtl.c $(HOST_PREFIX_1)rtlanal.c
--- 2304,2311 ----
  # We remove as much from the language subdirectories as we can
  # (less duplicated code).
  
! INTL_MOSTLYCLEAN = intl.mostlyclean
! mostlyclean: $(INTL_MOSTLYCLEAN) lang.mostlyclean
  	-rm -f $(STAGESTUFF)
  # Delete the temporary source copies for cross compilation.
  	-rm -f $(HOST_PREFIX_1)rtl.c $(HOST_PREFIX_1)rtlanal.c
*************** mostlyclean: intl.mostlyclean lang.mostl
*** 2344,2350 ****
  
  # Delete all files made by compilation
  # that don't exist in the distribution.
! clean: mostlyclean intl.clean lang.clean
  # It may not be quite desirable to delete unprotoize.c here,
  # but the spec for `make clean' requires it.
  # Using unprotoize.c is not quite right in the first place,
--- 2344,2351 ----
  
  # Delete all files made by compilation
  # that don't exist in the distribution.
! INTL_CLEAN = intl.clean
! clean: mostlyclean $(INTL_CLEAN) lang.clean
  # It may not be quite desirable to delete unprotoize.c here,
  # but the spec for `make clean' requires it.
  # Using unprotoize.c is not quite right in the first place,
*************** extraclean: distclean lang.extraclean
*** 2405,2417 ****
  
  # Get rid of every file that's generated from some other file, except for `configure'.
  # Most of these files ARE PRESENT in the GCC distribution.
! # We define INTL_DISTCLEAN to be empty in the submake, so that
! # we don't descend into intl after its makefile has been removed.
  maintainer-clean:
  	@echo 'This command is intended for maintainers to use; it'
  	@echo 'deletes files that may need special tools to rebuild.'
! 	$(MAKE) INTL_DISTCLEAN= distclean \
! 		intl.maintainer-clean lang.maintainer-clean
  	-rm -f c-parse.y c-gperf.h
  	-rm -f c-parse.c c-parse.h c-parse.output
  	-rm -f cexp.c cexp.output TAGS
--- 2406,2419 ----
  
  # Get rid of every file that's generated from some other file, except for `configure'.
  # Most of these files ARE PRESENT in the GCC distribution.
! # We define INTL_DISTCLEAN, INTL_CLEAN & INTL_MOSTLYCLEAN to be empty in the
! # submake, so that we don't descend into intl after its makefile has been
! # removed.
  maintainer-clean:
  	@echo 'This command is intended for maintainers to use; it'
  	@echo 'deletes files that may need special tools to rebuild.'
! 	$(MAKE) INTL_DISTCLEAN= INTL_CLEAN= INTL_MOSTLYCLEAN= \
! 		intl.maintainer-clean lang.maintainer-clean distclean
  	-rm -f c-parse.y c-gperf.h
  	-rm -f c-parse.c c-parse.h c-parse.output
  	-rm -f cexp.c cexp.output TAGS