aboutsummaryrefslogtreecommitdiff
path: root/libjava
diff options
context:
space:
mode:
authorTom Tromey <tromey@cygnus.com>1999-04-12 12:46:01 +0000
committerTom Tromey <tromey@gcc.gnu.org>1999-04-12 12:46:01 +0000
commitb6d3799173d96463ed69eedc0c477657781907ba (patch)
tree2fffa3058fc7145d60eaaa98adbe198b6bcd2e34 /libjava
parent9252355101080f9f944d869c465cade9287d0bd1 (diff)
downloadgcc-b6d3799173d96463ed69eedc0c477657781907ba.zip
gcc-b6d3799173d96463ed69eedc0c477657781907ba.tar.gz
gcc-b6d3799173d96463ed69eedc0c477657781907ba.tar.bz2
Makefile.in: Rebuilt.
* Makefile.in: Rebuilt. * Makefile.am (libgcj.zip): Put `gnu' classes into zip file. From-SVN: r26375
Diffstat (limited to 'libjava')
-rw-r--r--libjava/ChangeLog3
-rw-r--r--libjava/Makefile.am2
-rw-r--r--libjava/Makefile.in2
3 files changed, 5 insertions, 2 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 9025a3d..3beb48c 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,5 +1,8 @@
1999-04-12 Tom Tromey <tromey@cygnus.com>
+ * Makefile.in: Rebuilt.
+ * Makefile.am (libgcj.zip): Put `gnu' classes into zip file.
+
* java/lang/natSystem.cc (SystemClass): New define.
(init_properties): Synchronize.
diff --git a/libjava/Makefile.am b/libjava/Makefile.am
index eed9d2a..615ebd1 100644
--- a/libjava/Makefile.am
+++ b/libjava/Makefile.am
@@ -114,7 +114,7 @@ libgcj.zip: $(java_source_files)
$(subst $(srcdir)/,,$?)
-@rm -f libgcj.zip
## Note that we explicitly want to include directory information.
- $(ZIP) -r libgcj java -n .class -i '*.class' -i '*/'
+ $(ZIP) -r libgcj java gnu -n .class -i '*.class' -i '*/'
MOSTLYCLEANFILES = $(javao_files) $(nat_files) $(nat_headers) $(c_files)
CLEANFILES = libgcj.zip $(class_files)
diff --git a/libjava/Makefile.in b/libjava/Makefile.in
index 0d3993e..cd6da4c 100644
--- a/libjava/Makefile.in
+++ b/libjava/Makefile.in
@@ -1179,7 +1179,7 @@ libgcj.zip: $(java_source_files)
$$javac $(JCFLAGS) -classpath $(here):`/bin/pwd` -d $(here) \
$(subst $(srcdir)/,,$?)
-@rm -f libgcj.zip
- $(ZIP) -r libgcj java -n .class -i '*.class' -i '*/'
+ $(ZIP) -r libgcj java gnu -n .class -i '*.class' -i '*/'
.class.o:
CLASSPATH=$(here) $(CC) -fassume-compiled $(JC1FLAGS) -c -o $@ $<