This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
Patch: FYI: sax/w3c_dom Makefile tweak
- From: Tom Tromey <tromey at redhat dot com>
- To: Java Patch List <java-patches at gcc dot gnu dot org>
- Date: 10 Feb 2005 11:27:05 -0700
- Subject: Patch: FYI: sax/w3c_dom Makefile tweak
- Reply-to: tromey at redhat dot com
I'm checking this in.
The other day I did a make clean and then a rebuild, and the build
failed. The problem was due to ordering; there is no guarantee that
the sax and w3c_dom class files are built earlier than the object
files.
This patch fixes that problem. It also opportunistically fixes a
'make clean' buglet.
Tom
Index: ChangeLog
from 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.
Index: external/sax/Makefile.am
===================================================================
RCS file: /cvs/gcc/gcc/libjava/external/sax/Makefile.am,v
retrieving revision 1.1
diff -u -r1.1 Makefile.am
--- external/sax/Makefile.am 2 Feb 2005 00:41:50 -0000 1.1
+++ external/sax/Makefile.am 10 Feb 2005 18:24:56 -0000
@@ -15,7 +15,7 @@
--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 @@
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
Index: external/w3c_dom/Makefile.am
===================================================================
RCS file: /cvs/gcc/gcc/libjava/external/w3c_dom/Makefile.am,v
retrieving revision 1.1
diff -u -r1.1 Makefile.am
--- external/w3c_dom/Makefile.am 2 Feb 2005 00:41:55 -0000 1.1
+++ external/w3c_dom/Makefile.am 10 Feb 2005 18:24:56 -0000
@@ -15,7 +15,7 @@
--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 @@
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