re PR libgcj/26625 (libgcj-4.2.0.jar not rebuilt after a source file change)

libjava/classpath:
	PR libgcj/26625:
	* lib/Makefile.in: Rebuilt.
	* lib/Makefile.am (compile-classes): Touch the output file.
libjava:
	PR libgcj/26625:
	* Makefile.in: Rebuilt.
	* Makefile.am (libgcj-$(gcc_version).jar): Depend on
	classpath/lib/compile-classes.

From-SVN: r112724

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index d09358556c813fead7d7617a237634365ccb44d7..4944a6595e48cbed2e89af8c1dc3a064f13ade5d 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,10 @@
+2006-04-05  Tom Tromey  <tromey@redhat.com>
+
+       PR libgcj/26625:
+       * Makefile.in: Rebuilt.
+       * Makefile.am (libgcj-$(gcc_version).jar): Depend on
+       classpath/lib/compile-classes.
+
 2006-04-05  Ranjit Mathew  <rmathew@gcc.gnu.org>
 
        * configure.host: Add -fno-omit-frame-pointer to libgcj_flags for

diff --git a/libjava/Makefile.am b/libjava/Makefile.am
index 3deaa7eb1e14b3ccb0660901553d1efa79d6d9c8..8b4b66b64dad8afd2cfc07e33a596d688cfd6604 100644 (file)
--- a/libjava/Makefile.am
+++ b/libjava/Makefile.am
@@ -320,7 +320,7 @@ $(propertyo_files): %.lo: classpath/resource/%
        $(mkinstalldirs) `dirname $@`; \
        $(LTGCJCOMPILE) -o $@ -c $< -Wc,--resource,$(@:.lo=)
 
-libgcj-$(gcc_version).jar:
+libgcj-$(gcc_version).jar: classpath/lib/compile-classes
        cd classpath/lib; $(JAR) -cfM \
            ../../libgcj-$(gcc_version).jar gnu java javax org
 

diff --git a/libjava/Makefile.in b/libjava/Makefile.in
index 9851dd16b4960f5bf31611e50baa474abdff8b42..3398033bd7c322269a4babb91015bfddef47b22f 100644 (file)
--- a/libjava/Makefile.in
+++ b/libjava/Makefile.in
@@ -8422,7 +8422,7 @@ $(propertyo_files): %.lo: classpath/resource/%
        $(mkinstalldirs) `dirname $@`; \
        $(LTGCJCOMPILE) -o $@ -c $< -Wc,--resource,$(@:.lo=)
 
-libgcj-$(gcc_version).jar:
+libgcj-$(gcc_version).jar: classpath/lib/compile-classes
        cd classpath/lib; $(JAR) -cfM \
            ../../libgcj-$(gcc_version).jar gnu java javax org
 

diff --git a/libjava/classpath/ChangeLog.gcj b/libjava/classpath/ChangeLog.gcj
index 735a2a5bf648362a627c440991654628193b1ebb..2aee0c9ffcc8d3a7d30df249de7bc9702fd6355c 100644 (file)
--- a/libjava/classpath/ChangeLog.gcj
+++ b/libjava/classpath/ChangeLog.gcj
@@ -1,3 +1,9 @@
+2006-04-05  Tom Tromey  <tromey@redhat.com>
+
+       PR libgcj/26625:
+       * lib/Makefile.in: Rebuilt.
+       * lib/Makefile.am (compile-classes): Touch the output file.
+
 2006-04-04  Tom Tromey  <tromey@redhat.com>
 
        * lib/gen-classlist.sh.in: Correct handle generated files.

diff --git a/libjava/classpath/lib/Makefile.am b/libjava/classpath/lib/Makefile.am
index c9e00191eb708a67dcffd6e1672ab3360de7e705..a075837718716ace14055a437ec22aeaafc2859a 100644 (file)
--- a/libjava/classpath/lib/Makefile.am
+++ b/libjava/classpath/lib/Makefile.am
@@ -151,6 +151,7 @@ compile-classes: classes $(JAVA_SRCS) Makefile
          GCJ='$(GCJ)' \
          compile_classpath='$(top_builddir):$(compile_classpath)' \
          top_srcdir=$(top_srcdir)
+       touch compile-classes
 else
 compile-classes: classes $(JAVA_SRCS) Makefile
        $(JAVAC)

diff --git a/libjava/classpath/lib/Makefile.in b/libjava/classpath/lib/Makefile.in
index de14acf55993b97c7b9e25d3b3ed537292956099..1fe90d33e5c60f1048799f5902558811f73a5c70 100644 (file)
--- a/libjava/classpath/lib/Makefile.in
+++ b/libjava/classpath/lib/Makefile.in
@@ -537,6 +537,7 @@ $(JAVA_DEPEND): genclasses
 @FOUND_GCJ_TRUE@         GCJ='$(GCJ)' \
 @FOUND_GCJ_TRUE@         compile_classpath='$(top_builddir):$(compile_classpath)' \
 @FOUND_GCJ_TRUE@         top_srcdir=$(top_srcdir)
+@FOUND_GCJ_TRUE@       touch compile-classes
 @FOUND_GCJ_FALSE@compile-classes: classes $(JAVA_SRCS) Makefile
 @FOUND_GCJ_FALSE@      $(JAVAC)
 @FOUND_GCJ_FALSE@      touch compile-classes