diff options
| author | mkoch <mkoch@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-01-24 20:34:41 +0000 |
|---|---|---|
| committer | mkoch <mkoch@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-01-24 20:34:41 +0000 |
| commit | 345ecef4d5ae14f3ab485a8763bf27d3b066b3d1 (patch) | |
| tree | 296b1d66f858ee9bd1f7435cfc178bbd46f1b9a2 /libjava | |
| parent | ebc1f09c6376c84cc6b98238916e9f7ed16c767d (diff) | |
| download | gcc-345ecef4d5ae14f3ab485a8763bf27d3b066b3d1.tar.gz | |
2004-01-24 Michael Koch <konqueror@gmx.de>
* Makefile.am: Added library version to gtk peer lib.
* Makefile.in: Regenerated.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@76520 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/Makefile.am | 3 | ||||
| -rw-r--r-- | libjava/Makefile.in | 4 |
3 files changed, 11 insertions, 1 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 089caa912c4..c23266d7ee6 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,5 +1,10 @@ 2004-01-24 Michael Koch <konqueror@gmx.de> + * Makefile.am: Added library version to gtk peer lib. + * Makefile.in: Regenerated. + +2004-01-24 Michael Koch <konqueror@gmx.de> + * java/util/zip/InflaterInputStream.java: Merged class documentation with classpath. diff --git a/libjava/Makefile.am b/libjava/Makefile.am index 5d89aefc8cc..43cb2bcdadc 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -281,6 +281,9 @@ jni/classpath/native_state.h \ jni/classpath/primlib.h lib_gnu_java_awt_peer_gtk_la_LIBADD = $(GTK_LIBS) $(GLIB_LIBS) $(LIBART_LIBS) $(CAIRO_LIBS) $(PANGOFT2_LIBS) +lib_gnu_java_awt_peer_gtk_la_LDFLAGS = \ +## The mysterious backslash is consumed by make. + -version-info `grep -v '^\#' $(srcdir)/libtool-version` lib_org_w3c_dom_la_SOURCES = org/w3c/dom/Attr.java \ org/w3c/dom/CDATASection.java \ diff --git a/libjava/Makefile.in b/libjava/Makefile.in index e0fc8001398..2b2c3a0befb 100644 --- a/libjava/Makefile.in +++ b/libjava/Makefile.in @@ -370,6 +370,9 @@ jni/classpath/primlib.h lib_gnu_java_awt_peer_gtk_la_LIBADD = $(GTK_LIBS) $(GLIB_LIBS) $(LIBART_LIBS) $(CAIRO_LIBS) $(PANGOFT2_LIBS) +lib_gnu_java_awt_peer_gtk_la_LDFLAGS = \ + -version-info `grep -v '^\#' $(srcdir)/libtool-version` + lib_org_w3c_dom_la_SOURCES = org/w3c/dom/Attr.java \ org/w3c/dom/CDATASection.java \ @@ -2728,7 +2731,6 @@ org/w3c/dom/traversal/DocumentTraversal.lo \ org/w3c/dom/traversal/NodeFilter.lo \ org/w3c/dom/traversal/NodeIterator.lo \ org/w3c/dom/traversal/TreeWalker.lo -lib_gnu_java_awt_peer_gtk_la_LDFLAGS = lib_gnu_java_awt_peer_gtk_la_DEPENDENCIES = @GTK_CAIRO_FALSE@lib_gnu_java_awt_peer_gtk_la_OBJECTS = \ @GTK_CAIRO_FALSE@gnu/java/awt/peer/gtk/GdkClasspathFontPeer.lo \ |