|
 |
f28b6a |
2007-10-16 Jakub Jelinek <jakub@redhat.com>
|
|
|
f28b6a |
|
|
|
f28b6a |
* Makefile.am (libgcj_tools_la_LIBADD): Add.
|
|
|
f28b6a |
* Makefile.in: Regenerated.
|
|
|
f28b6a |
|
|
|
f28b6a |
--- libjava/Makefile.am.jj 2009-05-06 08:14:50.000000000 +0200
|
|
|
f28b6a |
+++ libjava/Makefile.am 2009-05-06 10:26:43.000000000 +0200
|
|
|
f28b6a |
@@ -314,6 +314,8 @@ libgcj_tools_la_SOURCES = classpath/tool
|
|
|
f28b6a |
libgcj_tools_la_GCJFLAGS = $(AM_GCJFLAGS) -findirect-dispatch \
|
|
|
f28b6a |
-fno-bootstrap-classes -fno-indirect-classes \
|
|
|
f28b6a |
-fsource-filename=$(here)/classpath/tools/all-classes.lst
|
|
|
f28b6a |
+## See jv_convert_LDADD.
|
|
|
f28b6a |
+libgcj_tools_la_LIBADD = -L$(here)/.libs libgcj.la
|
|
|
f28b6a |
libgcj_tools_la_LDFLAGS = -rpath $(toolexeclibdir) \
|
|
|
f28b6a |
-version-info `grep -v '^\#' $(srcdir)/libtool-version` \
|
|
|
f28b6a |
$(LIBGCJ_LD_SYMBOLIC_FUNCTIONS)
|
|
|
f28b6a |
--- libjava/Makefile.in.jj 2009-05-06 08:14:49.000000000 +0200
|
|
|
f28b6a |
+++ libjava/Makefile.in 2009-05-06 10:27:18.000000000 +0200
|
|
|
f28b6a |
@@ -160,7 +160,6 @@ am__objects_1 = gnu/gcj/xlib/lib_gnu_awt
|
|
|
f28b6a |
am_lib_gnu_awt_xlib_la_OBJECTS = $(am__objects_1)
|
|
|
f28b6a |
lib_gnu_awt_xlib_la_OBJECTS = $(am_lib_gnu_awt_xlib_la_OBJECTS)
|
|
|
f28b6a |
@XLIB_AWT_TRUE@am_lib_gnu_awt_xlib_la_rpath = -rpath $(toolexeclibdir)
|
|
|
f28b6a |
-libgcj_tools_la_LIBADD =
|
|
|
f28b6a |
am_libgcj_tools_la_OBJECTS = classpath/tools/libgcj_tools_la-tools.lo
|
|
|
f28b6a |
libgcj_tools_la_OBJECTS = $(am_libgcj_tools_la_OBJECTS)
|
|
|
f28b6a |
@INTERPRETER_TRUE@am__DEPENDENCIES_1 = gnu/classpath/jdwp.lo \
|
|
|
f28b6a |
@@ -1041,6 +1040,7 @@ libgcj_tools_la_GCJFLAGS = $(AM_GCJFLAGS
|
|
|
f28b6a |
-fno-bootstrap-classes -fno-indirect-classes \
|
|
|
f28b6a |
-fsource-filename=$(here)/classpath/tools/all-classes.lst
|
|
|
f28b6a |
|
|
|
f28b6a |
+libgcj_tools_la_LIBADD = -L$(here)/.libs libgcj.la
|
|
|
f28b6a |
libgcj_tools_la_LDFLAGS = -rpath $(toolexeclibdir) \
|
|
|
f28b6a |
-version-info `grep -v '^\#' $(srcdir)/libtool-version` \
|
|
|
f28b6a |
$(LIBGCJ_LD_SYMBOLIC_FUNCTIONS)
|