2007-10-16 14:18:55 +00:00
|
|
|
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
|
2008-07-28 18:51:52 +00:00
|
|
|
@@ -277,6 +277,8 @@ EXTRA_libgcj_la_SOURCES = java/lang/Obje
|
2007-10-16 14:18:55 +00:00
|
|
|
|
|
|
|
|
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) \
|
2008-07-28 18:51:52 +00:00
|
|
|
-version-info `grep -v '^\#' $(srcdir)/libtool-version` \
|
|
|
|
|
$(LIBGCJ_LD_SYMBOLIC_FUNCTIONS)
|
2007-10-16 14:18:55 +00:00
|
|
|
--- libjava/Makefile.in.jj 2007-07-04 21:11:11.000000000 +0200
|
|
|
|
|
+++ libjava/Makefile.in 2007-10-16 15:56:07.000000000 +0200
|
2008-07-28 18:51:52 +00:00
|
|
|
@@ -153,7 +153,6 @@ am__objects_1 = gnu/gcj/xlib/lib_gnu_awt
|
2007-10-16 14:18:55 +00:00
|
|
|
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)
|
2008-07-28 18:51:52 +00:00
|
|
|
@INTERPRETER_TRUE@am__DEPENDENCIES_1 = gnu/classpath/jdwp.lo \
|
|
|
|
|
@@ -941,6 +940,7 @@ libgcj_la_LINK = $(LIBLINK)
|
2007-10-16 14:18:55 +00:00
|
|
|
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) \
|
2008-07-28 18:51:52 +00:00
|
|
|
-version-info `grep -v '^\#' $(srcdir)/libtool-version` \
|
|
|
|
|
$(LIBGCJ_LD_SYMBOLIC_FUNCTIONS)
|
