yggdrasil/gcc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Readd missing chunks from r116332:

Browse Source 
2007-01-10  Matthias Klose  <doko@debian.org> 
 
        Readd missing chunks from r116332: 
 
        * m4/acinclude.m4 (CLASSPATH_TOOLEXECLIBDIR): New macro. 
        * resource/Makefile.am (loggingdir): Define to 
        toolexeclibdir. 
        (securitydir): Likewise. 
        * configure.ac: Call CLASSPATH_TOOLEXECLIBDIR. 
        Set default nativeexeclibdir using toolexeclibdir. 
 
        Readd missing chunks from r115839: 
 
        * native/jni/gtk-peer/Makefile.am (libgtkpeer_la_LDFLAGS): 
        Add -avoid-version. 
        * native/jawt/Makefile.am (libjawt_la_LDFLAGS): Add -avoid-version. 
 
        * configure, Makefile.in, doc/Makefile.in, doc/api/Makefile.in, 
        examples/Makefile.in, external/Makefile.in, 
        external/jsr166/Makefile.in, external/relaxngDatatype/Makefile.in, 
        external/sax/Makefile.in, external/w3c_dom/Makefile.in, 
        include/Makefile.in, lib/Makefile.in, native/Makefile.in, 
        native/fdlibm/Makefile.in, native/jawt/Makefile.in, 
        native/jni/Makefile.in, native/jni/classpath/Makefile.in, 
        native/jni/gconf-peer/Makefile.in, native/jni/gtk-peer/Makefile.in 
        native/jni/java-io/Makefile.in, native/jni/java-lang/Makefile.in, 
        native/jni/java-net/Makefile.in, native/jni/java-nio/Makefile.in, 
        native/jni/java-util/Makefile.in, native/jni/midi-alsa/Makefile.in, 
        native/jni/midi-dssi/Makefile.in, native/jni/native-lib/Makefile.in, 
        native/jni/qt-peer/Makefile.in, native/jni/xmlj/Makefile.in, 
        native/plugin/Makefile.in, resource/Makefile.in, scripts/Makefile.in, 
        tools/Makefile.in: Regenerate

From-SVN: r120654
This commit is contained in:
Matthias Klose
2007-01-11 00:01:27 +00:00
committed by Matthias Klose
parent 10f1f9f70c
commit eee96b1bb0
39 changed files with 113 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libjava/classpath/native/Makefile.in
+1
View File
@@ -290,6 +290,7 @@ target_alias = @target_alias@
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
toolexeclibdir = @toolexeclibdir@
vm_classes = @vm_classes@
@CREATE_JNI_LIBRARIES_TRUE@JNIDIR = jni
@CREATE_GTK_PEER_LIBRARIES_TRUE@JAWTDIR = jawt
libjava/classpath/native/fdlibm/Makefile.in
+1
View File
@@ -309,6 +309,7 @@ target_alias = @target_alias@
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
toolexeclibdir = @toolexeclibdir@
vm_classes = @vm_classes@
noinst_LTLIBRARIES = libfdlibm.la
libfdlibm_la_SOURCES = \
libjava/classpath/native/jawt/Makefile.am
+1 -6
View File
@@ -6,12 +6,7 @@ gcjversionedlib_LTLIBRARIES = libjawt.la
libjawt_la_SOURCES = jawt.c
libjawt_la_LIBADD = $(top_builddir)/native/jni/gtk-peer/libgtkpeer.la
## FIXME?
## libjawt_la_LDFLAGS = -avoid-version
## GCJ LOCAL: encode the library path and use GCJ's library version
libjawt_la_LDFLAGS = -rpath $(gcjversionedlibdir) \
-version-info `grep -v '^\#' $(top_srcdir)/../libtool-version`
libjawt_la_LDFLAGS = -avoid-version
AM_LDFLAGS = @CLASSPATH_MODULE@ @GTK_LIBS@ @PANGOFT2_LIBS@ @X_LIBS@ @XTEST_LIBS@
AM_CPPFLAGS = @CLASSPATH_INCLUDES@
libjava/classpath/native/jawt/Makefile.in
+2 -3
View File
@@ -309,15 +309,14 @@ target_alias = @target_alias@
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
toolexeclibdir = @toolexeclibdir@
vm_classes = @vm_classes@
gcc_version := $(shell cat $(top_srcdir)/../../gcc/BASE-VER)
gcjversionedlibdir = $(libdir)/gcj-$(gcc_version)
gcjversionedlib_LTLIBRARIES = libjawt.la
libjawt_la_SOURCES = jawt.c
libjawt_la_LIBADD = $(top_builddir)/native/jni/gtk-peer/libgtkpeer.la
libjawt_la_LDFLAGS = -rpath $(gcjversionedlibdir) \
-version-info `grep -v '^\#' $(top_srcdir)/../libtool-version`
libjawt_la_LDFLAGS = -avoid-version
AM_LDFLAGS = @CLASSPATH_MODULE@ @GTK_LIBS@ @PANGOFT2_LIBS@ @X_LIBS@ @XTEST_LIBS@
AM_CPPFLAGS = @CLASSPATH_INCLUDES@
libjava/classpath/native/jni/Makefile.in
+1
View File
@@ -290,6 +290,7 @@ target_alias = @target_alias@
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
toolexeclibdir = @toolexeclibdir@
vm_classes = @vm_classes@
@CREATE_CORE_JNI_LIBRARIES_TRUE@JNIDIRS = native-lib java-io java-lang java-net java-nio java-util
@CREATE_ALSA_LIBRARIES_TRUE@ALSADIR = midi-alsa
libjava/classpath/native/jni/classpath/Makefile.in
+1
View File
@@ -300,6 +300,7 @@ target_alias = @target_alias@
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
toolexeclibdir = @toolexeclibdir@
vm_classes = @vm_classes@
# Header needed for jawt implementations such as the one found in ../gtk-peer.
libjava/classpath/native/jni/gconf-peer/Makefile.in
+1
View File
@@ -310,6 +310,7 @@ target_alias = @target_alias@
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
toolexeclibdir = @toolexeclibdir@
vm_classes = @vm_classes@
nativeexeclib_LTLIBRARIES = libgconfpeer.la
libgconfpeer_la_SOURCES = GConfNativePeer.c
libjava/classpath/native/jni/gtk-peer/Makefile.am
+1 -5
View File
@@ -53,13 +53,9 @@ libgtkpeer_la_SOURCES = gnu_java_awt_peer_gtk_CairoSurface.c \
gtk_jawt.c \
gtkpeer.h
## GCJ LOCAL: encode the library path and use GCJ's library version
libgtkpeer_la_LDFLAGS = -rpath $(gcjversionedlibdir) \
-version-info `grep -v '^\#' $(top_srcdir)/../libtool-version`
libgtkpeer_la_LIBADD = $(top_builddir)/native/jni/classpath/native_state.lo \
$(top_builddir)/native/jni/classpath/jcl.lo
## libgtkpeer_la_LDFLAGS = -avoid-version
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@
libjava/classpath/native/jni/gtk-peer/Makefile.in
+2 -3
View File
@@ -349,6 +349,7 @@ target_alias = @target_alias@
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
toolexeclibdir = @toolexeclibdir@
vm_classes = @vm_classes@
gcc_version := $(shell cat $(top_srcdir)/../../gcc/BASE-VER)
gcjversionedlibdir = $(libdir)/gcj-$(gcc_version)
@@ -403,12 +404,10 @@ libgtkpeer_la_SOURCES = gnu_java_awt_peer_gtk_CairoSurface.c \
gtk_jawt.c \
gtkpeer.h
libgtkpeer_la_LDFLAGS = -rpath $(gcjversionedlibdir) \
-version-info `grep -v '^\#' $(top_srcdir)/../libtool-version`
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@
libjava/classpath/native/jni/java-io/Makefile.in
+1
View File
@@ -311,6 +311,7 @@ target_alias = @target_alias@
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
toolexeclibdir = @toolexeclibdir@
vm_classes = @vm_classes@
nativeexeclib_LTLIBRARIES = libjavaio.la
libjavaio_la_SOURCES = java_io_VMFile.c \
libjava/classpath/native/jni/java-lang/Makefile.in
+1
View File
@@ -317,6 +317,7 @@ target_alias = @target_alias@
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
toolexeclibdir = @toolexeclibdir@
vm_classes = @vm_classes@
nativeexeclib_LTLIBRARIES = libjavalang.la libjavalangreflect.la
libjavalang_la_SOURCES = java_lang_VMSystem.c \
libjava/classpath/native/jni/java-net/Makefile.in
+1
View File
@@ -321,6 +321,7 @@ target_alias = @target_alias@
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
toolexeclibdir = @toolexeclibdir@
vm_classes = @vm_classes@
nativeexeclib_LTLIBRARIES = libjavanet.la
@ENABLE_LOCAL_SOCKETS_FALSE@local_sources = gnu_java_net_local_LocalSocketImpl.c
libjava/classpath/native/jni/java-nio/Makefile.in
+1
View File
@@ -319,6 +319,7 @@ target_alias = @target_alias@
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
toolexeclibdir = @toolexeclibdir@
vm_classes = @vm_classes@
nativeexeclib_LTLIBRARIES = libjavanio.la
libjavanio_la_SOURCES = gnu_java_nio_VMPipe.c \
libjava/classpath/native/jni/java-util/Makefile.in
+1
View File
@@ -308,6 +308,7 @@ target_alias = @target_alias@
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
toolexeclibdir = @toolexeclibdir@
vm_classes = @vm_classes@
nativeexeclib_LTLIBRARIES = libjavautil.la
libjavautil_la_SOURCES = java_util_VMTimeZone.c
libjava/classpath/native/jni/midi-alsa/Makefile.in
+1
View File
@@ -311,6 +311,7 @@ target_alias = @target_alias@
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
toolexeclibdir = @toolexeclibdir@
vm_classes = @vm_classes@
nativeexeclib_LTLIBRARIES = libgjsmalsa.la
libgjsmalsa_la_SOURCES = gnu_javax_sound_midi_alsa_AlsaMidiSequencerDevice.c \
libjava/classpath/native/jni/midi-dssi/Makefile.in
+1
View File
@@ -311,6 +311,7 @@ target_alias = @target_alias@
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
toolexeclibdir = @toolexeclibdir@
vm_classes = @vm_classes@
nativeexeclib_LTLIBRARIES = libgjsmdssi.la
libgjsmdssi_la_SOURCES = gnu_javax_sound_midi_dssi_DSSIMidiDeviceProvider.c \
libjava/classpath/native/jni/native-lib/Makefile.in
+1
View File
@@ -300,6 +300,7 @@ target_alias = @target_alias@
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
toolexeclibdir = @toolexeclibdir@
vm_classes = @vm_classes@
noinst_LTLIBRARIES = libclasspathnative.la
libclasspathnative_la_SOURCES = cpnet.c \
libjava/classpath/native/jni/qt-peer/Makefile.in
+1
View File
@@ -326,6 +326,7 @@ target_alias = @target_alias@
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
toolexeclibdir = @toolexeclibdir@
vm_classes = @vm_classes@
noinst_LTLIBRARIES = libqtpeer.la
AM_LDFLAGS = @CLASSPATH_MODULE@ @QT_LIBS@
libjava/classpath/native/jni/xmlj/Makefile.in
+1
View File
@@ -310,6 +310,7 @@ target_alias = @target_alias@
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
toolexeclibdir = @toolexeclibdir@
vm_classes = @vm_classes@
nativeexeclib_LTLIBRARIES = libxmlj.la
libxmlj_la_SOURCES = \
libjava/classpath/native/plugin/Makefile.in
+1
View File
@@ -308,6 +308,7 @@ target_alias = @target_alias@
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
toolexeclibdir = @toolexeclibdir@
vm_classes = @vm_classes@
nativeexeclib_LTLIBRARIES = libgcjwebplugin.la
libgcjwebplugin_la_SOURCES = gcjwebplugin.cc