From b5142d8ae86610ed587103b22c33e1f3b46e8edc Mon Sep 17 00:00:00 2001 From: Michael Koch Date: Sat, 24 Jan 2004 20:34:41 +0000 Subject: Makefile.am: Added library version to gtk peer lib. 2004-01-24 Michael Koch * Makefile.am: Added library version to gtk peer lib. * Makefile.in: Regenerated. From-SVN: r76520 --- libjava/ChangeLog | 5 +++++ libjava/Makefile.am | 3 +++ libjava/Makefile.in | 4 +++- 3 files changed, 11 insertions(+), 1 deletion(-) (limited to 'libjava') diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 089caa9..c23266d 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,5 +1,10 @@ 2004-01-24 Michael Koch + * Makefile.am: Added library version to gtk peer lib. + * Makefile.in: Regenerated. + +2004-01-24 Michael Koch + * java/util/zip/InflaterInputStream.java: Merged class documentation with classpath. diff --git a/libjava/Makefile.am b/libjava/Makefile.am index 5d89aef..43cb2bc 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 e0fc800..2b2c3a0 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 \ -- cgit v1.1