OSDN Git Service

libjava/classpath:
authortromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>
Wed, 5 Apr 2006 22:47:51 +0000 (22:47 +0000)
committertromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>
Wed, 5 Apr 2006 22:47:51 +0000 (22:47 +0000)
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.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@112724 138bc75d-0d04-0410-961f-82ee72b054a4

libjava/ChangeLog
libjava/Makefile.am
libjava/Makefile.in
libjava/classpath/ChangeLog.gcj
libjava/classpath/lib/Makefile.am
libjava/classpath/lib/Makefile.in

index d093585..4944a65 100644 (file)
@@ -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
index 3deaa7e..8b4b66b 100644 (file)
@@ -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
 
index 9851dd1..3398033 100644 (file)
@@ -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
 
index 735a2a5..2aee0c9 100644 (file)
@@ -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.
index c9e0019..a075837 100644 (file)
@@ -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)
index de14acf..1fe90d3 100644 (file)
@@ -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