Makefile.in: Rebuilt.

	* external/sax/Makefile.in: Rebuilt.
	* external/sax/Makefile.am (all-local): Removed.
	(BUILT_SOURCES): New variable.
	(mostlyclean-local): No error if no classes to delete.
	* external/w3c_dom/Makefile.in: Rebuilt.
	* external/w3c_dom/Makefile.am (all-local): Removed.
	(BUILT_SOURCES): New variable.
	(mostlyclean-local): No error if no classes to delete.

From-SVN: r94838

5 files changed, 61 insertions, 44 deletions

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 6c5b802..c17af7b 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,14 @@
+2005-02-10  Tom Tromey  <tromey@redhat.com>
+
+	* external/sax/Makefile.in: Rebuilt.
+	* external/sax/Makefile.am (all-local): Removed.
+	(BUILT_SOURCES): New variable.
+	(mostlyclean-local): No error if no classes to delete.
+	* external/w3c_dom/Makefile.in: Rebuilt.
+	* external/w3c_dom/Makefile.am (all-local): Removed.
+	(BUILT_SOURCES): New variable.
+	(mostlyclean-local): No error if no classes to delete.
+
 2005-02-10  Bryce McKinlay  <mckinlay@redhat.com>
 
 	* testsuite/libjava.mauve/xfails: Updated to reflect current state 
diff --git a/libjava/external/sax/Makefile.am b/libjava/external/sax/Makefile.am
index d6afe8c..d2d6ec9 100644
--- a/libjava/external/sax/Makefile.am
+++ b/libjava/external/sax/Makefile.am
@@ -15,7 +15,7 @@ AM_GCJFLAGS = \
 	--encoding=UTF-8 \
 	-Wno-deprecated
 
-all-local: classes.stamp
+BUILT_SOURCES = classes.stamp
 
 classes.stamp:	$(libsax_convenience_la_SOURCES)
 	here=`pwd`; cd $(srcdir); \
@@ -23,8 +23,8 @@ classes.stamp:	$(libsax_convenience_la_SOURCES)
 	echo > classes.stamp
 
 mostlyclean-local:
-	find . -name '*.class' | xargs rm
-	rm classes.stamp
+	-find . -name '*.class' | xargs rm
+	-rm classes.stamp
 
 noinst_LTLIBRARIES = libsax_convenience.la
 
diff --git a/libjava/external/sax/Makefile.in b/libjava/external/sax/Makefile.in
index d1c3219..a4b95da 100644
--- a/libjava/external/sax/Makefile.in
+++ b/libjava/external/sax/Makefile.in
@@ -336,6 +336,7 @@ AM_GCJFLAGS = \
 	--encoding=UTF-8 \
 	-Wno-deprecated
 
+BUILT_SOURCES = classes.stamp
 noinst_LTLIBRARIES = libsax_convenience.la
 libsax_convenience_la_SOURCES = \
 org/xml/sax/SAXNotSupportedException.java \
@@ -375,7 +376,8 @@ org/xml/sax/DocumentHandler.java \
 org/xml/sax/DTDHandler.java \
 org/xml/sax/Parser.java
 
-all: all-am
+all: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) all-am
 
 .SUFFIXES:
 .SUFFIXES: .java .lo .o .obj
@@ -749,10 +751,12 @@ distdir: $(DISTFILES)
 	  fi; \
 	done
 check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES) all-local
+check: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) check-am
+all-am: Makefile $(LTLIBRARIES)
 installdirs:
-install: install-am
+install: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) install-am
 install-exec: install-exec-am
 install-data: install-data-am
 uninstall: uninstall-am
@@ -782,6 +786,7 @@ distclean-generic:
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
+	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
 clean: clean-am
 
 clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
@@ -833,29 +838,27 @@ ps-am:
 
 uninstall-am: uninstall-info-am
 
-.PHONY: CTAGS GTAGS all all-am all-local check check-am clean \
-	clean-generic clean-libtool clean-noinstLTLIBRARIES ctags \
-	distclean distclean-compile distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-exec install-exec-am install-info \
-	install-info-am install-man install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool mostlyclean-local pdf \
-	pdf-am ps ps-am tags uninstall uninstall-am uninstall-info-am
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-noinstLTLIBRARIES ctags distclean \
+	distclean-compile distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-exec \
+	install-exec-am install-info install-info-am install-man \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	mostlyclean-local pdf pdf-am ps ps-am tags uninstall \
+	uninstall-am uninstall-info-am
 
 
-all-local: classes.stamp
-
 classes.stamp:	$(libsax_convenience_la_SOURCES)
 	here=`pwd`; cd $(srcdir); \
 	$(GCJ_WITH_FLAGS) -C -d $$here $(libsax_convenience_la_SOURCES)
 	echo > classes.stamp
 
 mostlyclean-local:
-	find . -name '*.class' | xargs rm
-	rm classes.stamp
+	-find . -name '*.class' | xargs rm
+	-rm classes.stamp
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/libjava/external/w3c_dom/Makefile.am b/libjava/external/w3c_dom/Makefile.am
index 8cf62e4..37ba574 100644
--- a/libjava/external/w3c_dom/Makefile.am
+++ b/libjava/external/w3c_dom/Makefile.am
@@ -15,7 +15,7 @@ AM_GCJFLAGS = \
 	--encoding=UTF-8 \
 	-Wno-deprecated
 
-all-local: classes.stamp
+BUILT_SOURCES = classes.stamp
 
 classes.stamp:	$(libw3c_convenience_la_SOURCES)
 	here=`pwd`; cd $(srcdir); \
@@ -23,8 +23,8 @@ classes.stamp:	$(libw3c_convenience_la_SOURCES)
 	echo > classes.stamp
 
 mostlyclean-local:
-	find . -name '*.class' | xargs rm
-	rm classes.stamp
+	-find . -name '*.class' | xargs rm
+	-rm classes.stamp
 
 noinst_LTLIBRARIES = libw3c_convenience.la
 
diff --git a/libjava/external/w3c_dom/Makefile.in b/libjava/external/w3c_dom/Makefile.in
index bb52ab7..56842d9 100644
--- a/libjava/external/w3c_dom/Makefile.in
+++ b/libjava/external/w3c_dom/Makefile.in
@@ -430,6 +430,7 @@ AM_GCJFLAGS = \
 	--encoding=UTF-8 \
 	-Wno-deprecated
 
+BUILT_SOURCES = classes.stamp
 noinst_LTLIBRARIES = libw3c_convenience.la
 libw3c_convenience_la_SOURCES = \
 org/w3c/dom/xpath/XPathNamespace.java \
@@ -579,7 +580,8 @@ org/w3c/dom/Text.java \
 org/w3c/dom/DocumentType.java \
 org/w3c/dom/DOMImplementationSource.java
 
-all: all-am
+all: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) all-am
 
 .SUFFIXES:
 .SUFFIXES: .java .lo .o .obj
@@ -1623,10 +1625,12 @@ distdir: $(DISTFILES)
 	  fi; \
 	done
 check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES) all-local
+check: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) check-am
+all-am: Makefile $(LTLIBRARIES)
 installdirs:
-install: install-am
+install: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) install-am
 install-exec: install-exec-am
 install-data: install-data-am
 uninstall: uninstall-am
@@ -1672,6 +1676,7 @@ distclean-generic:
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
+	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
 clean: clean-am
 
 clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
@@ -1723,29 +1728,27 @@ ps-am:
 
 uninstall-am: uninstall-info-am
 
-.PHONY: CTAGS GTAGS all all-am all-local check check-am clean \
-	clean-generic clean-libtool clean-noinstLTLIBRARIES ctags \
-	distclean distclean-compile distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-exec install-exec-am install-info \
-	install-info-am install-man install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool mostlyclean-local pdf \
-	pdf-am ps ps-am tags uninstall uninstall-am uninstall-info-am
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-noinstLTLIBRARIES ctags distclean \
+	distclean-compile distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-exec \
+	install-exec-am install-info install-info-am install-man \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	mostlyclean-local pdf pdf-am ps ps-am tags uninstall \
+	uninstall-am uninstall-info-am
 
 
-all-local: classes.stamp
-
 classes.stamp:	$(libw3c_convenience_la_SOURCES)
 	here=`pwd`; cd $(srcdir); \
 	$(GCJ_WITH_FLAGS) -C -d $$here $(libw3c_convenience_la_SOURCES)
 	echo > classes.stamp
 
 mostlyclean-local:
-	find . -name '*.class' | xargs rm
-	rm classes.stamp
+	-find . -name '*.class' | xargs rm
+	-rm classes.stamp
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT: