* libtool-version: New file.

	* Makefile.in: Rebuilt.
	* Makefile.am (libgcj_la_LDFLAGS): Use -version-info, not
	-release.

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

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 924f6c4..09740cd 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,5 +1,10 @@
 1999-05-07  Tom Tromey  <tromey@cygnus.com>
 
+       * libtool-version: New file.
+       * Makefile.in: Rebuilt.
+       * Makefile.am (libgcj_la_LDFLAGS): Use -version-info, not
+       -release.
+
        * mauve-libgcj: Don't omit Utf8Encoding or StringTest.
        Comment out FieldPosition, ParsePosition, and SimpleDateFormat
        again (oops).

diff --git a/libjava/Makefile.am b/libjava/Makefile.am
index b64ce93..e376901 100644 (file)
--- a/libjava/Makefile.am
+++ b/libjava/Makefile.am
@@ -93,7 +93,9 @@ libgcj_la_DEPENDENCIES = libgcj.zip $(javao_files) $(nat_files) \
        $(c_files) $(GCOBJS) $(THREADOBJS)
 libgcj_la_LIBADD = $(javao_files) $(nat_files) $(c_files) $(GCOBJS) \
        $(THREADOBJS)
-libgcj_la_LDFLAGS = -rpath $(toolexeclibdir) -release $(VERSION)
+libgcj_la_LDFLAGS = -rpath $(toolexeclibdir) \
+## The mysterious backslash is consumed by make.
+       -version-info `grep -v '^\#' $(srcdir)/libtool-version`
 
 ## Make the .class files depend on the .zip file.  This seems
 ## backwards, but is right.  This doesn't catch all the .class files,

diff --git a/libjava/Makefile.in b/libjava/Makefile.in
index 5c9bf0a..6dd1cd3 100644 (file)
--- a/libjava/Makefile.in
+++ b/libjava/Makefile.in
@@ -160,7 +160,9 @@ libgcj_la_DEPENDENCIES = libgcj.zip $(javao_files) $(nat_files) \
 libgcj_la_LIBADD = $(javao_files) $(nat_files) $(c_files) $(GCOBJS) \
        $(THREADOBJS)
 
-libgcj_la_LDFLAGS = -rpath $(toolexeclibdir) -release $(VERSION)
+libgcj_la_LDFLAGS = -rpath $(toolexeclibdir) \
+       -version-info `grep -v '^\#' $(srcdir)/libtool-version`
+
 
 MOSTLYCLEANFILES = $(javao_files) $(nat_files) $(nat_headers) $(c_files)
 CLEANFILES = libgcj.zip
@@ -225,6 +227,50 @@ gnu/gcj/convert/UnicodeToBytes.java
 
 special_java_source_files = java/lang/Class.java java/lang/Object.java
 
+awt_java_source_files = \
+java/awt/AWTEvent.java \
+java/awt/BorderLayout.java \
+java/awt/Component.java \
+java/awt/Container.java \
+java/awt/Dimension.java \
+java/awt/Event.java \
+java/awt/Font.java \
+java/awt/Frame.java \
+java/awt/LayoutManager.java \
+java/awt/LayoutManager2.java \
+java/awt/Menu.java \
+java/awt/MenuBar.java \
+java/awt/MenuItem.java \
+java/awt/MenuComponent.java \
+java/awt/MenuContainer.java \
+java/awt/Point.java \
+java/awt/Rectangle.java \
+java/awt/Shape.java \
+java/awt/TextArea.java \
+java/awt/TextComponent.java \
+java/awt/Toolkit.java \
+java/awt/Window.java \
+java/awt/event/ActionEvent.java \
+java/awt/event/ActionListener.java \
+java/awt/event/ComponentEvent.java \
+java/awt/event/InputEvent.java \
+java/awt/event/KeyEvent.java \
+java/awt/event/KeyListener.java \
+java/awt/event/TextEvent.java \
+java/awt/event/TextListener.java \
+java/awt/event/WindowAdapter.java \
+java/awt/event/WindowEvent.java \
+java/awt/event/WindowListener.java \
+java/awt/geom/Point2D.java \
+java/awt/geom/Dimension2D.java \
+java/awt/peer/ComponentPeer.java \
+java/awt/peer/ContainerPeer.java \
+java/awt/peer/FramePeer.java \
+java/awt/peer/WindowPeer.java
+
+
+# $(awt_java_source_files)
+
 ordinary_java_source_files = $(convert_source_files) \
 gnu/gcj/text/BaseBreakIterator.java \
 gnu/gcj/text/CharacterBreakIterator.java \
@@ -237,6 +283,7 @@ gnu/gcj/protocol/file/Connection.java \
 gnu/gcj/protocol/file/Handler.java \
 gnu/gcj/protocol/http/Connection.java \
 gnu/gcj/protocol/http/Handler.java \
+gnu/gcj/RawData.java \
 java/io/BufferedInputStream.java \
 java/io/BufferedOutputStream.java \
 java/io/BufferedReader.java \
@@ -445,10 +492,12 @@ java/util/zip/CRC32.java \
 java/util/zip/Checksum.java \
 java/util/zip/Deflater.java \
 java/util/zip/DeflaterOutputStream.java        \
+java/util/zip/InflaterInputStream.java \
 java/util/zip/ZipConstants.java        \
 java/util/zip/ZipEntry.java \
 java/util/zip/ZipException.java        \
 java/util/zip/ZipFile.java \
+java/util/zip/ZipInputStream.java \
 java/util/zip/ZipOutputStream.java
 
 
@@ -470,6 +519,8 @@ c_source_files = \
   java/lang/k_cos.c       java/lang/s_sin.c
 
 
+#java/awt/natToolkit.cc
+
 nat_source_files = \
 gnu/gcj/convert/JIS0208_to_Unicode.cc \
 gnu/gcj/convert/JIS0212_to_Unicode.cc \
@@ -597,8 +648,9 @@ GZIP_ENV = --best
 DIST_SUBDIRS =  testsuite
 DEP_FILES =  .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \
 .deps/$(srcdir)/$(CONVERT_DIR)/make-trie.P .deps/boehm.P \
-.deps/exception.P .deps/gnu/gcj/convert/BytesToUnicode.P \
-.deps/gnu/gcj/convert/Convert.P .deps/gnu/gcj/convert/Input_8859_1.P \
+.deps/exception.P .deps/gnu/gcj/RawData.P \
+.deps/gnu/gcj/convert/BytesToUnicode.P .deps/gnu/gcj/convert/Convert.P \
+.deps/gnu/gcj/convert/Input_8859_1.P \
 .deps/gnu/gcj/convert/Input_EUCJIS.P \
 .deps/gnu/gcj/convert/Input_JavaSrc.P \
 .deps/gnu/gcj/convert/Input_SJIS.P .deps/gnu/gcj/convert/Input_UTF8.P \
@@ -763,8 +815,10 @@ DEP_FILES =  .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \
 .deps/java/util/zip/Adler32.P .deps/java/util/zip/CRC32.P \
 .deps/java/util/zip/Checksum.P .deps/java/util/zip/Deflater.P \
 .deps/java/util/zip/DeflaterOutputStream.P \
+.deps/java/util/zip/InflaterInputStream.P \
 .deps/java/util/zip/ZipConstants.P .deps/java/util/zip/ZipEntry.P \
 .deps/java/util/zip/ZipException.P .deps/java/util/zip/ZipFile.P \
+.deps/java/util/zip/ZipInputStream.P \
 .deps/java/util/zip/ZipOutputStream.P .deps/jni.P .deps/no-threads.P \
 .deps/nogc.P .deps/posix-threads.P .deps/prims.P
 SOURCES = $(libgcj_la_SOURCES) $(EXTRA_libgcj_la_SOURCES) $(jv_convert_SOURCES) $(EXTRA_jv_convert_SOURCES) $(gen_from_JIS_SOURCES) $(EXTRA_gen_from_JIS_SOURCES)

diff --git a/libjava/libtool-version b/libjava/libtool-version
new file mode 100644 (file)
index 0000000..30263df
--- /dev/null
+++ b/libjava/libtool-version
@@ -0,0 +1,6 @@
+# This file is used to maintain libtool version info for libgcj.  See
+# the libtool manual to understand the meaning of the fields.  This is
+# a separate file so that version updates don't involve re-running
+# automake.
+# CURRENT:REVISION:AGE
+0:0:0