From: Richard Henderson Date: Tue, 15 Feb 2005 17:17:44 +0000 (-0800) Subject: Makefile.am (libgcj_la_SOURCES): Move all sources ... X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=bbbf49551a0b414d679cba3a24fec5513e0c78ba;p=gcc.git Makefile.am (libgcj_la_SOURCES): Move all sources ... * Makefile.am (libgcj_la_SOURCES): Move all sources ... (libgcj0_convenience_la_SOURCES): ... here. (libgcj_la_LIBADD): Add libgcj0_convenience.la. (libgcj_la_DEPENDENCIES): Include libgcj_la_LIBADD. * Makefile.in: Regenerate. From-SVN: r95066 --- diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 1adfca2b70d..fa70cfc2854 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,11 @@ +2005-02-15 Richard Henderson + + * Makefile.am (libgcj_la_SOURCES): Move all sources ... + (libgcj0_convenience_la_SOURCES): ... here. + (libgcj_la_LIBADD): Add libgcj0_convenience.la. + (libgcj_la_DEPENDENCIES): Include libgcj_la_LIBADD. + * Makefile.in: Regenerate. + 2005-02-14 Thomas Fitzsimmons * jawt.c: New file. diff --git a/libjava/Makefile.am b/libjava/Makefile.am index 249388eabde..03e3450c10e 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -213,7 +213,11 @@ libgij_la_LIBADD = -L$(here)/.libs libgcj.la libgij_la_LDFLAGS = -rpath $(toolexeclibdir) \ -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LIBGCJ_LD_SYMBOLIC) -libgcj_la_SOURCES = prims.cc jni.cc exception.cc \ +# Work around libtool wanting to do piece-wise linking with -r. Using a +# convenience library suddenly invokes the --whole-archive path instead. +# This allows the build to succeed for targets that allocate multiple got +# subsections in the linker, such as Alpha and MIPS. +libgcj0_convenience_la_SOURCES = prims.cc jni.cc exception.cc \ link.cc defineclass.cc interpret.cc verify.cc \ $(nat_source_files) $(math_c_source_files) $(java_source_files) \ $(gnu_xml_source_files) $(built_java_source_files) \ @@ -222,9 +226,9 @@ libgcj_la_SOURCES = prims.cc jni.cc exception.cc \ $(POSIX_PLATFORM_SRC) $(WIN32_PLATFORM_SRC) $(ECOS_PLATFORM_SRC) \ $(DARWIN_CRT_SRC) \ $(POSIX_THREAD_SRC) $(WIN32_THREAD_SRC) $(NO_THREAD_SRC) -libgcj_la_DEPENDENCIES = libgcj-@gcc_version@.jar \ - java/lang/fdlibm.h java/lang/ieeefp.h java/lang/mprec.h \ - $(LIBLTDL) $(LIBFFI) $(ZLIBS) $(GCLIBS) $(propertyo_files) +noinst_LTLIBRARIES = libgcj0_convenience.la + +libgcj_la_SOURCES = ## Objects from C++ sources in subdirs. nat_files = $(nat_source_files:.cc=.lo) @@ -239,7 +243,11 @@ libgcj_la_LDFLAGS = -rpath $(toolexeclibdir) $(THREADLDFLAGS) $(THREADLIBS) \ libgcj_la_LIBADD = \ external/sax/libsax_convenience.la \ external/w3c_dom/libw3c_convenience.la \ + libgcj0_convenience.la \ $(LIBFFI) $(ZLIBS) $(GCLIBS) $(propertyo_files) +libgcj_la_DEPENDENCIES = libgcj-@gcc_version@.jar \ + java/lang/fdlibm.h java/lang/ieeefp.h java/lang/mprec.h \ + $(libgcj_la_LIBADD) libgcj_la_LINK = $(LIBLINK) # Gtk/Cairo JNI sources. diff --git a/libjava/Makefile.in b/libjava/Makefile.in index 064da74452c..7b311587cca 100644 --- a/libjava/Makefile.in +++ b/libjava/Makefile.in @@ -17,7 +17,7 @@ -SOURCES = $(lib_gnu_awt_xlib_la_SOURCES) $(lib_gnu_java_awt_peer_gtk_la_SOURCES) $(libgcj_la_SOURCES) $(libgij_la_SOURCES) $(libjawt_la_SOURCES) $(gcj_dbtool_SOURCES) $(gen_from_JIS_SOURCES) $(gij_SOURCES) $(grmic_SOURCES) $(grmiregistry_SOURCES) $(jv_convert_SOURCES) +SOURCES = $(lib_gnu_awt_xlib_la_SOURCES) $(lib_gnu_java_awt_peer_gtk_la_SOURCES) $(libgcj_la_SOURCES) $(libgcj0_convenience_la_SOURCES) $(libgij_la_SOURCES) $(libjawt_la_SOURCES) $(gcj_dbtool_SOURCES) $(gen_from_JIS_SOURCES) $(gij_SOURCES) $(grmic_SOURCES) $(grmiregistry_SOURCES) $(jv_convert_SOURCES) srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -95,7 +95,7 @@ am__installdirs = "$(DESTDIR)$(toolexeclibdir)" "$(DESTDIR)$(bindir)" \ "$(DESTDIR)$(bindir)" "$(DESTDIR)$(jardir)" \ "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(toolexecmainlibdir)" toolexeclibLTLIBRARIES_INSTALL = $(INSTALL) -LTLIBRARIES = $(toolexeclib_LTLIBRARIES) +LTLIBRARIES = $(noinst_LTLIBRARIES) $(toolexeclib_LTLIBRARIES) am__dirstamp = $(am__leading_dot)dirstamp am__objects_1 = gnu/gcj/xlib/Clip.lo gnu/gcj/xlib/Colormap.lo \ gnu/gcj/xlib/Display.lo gnu/gcj/xlib/Drawable.lo \ @@ -327,9 +327,12 @@ am__DEPENDENCIES_2 = gnu/regexp/MessagesBundle.properties.lo \ gnu/regexp/MessagesBundle_fr.properties.lo \ org/ietf/jgss/MessagesBundle.properties.lo am__DEPENDENCIES_3 = $(am__DEPENDENCIES_2) -am__libgcj_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 \ +am_libgcj_la_OBJECTS = +libgcj_la_OBJECTS = $(am_libgcj_la_OBJECTS) +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 \ gnu/gcj/convert/JIS0212_to_Unicode.cc \ gnu/gcj/convert/Unicode_to_JIS.cc gnu/gcj/convert/natIconv.cc \ gnu/gcj/convert/natInput_EUCJIS.cc \ @@ -4586,14 +4589,14 @@ am__objects_18 = java/lang/ConcreteProcess.lo \ @USING_POSIX_THREADS_TRUE@am__objects_26 = posix-threads.lo @USING_WIN32_THREADS_TRUE@am__objects_27 = win32-threads.lo @USING_NO_THREADS_TRUE@am__objects_28 = no-threads.lo -am_libgcj_la_OBJECTS = prims.lo jni.lo exception.lo link.lo \ - defineclass.lo interpret.lo verify.lo $(am__objects_6) \ +am_libgcj0_convenience_la_OBJECTS = prims.lo jni.lo exception.lo \ + link.lo defineclass.lo interpret.lo verify.lo $(am__objects_6) \ $(am__objects_7) $(am__objects_16) $(am__objects_17) \ $(am__objects_18) $(am__objects_19) $(am__objects_20) \ $(am__objects_21) $(am__objects_22) $(am__objects_23) \ $(am__objects_24) $(am__objects_25) $(am__objects_26) \ $(am__objects_27) $(am__objects_28) -libgcj_la_OBJECTS = $(am_libgcj_la_OBJECTS) +libgcj0_convenience_la_OBJECTS = $(am_libgcj0_convenience_la_OBJECTS) am_libgij_la_OBJECTS = gij.lo libgij_la_OBJECTS = $(am_libgij_la_OBJECTS) libjawt_la_DEPENDENCIES = lib-gnu-java-awt-peer-gtk.la @@ -4645,15 +4648,18 @@ LTGCJCOMPILE = $(LIBTOOL) --mode=compile $(GCJ) $(AM_GCJFLAGS) \ GCJLD = $(GCJ) SOURCES = $(lib_gnu_awt_xlib_la_SOURCES) \ $(lib_gnu_java_awt_peer_gtk_la_SOURCES) $(libgcj_la_SOURCES) \ - $(libgij_la_SOURCES) $(libjawt_la_SOURCES) \ - $(gcj_dbtool_SOURCES) $(gen_from_JIS_SOURCES) $(gij_SOURCES) \ - $(grmic_SOURCES) $(grmiregistry_SOURCES) $(jv_convert_SOURCES) + $(libgcj0_convenience_la_SOURCES) $(libgij_la_SOURCES) \ + $(libjawt_la_SOURCES) $(gcj_dbtool_SOURCES) \ + $(gen_from_JIS_SOURCES) $(gij_SOURCES) $(grmic_SOURCES) \ + $(grmiregistry_SOURCES) $(jv_convert_SOURCES) DIST_SOURCES = $(lib_gnu_awt_xlib_la_SOURCES) \ $(am__lib_gnu_java_awt_peer_gtk_la_SOURCES_DIST) \ - $(am__libgcj_la_SOURCES_DIST) $(libgij_la_SOURCES) \ - $(libjawt_la_SOURCES) $(gcj_dbtool_SOURCES) \ - $(am__gen_from_JIS_SOURCES_DIST) $(gij_SOURCES) \ - $(grmic_SOURCES) $(grmiregistry_SOURCES) $(jv_convert_SOURCES) + $(libgcj_la_SOURCES) \ + $(am__libgcj0_convenience_la_SOURCES_DIST) \ + $(libgij_la_SOURCES) $(libjawt_la_SOURCES) \ + $(gcj_dbtool_SOURCES) $(am__gen_from_JIS_SOURCES_DIST) \ + $(gij_SOURCES) $(grmic_SOURCES) $(grmiregistry_SOURCES) \ + $(jv_convert_SOURCES) RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ html-recursive info-recursive install-data-recursive \ install-exec-recursive install-info-recursive \ @@ -4994,7 +5000,12 @@ libgij_la_LIBADD = -L$(here)/.libs libgcj.la libgij_la_LDFLAGS = -rpath $(toolexeclibdir) \ -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LIBGCJ_LD_SYMBOLIC) -libgcj_la_SOURCES = prims.cc jni.cc exception.cc \ + +# Work around libtool wanting to do piece-wise linking with -r. Using a +# convenience library suddenly invokes the --whole-archive path instead. +# This allows the build to succeed for targets that allocate multiple got +# subsections in the linker, such as Alpha and MIPS. +libgcj0_convenience_la_SOURCES = prims.cc jni.cc exception.cc \ link.cc defineclass.cc interpret.cc verify.cc \ $(nat_source_files) $(math_c_source_files) $(java_source_files) \ $(gnu_xml_source_files) $(built_java_source_files) \ @@ -5004,10 +5015,8 @@ libgcj_la_SOURCES = prims.cc jni.cc exception.cc \ $(DARWIN_CRT_SRC) \ $(POSIX_THREAD_SRC) $(WIN32_THREAD_SRC) $(NO_THREAD_SRC) -libgcj_la_DEPENDENCIES = libgcj-@gcc_version@.jar \ - java/lang/fdlibm.h java/lang/ieeefp.h java/lang/mprec.h \ - $(LIBLTDL) $(LIBFFI) $(ZLIBS) $(GCLIBS) $(propertyo_files) - +noinst_LTLIBRARIES = libgcj0_convenience.la +libgcj_la_SOURCES = nat_files = $(nat_source_files:.cc=.lo) xlib_nat_files = $(xlib_nat_source_files:.cc=.lo) @@ -5020,8 +5029,13 @@ libgcj_la_LDFLAGS = -rpath $(toolexeclibdir) $(THREADLDFLAGS) $(THREADLIBS) \ libgcj_la_LIBADD = \ external/sax/libsax_convenience.la \ external/w3c_dom/libw3c_convenience.la \ + libgcj0_convenience.la \ $(LIBFFI) $(ZLIBS) $(GCLIBS) $(propertyo_files) +libgcj_la_DEPENDENCIES = libgcj-@gcc_version@.jar \ + java/lang/fdlibm.h java/lang/ieeefp.h java/lang/mprec.h \ + $(libgcj_la_LIBADD) + libgcj_la_LINK = $(LIBLINK) @GTK_CAIRO_FALSE@gtk_cairo_c_source_files = @@ -8023,6 +8037,15 @@ libgcj-test.spec: $(top_builddir)/config.status $(srcdir)/libgcj-test.spec.in cd $(top_builddir) && $(SHELL) ./config.status $@ gnu/classpath/Configuration.java: $(top_builddir)/config.status $(top_srcdir)/gnu/classpath/Configuration.java.in cd $(top_builddir) && $(SHELL) ./config.status $@ + +clean-noinstLTLIBRARIES: + -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) + @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ + test "$$dir" != "$$p" || dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done install-toolexeclibLTLIBRARIES: $(toolexeclib_LTLIBRARIES) @$(NORMAL_INSTALL) test -z "$(toolexeclibdir)" || $(mkdir_p) "$(DESTDIR)$(toolexeclibdir)" @@ -15648,6 +15671,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) @@ -25716,8 +25741,8 @@ maintainer-clean-generic: clean: clean-recursive clean-am: clean-binPROGRAMS clean-generic clean-libtool clean-local \ - clean-noinstPROGRAMS clean-toolexeclibLTLIBRARIES \ - mostlyclean-am + clean-noinstLTLIBRARIES clean-noinstPROGRAMS \ + clean-toolexeclibLTLIBRARIES mostlyclean-am distclean: distclean-recursive -rm -f $(am__CONFIG_DISTCLEAN_FILES) @@ -25776,15 +25801,15 @@ uninstall-info: uninstall-info-recursive .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \ check-am clean clean-binPROGRAMS clean-generic clean-libtool \ - clean-local clean-noinstPROGRAMS clean-recursive \ - clean-toolexeclibLTLIBRARIES ctags ctags-recursive dist \ - dist-all dist-bzip2 dist-gzip dist-shar dist-tarZ dist-zip \ - distcheck distclean distclean-compile distclean-generic \ - distclean-libtool distclean-local distclean-recursive \ - distclean-tags distcleancheck distdir distuninstallcheck dvi \ - dvi-am html html-am info info-am install install-am \ - install-binPROGRAMS install-binSCRIPTS install-data \ - install-data-am install-data-local install-exec \ + clean-local clean-noinstLTLIBRARIES clean-noinstPROGRAMS \ + clean-recursive clean-toolexeclibLTLIBRARIES ctags \ + ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-shar \ + dist-tarZ dist-zip distcheck distclean distclean-compile \ + distclean-generic distclean-libtool distclean-local \ + distclean-recursive distclean-tags distcleancheck distdir \ + distuninstallcheck dvi dvi-am html html-am info info-am \ + install install-am install-binPROGRAMS install-binSCRIPTS \ + install-data install-data-am install-data-local install-exec \ install-exec-am install-info install-info-am install-jarDATA \ install-man install-pkgconfigDATA install-strip \ install-toolexeclibLTLIBRARIES install-toolexecmainlibDATA \