OSDN Git Service

2006-07-31 Thomas Fitzsimmons <fitzsim@redhat.com>
authorfitzsim <fitzsim@138bc75d-0d04-0410-961f-82ee72b054a4>
Mon, 31 Jul 2006 16:34:28 +0000 (16:34 +0000)
committerfitzsim <fitzsim@138bc75d-0d04-0410-961f-82ee72b054a4>
Mon, 31 Jul 2006 16:34:28 +0000 (16:34 +0000)
PR libgcj/28312
* classpath/native/jni/midi-alsa/Makefile.am
(libgjsmalsa_la_LDFLAGS): Add -avoid-version.
* classpath/native/jni/midi-alsa/Makefile.in: Regenerate.
* classpath/native/jni/midi-dssi/Makefile.am
(libgjsmdssi_la_LDFLAGS): Add -avoid-version.
* classpath/native/jni/midi-dssi/Makefile.in: Regenerate.
* classpath/native/jni/qt-peer/Makefile.am: Remove GCJ LOCAL
sections.
(libqtpeer_la_LDFLAGS): Add -avoid-version.
* classpath/native/jni/qt-peer/Makefile.in: Regenerate.
* classpath/native/jni/gtk-peer/Makefile.am
(libgtkpeer_la_LDFLAGS): Add -avoid-version.
* classpath/native/jni/gtk-peer/Makefile.in: Regenerate.
* classpath/native/jawt/Makefile.am (libjawt_la_LDFLAGS): Add
-avoid-version.
* classpath/native/jawt/Makefile.in: Regenerate.
* Makefile.am (libjvm_la_LDFLAGS): Add -avoid-version.
* Makefile.in: Regenerate.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@115839 138bc75d-0d04-0410-961f-82ee72b054a4

13 files changed:
libjava/ChangeLog
libjava/Makefile.am
libjava/Makefile.in
libjava/classpath/native/jawt/Makefile.am
libjava/classpath/native/jawt/Makefile.in
libjava/classpath/native/jni/gtk-peer/Makefile.am
libjava/classpath/native/jni/gtk-peer/Makefile.in
libjava/classpath/native/jni/midi-alsa/Makefile.am
libjava/classpath/native/jni/midi-alsa/Makefile.in
libjava/classpath/native/jni/midi-dssi/Makefile.am
libjava/classpath/native/jni/midi-dssi/Makefile.in
libjava/classpath/native/jni/qt-peer/Makefile.am
libjava/classpath/native/jni/qt-peer/Makefile.in

index be82c08..194f263 100644 (file)
@@ -1,3 +1,25 @@
+2006-07-31  Thomas Fitzsimmons  <fitzsim@redhat.com>
+
+       PR libgcj/28312
+       * classpath/native/jni/midi-alsa/Makefile.am
+       (libgjsmalsa_la_LDFLAGS): Add -avoid-version.
+       * classpath/native/jni/midi-alsa/Makefile.in: Regenerate.
+       * classpath/native/jni/midi-dssi/Makefile.am
+       (libgjsmdssi_la_LDFLAGS): Add -avoid-version.
+       * classpath/native/jni/midi-dssi/Makefile.in: Regenerate.
+       * classpath/native/jni/qt-peer/Makefile.am: Remove GCJ LOCAL
+       sections.
+       (libqtpeer_la_LDFLAGS): Add -avoid-version.
+       * classpath/native/jni/qt-peer/Makefile.in: Regenerate.
+       * classpath/native/jni/gtk-peer/Makefile.am
+       (libgtkpeer_la_LDFLAGS): Add -avoid-version.
+       * classpath/native/jni/gtk-peer/Makefile.in: Regenerate.
+       * classpath/native/jawt/Makefile.am (libjawt_la_LDFLAGS): Add
+       -avoid-version.
+       * classpath/native/jawt/Makefile.in: Regenerate.
+       * Makefile.am (libjvm_la_LDFLAGS): Add -avoid-version.
+       * Makefile.in: Regenerate.
+
 2006-07-28  Andrew Haley  <aph@redhat.com>
 
        * gnu/gcj/runtime/natSharedLibLoader.cc (init): Don't set
index 45a4930..54ab516 100644 (file)
@@ -247,9 +247,7 @@ libjvm_la_SOURCES = jni-libjvm.cc
 libjvm_la_DEPENDENCIES = libgcj.la libgcj.spec
 ## See jv_convert_LDADD.
 libjvm_la_LIBADD = -L$(here)/.libs libgcj.la
-## The mysterious backslash in the grep pattern is consumed by make.
-libjvm_la_LDFLAGS = \
-        -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LIBGCJ_LD_SYMBOLIC)
+libjvm_la_LDFLAGS = -avoid-version $(LIBGCJ_LD_SYMBOLIC)
 
 ## The .db file.  This rule is only used for native builds, so it is
 ## safe to invoke gcj-dbtool.
index 631ebb8..06831cd 100644 (file)
@@ -796,9 +796,7 @@ libgcj_tools_la_LINK = $(LIBLINK)
 libjvm_la_SOURCES = jni-libjvm.cc
 libjvm_la_DEPENDENCIES = libgcj.la libgcj.spec
 libjvm_la_LIBADD = -L$(here)/.libs libgcj.la
-libjvm_la_LDFLAGS = \
-        -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LIBGCJ_LD_SYMBOLIC)
-
+libjvm_la_LDFLAGS = -avoid-version $(LIBGCJ_LD_SYMBOLIC)
 lib_gnu_awt_xlib_la_SOURCES = $(xlib_nat_source_files)
 lib_gnu_awt_xlib_la_LIBADD = gnu/awt/xlib.lo gnu/gcj/xlib.lo
 lib_gnu_awt_xlib_la_DEPENDENCIES = libgcj-$(gcc_version).jar \
index 01abf3b..c81e754 100644 (file)
@@ -2,6 +2,7 @@ nativeexeclib_LTLIBRARIES = libjawt.la
 
 libjawt_la_SOURCES = jawt.c
 libjawt_la_LIBADD = $(top_builddir)/native/jni/gtk-peer/libgtkpeer.la
+libjawt_la_LDFLAGS = -avoid-version
 
 AM_LDFLAGS = @CLASSPATH_MODULE@ @GTK_LIBS@ @PANGOFT2_LIBS@ @X_LIBS@ @XTEST_LIBS@
 AM_CPPFLAGS = @CLASSPATH_INCLUDES@
index 683bbb9..4a15a20 100644 (file)
@@ -298,6 +298,7 @@ vm_classes = @vm_classes@
 nativeexeclib_LTLIBRARIES = libjawt.la
 libjawt_la_SOURCES = jawt.c
 libjawt_la_LIBADD = $(top_builddir)/native/jni/gtk-peer/libgtkpeer.la
+libjawt_la_LDFLAGS = -avoid-version
 AM_LDFLAGS = @CLASSPATH_MODULE@ @GTK_LIBS@ @PANGOFT2_LIBS@ @X_LIBS@ @XTEST_LIBS@
 AM_CPPFLAGS = @CLASSPATH_INCLUDES@
 
index 8a39f34..eecd153 100644 (file)
@@ -52,6 +52,7 @@ libgtkpeer_la_SOURCES = gnu_java_awt_peer_gtk_CairoSurface.c \
 
 libgtkpeer_la_LIBADD = $(top_builddir)/native/jni/classpath/native_state.lo \
                       $(top_builddir)/native/jni/classpath/jcl.lo
+libgtkpeer_la_LDFLAGS = -avoid-version
 
 AM_LDFLAGS = @CLASSPATH_MODULE@ @GTK_LIBS@ @FREETYPE2_LIBS@ \
              @PANGOFT2_LIBS@ @X_PRE_LIBS@ @X_LIBS@ @X_EXTRA_LIBS@ @XTEST_LIBS@
index d63be46..cd004a7 100644 (file)
@@ -392,6 +392,7 @@ libgtkpeer_la_SOURCES = gnu_java_awt_peer_gtk_CairoSurface.c \
 libgtkpeer_la_LIBADD = $(top_builddir)/native/jni/classpath/native_state.lo \
                       $(top_builddir)/native/jni/classpath/jcl.lo
 
+libgtkpeer_la_LDFLAGS = -avoid-version
 AM_LDFLAGS = @CLASSPATH_MODULE@ @GTK_LIBS@ @FREETYPE2_LIBS@ \
              @PANGOFT2_LIBS@ @X_PRE_LIBS@ @X_LIBS@ @X_EXTRA_LIBS@ @XTEST_LIBS@
 
index e45cb43..4a9c484 100644 (file)
@@ -5,6 +5,7 @@ gnu_javax_sound_midi_alsa_AlsaPortDevice.c \
 gnu_javax_sound_midi_alsa_AlsaMidiDeviceProvider.c
 
 libgjsmalsa_la_LIBADD = -lasound
+libgjsmalsa_la_LDFLAGS = -avoid-version
 
 AM_LDFLAGS = @CLASSPATH_MODULE@
 AM_CPPFLAGS = @CLASSPATH_INCLUDES@ `pkg-config  --cflags-only-I alsa`
index b0650c0..90c403d 100644 (file)
@@ -303,6 +303,7 @@ gnu_javax_sound_midi_alsa_AlsaPortDevice.c \
 gnu_javax_sound_midi_alsa_AlsaMidiDeviceProvider.c
 
 libgjsmalsa_la_LIBADD = -lasound
+libgjsmalsa_la_LDFLAGS = -avoid-version
 AM_LDFLAGS = @CLASSPATH_MODULE@
 AM_CPPFLAGS = @CLASSPATH_INCLUDES@ `pkg-config  --cflags-only-I alsa`
 AM_CFLAGS = @WARNING_CFLAGS@ @STRICT_WARNING_CFLAGS@ @ERROR_CFLAGS@ `pkg-config --cflags-only-other alsa`
index 8a466d6..48c8051 100644 (file)
@@ -5,6 +5,7 @@ libgjsmdssi_la_SOURCES = gnu_javax_sound_midi_dssi_DSSIMidiDeviceProvider.c \
                         dssi_data.h
 
 libgjsmdssi_la_LIBADD = $(top_builddir)/native/jni/classpath/jcl.lo -ljack
+libgjsmdssi_la_LDFLAGS = -avoid-version
 
 AM_LDFLAGS = @CLASSPATH_MODULE@
 AM_CPPFLAGS = @CLASSPATH_INCLUDES@ 
index 969e029..af01ba5 100644 (file)
@@ -303,6 +303,7 @@ libgjsmdssi_la_SOURCES = gnu_javax_sound_midi_dssi_DSSIMidiDeviceProvider.c \
                         dssi_data.h
 
 libgjsmdssi_la_LIBADD = $(top_builddir)/native/jni/classpath/jcl.lo -ljack
+libgjsmdssi_la_LDFLAGS = -avoid-version
 AM_LDFLAGS = @CLASSPATH_MODULE@
 AM_CPPFLAGS = @CLASSPATH_INCLUDES@ 
 AM_CFLAGS = @WARNING_CFLAGS@ @STRICT_WARNING_CFLAGS@ @ERROR_CFLAGS@
index 69b17d4..64ce20f 100644 (file)
@@ -1,11 +1,7 @@
 # Qt AWT backend for Classpath
 #
 
-## GCJ LOCAL: install this library in GCJ's versioned library
-## directory
-gcc_version := $(shell cat $(top_srcdir)/../../gcc/BASE-VER)
-gcjversionedlibdir = $(libdir)/gcj-$(gcc_version)
-gcjversionedlib_LTLIBRARIES = libqtpeer.la
+nativeexeclib_LTLIBRARIES = libqtpeer.la
 
 AM_LDFLAGS = @CLASSPATH_MODULE@ @QT_LIBS@
 AM_CPPFLAGS = @CLASSPATH_INCLUDES@
@@ -77,9 +73,7 @@ libqtpeer_la_SOURCES = \
         slotcallbacks.cpp \
         slotcallbacks.h 
 
-## GCJ LOCAL: encode the library path and  use GCJ's library version
-libqtpeer_la_LDFLAGS = -rpath $(gcjversionedlibdir) \
-       -version-info `grep -v '^\#' $(top_srcdir)/../libtool-version`
+libqtpeer_la_LDFLAGS = -avoid-version
 
 BUILT_SOURCES = $(libqtpeer_la_MOC)
 
index 537ead6..1b253b5 100644 (file)
@@ -61,9 +61,9 @@ am__vpath_adj = case $$p in \
     *) f=$$p;; \
   esac;
 am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(gcjversionedlibdir)"
-gcjversionedlibLTLIBRARIES_INSTALL = $(INSTALL)
-LTLIBRARIES = $(gcjversionedlib_LTLIBRARIES)
+am__installdirs = "$(DESTDIR)$(nativeexeclibdir)"
+nativeexeclibLTLIBRARIES_INSTALL = $(INSTALL)
+LTLIBRARIES = $(nativeexeclib_LTLIBRARIES)
 libqtpeer_la_LIBADD =
 am_libqtpeer_la_OBJECTS = componentevent.lo keybindings.lo \
        mainqtthread.lo mainthreadinterface.lo nativewrapper.lo \
@@ -320,9 +320,7 @@ target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
 vm_classes = @vm_classes@
-gcc_version := $(shell cat $(top_srcdir)/../../gcc/BASE-VER)
-gcjversionedlibdir = $(libdir)/gcj-$(gcc_version)
-gcjversionedlib_LTLIBRARIES = libqtpeer.la
+nativeexeclib_LTLIBRARIES = libqtpeer.la
 AM_LDFLAGS = @CLASSPATH_MODULE@ @QT_LIBS@
 AM_CPPFLAGS = @CLASSPATH_INCLUDES@
 AM_CXXFLAGS = @QT_CFLAGS@
@@ -388,9 +386,7 @@ libqtpeer_la_SOURCES = \
         slotcallbacks.cpp \
         slotcallbacks.h 
 
-libqtpeer_la_LDFLAGS = -rpath $(gcjversionedlibdir) \
-       -version-info `grep -v '^\#' $(top_srcdir)/../libtool-version`
-
+libqtpeer_la_LDFLAGS = -avoid-version
 BUILT_SOURCES = $(libqtpeer_la_MOC)
 CLEANFILES = so_locations $(BUILT_SOURCES)
 all: $(BUILT_SOURCES)
@@ -427,35 +423,35 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-install-gcjversionedlibLTLIBRARIES: $(gcjversionedlib_LTLIBRARIES)
+install-nativeexeclibLTLIBRARIES: $(nativeexeclib_LTLIBRARIES)
        @$(NORMAL_INSTALL)
-       test -z "$(gcjversionedlibdir)" || $(mkdir_p) "$(DESTDIR)$(gcjversionedlibdir)"
-       @list='$(gcjversionedlib_LTLIBRARIES)'; for p in $$list; do \
+       test -z "$(nativeexeclibdir)" || $(mkdir_p) "$(DESTDIR)$(nativeexeclibdir)"
+       @list='$(nativeexeclib_LTLIBRARIES)'; for p in $$list; do \
          if test -f $$p; then \
            f=$(am__strip_dir) \
-           echo " $(LIBTOOL) --mode=install $(gcjversionedlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(gcjversionedlibdir)/$$f'"; \
-           $(LIBTOOL) --mode=install $(gcjversionedlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(gcjversionedlibdir)/$$f"; \
+           echo " $(LIBTOOL) --mode=install $(nativeexeclibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(nativeexeclibdir)/$$f'"; \
+           $(LIBTOOL) --mode=install $(nativeexeclibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(nativeexeclibdir)/$$f"; \
          else :; fi; \
        done
 
-uninstall-gcjversionedlibLTLIBRARIES:
+uninstall-nativeexeclibLTLIBRARIES:
        @$(NORMAL_UNINSTALL)
-       @set -x; list='$(gcjversionedlib_LTLIBRARIES)'; for p in $$list; do \
+       @set -x; list='$(nativeexeclib_LTLIBRARIES)'; for p in $$list; do \
          p=$(am__strip_dir) \
-         echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(gcjversionedlibdir)/$$p'"; \
-         $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(gcjversionedlibdir)/$$p"; \
+         echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(nativeexeclibdir)/$$p'"; \
+         $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(nativeexeclibdir)/$$p"; \
        done
 
-clean-gcjversionedlibLTLIBRARIES:
-       -test -z "$(gcjversionedlib_LTLIBRARIES)" || rm -f $(gcjversionedlib_LTLIBRARIES)
-       @list='$(gcjversionedlib_LTLIBRARIES)'; for p in $$list; do \
+clean-nativeexeclibLTLIBRARIES:
+       -test -z "$(nativeexeclib_LTLIBRARIES)" || rm -f $(nativeexeclib_LTLIBRARIES)
+       @list='$(nativeexeclib_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
 libqtpeer.la: $(libqtpeer_la_OBJECTS) $(libqtpeer_la_DEPENDENCIES) 
-       $(CXXLINK) -rpath $(gcjversionedlibdir) $(libqtpeer_la_LDFLAGS) $(libqtpeer_la_OBJECTS) $(libqtpeer_la_LIBADD) $(LIBS)
+       $(CXXLINK) -rpath $(nativeexeclibdir) $(libqtpeer_la_LDFLAGS) $(libqtpeer_la_OBJECTS) $(libqtpeer_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
        -rm -f *.$(OBJEXT)
@@ -616,7 +612,7 @@ check: $(BUILT_SOURCES)
        $(MAKE) $(AM_MAKEFLAGS) check-am
 all-am: Makefile $(LTLIBRARIES)
 installdirs:
-       for dir in "$(DESTDIR)$(gcjversionedlibdir)"; do \
+       for dir in "$(DESTDIR)$(nativeexeclibdir)"; do \
          test -z "$$dir" || $(mkdir_p) "$$dir"; \
        done
 install: $(BUILT_SOURCES)
@@ -648,7 +644,7 @@ maintainer-clean-generic:
        -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
 clean: clean-am
 
-clean-am: clean-gcjversionedlibLTLIBRARIES clean-generic clean-libtool \
+clean-am: clean-generic clean-libtool clean-nativeexeclibLTLIBRARIES \
        mostlyclean-am
 
 distclean: distclean-am
@@ -667,9 +663,9 @@ info: info-am
 
 info-am:
 
-install-data-am: install-gcjversionedlibLTLIBRARIES
+install-data-am:
 
-install-exec-am:
+install-exec-am: install-nativeexeclibLTLIBRARIES
 
 install-info: install-info-am
 
@@ -695,21 +691,20 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-gcjversionedlibLTLIBRARIES uninstall-info-am
+uninstall-am: uninstall-info-am uninstall-nativeexeclibLTLIBRARIES
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean \
-       clean-gcjversionedlibLTLIBRARIES clean-generic clean-libtool \
-       ctags distclean distclean-compile distclean-generic \
-       distclean-libtool distclean-tags distdir dvi dvi-am html \
-       html-am info info-am install install-am install-data \
-       install-data-am install-exec install-exec-am \
-       install-gcjversionedlibLTLIBRARIES install-info \
-       install-info-am install-man install-strip installcheck \
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+       clean-libtool clean-nativeexeclibLTLIBRARIES ctags distclean \
+       distclean-compile distclean-generic distclean-libtool \
+       distclean-tags distdir dvi dvi-am html html-am info info-am \
+       install install-am install-data install-data-am install-exec \
+       install-exec-am install-info install-info-am install-man \
+       install-nativeexeclibLTLIBRARIES install-strip installcheck \
        installcheck-am installdirs maintainer-clean \
        maintainer-clean-generic mostlyclean mostlyclean-compile \
        mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-       tags uninstall uninstall-am \
-       uninstall-gcjversionedlibLTLIBRARIES uninstall-info-am
+       tags uninstall uninstall-am uninstall-info-am \
+       uninstall-nativeexeclibLTLIBRARIES
 
 
 slotcallbacks.moc.h: slotcallbacks.cpp