aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libjava/ChangeLog6
-rw-r--r--libjava/Makefile.am1
-rw-r--r--libjava/Makefile.in3
3 files changed, 9 insertions, 1 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 05673a6..7a38887 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+2004-08-21 Andreas Tobler <a.tobler@schweiz.ch>
+ Michael Koch <konqueror@gmx.de>
+
+ * Makefile.am (lib_gnu_java_awt_peer_gtk_la_LINK): Added.
+ * Makefile.in: Regenerated.
+
2004-08-20 Michael Koch <konqueror@gmx.de>
* configure.ac: Replaced all AC_TRY_COMPILE macros with
diff --git a/libjava/Makefile.am b/libjava/Makefile.am
index 2127c49..486ebd6 100644
--- a/libjava/Makefile.am
+++ b/libjava/Makefile.am
@@ -350,6 +350,7 @@ lib_gnu_java_awt_peer_gtk_la_DEPENDENCIES = $(gtk_jni_headers) libgcj-@gcc_versi
## The mysterious backslash in the grep pattern is consumed by make.
lib_gnu_java_awt_peer_gtk_la_LDFLAGS = \
-version-info `grep -v '^\#' $(srcdir)/libtool-version`
+lib_gnu_java_awt_peer_gtk_la_LINK = $(LIBLINK)
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 2c918b0..d474141 100644
--- a/libjava/Makefile.in
+++ b/libjava/Makefile.in
@@ -4252,6 +4252,7 @@ lib_gnu_java_awt_peer_gtk_la_DEPENDENCIES = $(gtk_jni_headers) libgcj-@gcc_versi
lib_gnu_java_awt_peer_gtk_la_LDFLAGS = \
-version-info `grep -v '^\#' $(srcdir)/libtool-version`
+lib_gnu_java_awt_peer_gtk_la_LINK = $(LIBLINK)
lib_org_w3c_dom_la_SOURCES = org/w3c/dom/Attr.java \
org/w3c/dom/CDATASection.java \
org/w3c/dom/CharacterData.java \
@@ -7083,7 +7084,7 @@ jni/classpath/lib_gnu_java_awt_peer_gtk_la-primlib.lo: \
jni/classpath/$(am__dirstamp) \
jni/classpath/$(DEPDIR)/$(am__dirstamp)
lib-gnu-java-awt-peer-gtk.la: $(lib_gnu_java_awt_peer_gtk_la_OBJECTS) $(lib_gnu_java_awt_peer_gtk_la_DEPENDENCIES)
- $(GCJLINK) $(am_lib_gnu_java_awt_peer_gtk_la_rpath) $(lib_gnu_java_awt_peer_gtk_la_LDFLAGS) $(lib_gnu_java_awt_peer_gtk_la_OBJECTS) $(lib_gnu_java_awt_peer_gtk_la_LIBADD) $(LIBS)
+ $(lib_gnu_java_awt_peer_gtk_la_LINK) $(am_lib_gnu_java_awt_peer_gtk_la_rpath) $(lib_gnu_java_awt_peer_gtk_la_LDFLAGS) $(lib_gnu_java_awt_peer_gtk_la_OBJECTS) $(lib_gnu_java_awt_peer_gtk_la_LIBADD) $(LIBS)
org/w3c/dom/$(am__dirstamp):
@$(mkdir_p) org/w3c/dom
@: > org/w3c/dom/$(am__dirstamp)