35 lines
1.8 KiB
Diff
35 lines
1.8 KiB
Diff
|
2007-10-16 Jakub Jelinek <jakub@redhat.com>
|
||
|
|
|
||
|
|
* Makefile.am (libgcj_tools_la_LIBADD): Add.
|
||
|
|
* Makefile.in: Regenerated.
|
||
|
|
|
||
|
|
--- libjava/Makefile.am.jj 2007-03-17 09:20:30.000000000 +0100
|
||
|
|
+++ libjava/Makefile.am 2007-10-16 15:45:14.000000000 +0200
|
||
|
|
@@ -262,6 +262,8 @@ EXTRA_libgcj_la_SOURCES = java/lang/Obje
|
||
|
|
|
||
|
|
libgcj_tools_la_SOURCES = classpath/tools/tools.zip
|
||
|
|
libgcj_tools_la_GCJFLAGS = $(AM_GCJFLAGS) -findirect-dispatch -fno-indirect-classes -fsource-filename=$(here)/classpath/tools/all-classes.lst
|
||
|
|
+## See jv_convert_LDADD.
|
||
|
|
+libgcj_tools_la_LIBADD = -L$(here)/.libs libgcj.la
|
||
|
|
libgcj_tools_la_LDFLAGS = -rpath $(toolexeclibdir) \
|
||
|
|
-version-info `grep -v '^\#' $(srcdir)/libtool-version`
|
||
|
|
libgcj_tools_la_DEPENDENCIES = libgcj.la libgcj.spec
|
||
|
|
--- libjava/Makefile.in.jj 2007-07-04 21:11:11.000000000 +0200
|
||
|
|
+++ libjava/Makefile.in 2007-10-16 15:56:07.000000000 +0200
|
||
|
|
@@ -146,7 +146,6 @@ am__objects_1 = gnu/gcj/xlib/lib_gnu_awt
|
||
|
|
am_lib_gnu_awt_xlib_la_OBJECTS = $(am__objects_1)
|
||
|
|
lib_gnu_awt_xlib_la_OBJECTS = $(am_lib_gnu_awt_xlib_la_OBJECTS)
|
||
|
|
@XLIB_AWT_TRUE@am_lib_gnu_awt_xlib_la_rpath = -rpath $(toolexeclibdir)
|
||
|
|
-libgcj_tools_la_LIBADD =
|
||
|
|
am_libgcj_tools_la_OBJECTS = classpath/tools/libgcj_tools_la-tools.lo
|
||
|
|
libgcj_tools_la_OBJECTS = $(am_libgcj_tools_la_OBJECTS)
|
||
|
|
am__DEPENDENCIES_1 = gnu/awt.lo gnu/awt/j2d.lo gnu/classpath.lo \
|
||
|
|
@@ -894,6 +893,7 @@ libgcj_la_LINK = $(LIBLINK)
|
||
|
|
EXTRA_libgcj_la_SOURCES = java/lang/Object.java
|
||
|
|
libgcj_tools_la_SOURCES = classpath/tools/tools.zip
|
||
|
|
libgcj_tools_la_GCJFLAGS = $(AM_GCJFLAGS) -findirect-dispatch -fno-indirect-classes -fsource-filename=$(here)/classpath/tools/all-classes.lst
|
||
|
|
+libgcj_tools_la_LIBADD = -L$(here)/.libs libgcj.la
|
||
|
|
libgcj_tools_la_LDFLAGS = -rpath $(toolexeclibdir) \
|
||
|
|
-version-info `grep -v '^\#' $(srcdir)/libtool-version`
|
||
|
|
|