diff options
| author | sayle <sayle@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-03-06 19:48:10 +0000 |
|---|---|---|
| committer | sayle <sayle@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-03-06 19:48:10 +0000 |
| commit | 3973824c435113a69d6281235f5f911b71daad8f (patch) | |
| tree | 0ea3d94bbaff6815a5b7e74f5bbd5388c625288b /libjava/Makefile.in | |
| parent | c3b3a67b005e9d28ac9e9482a32ba07fbcd00e69 (diff) | |
| download | gcc-3973824c435113a69d6281235f5f911b71daad8f.tar.gz | |
PR libgcj/20155
* Makefile.am (libgcj0_convenience.la): Revert last change.
* Makefile.in: Regenerate.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@95984 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/Makefile.in')
| -rw-r--r-- | libjava/Makefile.in | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/libjava/Makefile.in b/libjava/Makefile.in index 86285aa39ca..4e114c7dc97 100644 --- a/libjava/Makefile.in +++ b/libjava/Makefile.in @@ -329,7 +329,7 @@ am__DEPENDENCIES_2 = gnu/regexp/MessagesBundle.properties.lo \ am__DEPENDENCIES_3 = $(am__DEPENDENCIES_2) am_libgcj_la_OBJECTS = libgcj_la_OBJECTS = $(am_libgcj_la_OBJECTS) -libgcj0_convenience_la_DEPENDENCIES = +libgcj0_convenience_la_LIBADD = am__libgcj0_convenience_la_SOURCES_DIST = prims.cc jni.cc exception.cc \ link.cc defineclass.cc interpret.cc verify.cc \ gnu/gcj/natCore.cc gnu/gcj/convert/JIS0208_to_Unicode.cc \ @@ -5173,9 +5173,6 @@ libgcj0_convenience_la_SOURCES = prims.cc jni.cc exception.cc \ $(DARWIN_CRT_SRC) \ $(POSIX_THREAD_SRC) $(WIN32_THREAD_SRC) $(NO_THREAD_SRC) -libgcj0_convenience_la_LDFLAGS = -libgcj0_convenience_la_LIBADD = -libgcj0_convenience_la_LINK = $(LIBLINK) noinst_LTLIBRARIES = libgcj0_convenience.la libgcj_la_SOURCES = nat_files = $(nat_source_files:.cc=.lo) @@ -16147,6 +16144,8 @@ sysdep/$(DEPDIR)/$(am__dirstamp): @: > sysdep/$(DEPDIR)/$(am__dirstamp) sysdep/dwarf2-backtrace.lo: sysdep/$(am__dirstamp) \ sysdep/$(DEPDIR)/$(am__dirstamp) +libgcj0_convenience.la: $(libgcj0_convenience_la_OBJECTS) $(libgcj0_convenience_la_DEPENDENCIES) + $(GCJLINK) $(libgcj0_convenience_la_LDFLAGS) $(libgcj0_convenience_la_OBJECTS) $(libgcj0_convenience_la_LIBADD) $(LIBS) libgij.la: $(libgij_la_OBJECTS) $(libgij_la_DEPENDENCIES) $(CXXLINK) -rpath $(toolexeclibdir) $(libgij_la_LDFLAGS) $(libgij_la_OBJECTS) $(libgij_la_LIBADD) $(LIBS) libjawt.la: $(libjawt_la_OBJECTS) $(libjawt_la_DEPENDENCIES) @@ -26670,7 +26669,6 @@ mostlyclean-local: clean-local: find . -name '*.class' -print | xargs rm -f - find . -name '*.objectlist' -print | xargs rm -f distclean-local: find . -name '*.d' -print | xargs rm -f @@ -26695,14 +26693,6 @@ libgcj.la: $(libgcj_la_OBJECTS) $(libgcj_la_DEPENDENCIES) $(libgcj_la_LIBADD) \ -rpath $(toolexeclibdir) $(libgcj_la_LDFLAGS) $(LIBS) -libgcj0_convenience.la: $(libgcj0_convenience_la_OBJECTS) $(libgcj0_convenience_la_DEPENDENCIES) - @echo Creating list of files to link... - @: $(call write_entries_to_file,$(libgcj0_convenience_la_OBJECTS),libgcj0_convenience.objectlist) - $(libgcj0_convenience_la_LINK) \ - -objectlist libgcj0_convenience.objectlist \ - $(libgcj0_convenience_la_LIBADD) \ - -rpath $(toolexeclibdir) $(libgcj0_convenience_la_LDFLAGS) $(LIBS) - lib-gnu-awt-xlib.la: $(lib_gnu_awt_xlib_la_OBJECTS) $(lib_gnu_awt_xlib_la_DEPENDENCIES) @echo Creating list of files to link... @: $(call write_entries_to_file,$(lib_gnu_awt_xlib_la_OBJECTS) $(lib_gnu_awt_xlib_la_LIBADD),lib_gnu_awt_xlib.objectlist) |