diff options
| author | doko <doko@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-01-11 00:01:27 +0000 |
|---|---|---|
| committer | doko <doko@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-01-11 00:01:27 +0000 |
| commit | 0f8792bcc0f6391a9575fe31f95509747df0c4d5 (patch) | |
| tree | bba088e4c29a9d74e18cea4ade44c4b77af3364c /libjava/classpath/native/jawt | |
| parent | 817752f8938108eab2f95dc93336291f88a501e6 (diff) | |
| download | ppe42-gcc-0f8792bcc0f6391a9575fe31f95509747df0c4d5.tar.gz ppe42-gcc-0f8792bcc0f6391a9575fe31f95509747df0c4d5.zip | |
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
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@120654 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/classpath/native/jawt')
| -rw-r--r-- | libjava/classpath/native/jawt/Makefile.am | 7 | ||||
| -rw-r--r-- | libjava/classpath/native/jawt/Makefile.in | 5 |
2 files changed, 3 insertions, 9 deletions
diff --git a/libjava/classpath/native/jawt/Makefile.am b/libjava/classpath/native/jawt/Makefile.am index 8d90352ed7d..a31cf5094a8 100644 --- a/libjava/classpath/native/jawt/Makefile.am +++ b/libjava/classpath/native/jawt/Makefile.am @@ -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@ diff --git a/libjava/classpath/native/jawt/Makefile.in b/libjava/classpath/native/jawt/Makefile.in index 8cf2873696d..35dc288c325 100644 --- a/libjava/classpath/native/jawt/Makefile.in +++ b/libjava/classpath/native/jawt/Makefile.in @@ -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@ |
