mirror of
https://github.com/openRuyi-Project/gcc.git
synced 2026-06-16 00:16:04 +00:00
Thomas Fitzsimmons
8c0633b7cd
2006-05-30 Thomas Fitzsimmons <fitzsim@redhat.com> * scripts/makemake.tcl (emit_bc_rule): Do not skip gnu-java-awt-peer-gtk.lo. Include gnu/java/awt/peer/gtk Java objects in libgcj.so. Use C++ ABI for gnu/java/awt/peer/gtk package. * gnu/classpath/natSystemProperties.cc (PrependVersionedLibdir): New function. (insertSystemProperties): Only set java.ext.dirs if it is not already defined. Prepend GCJ_VERSIONED_LIBDIR to module search path where necessary. * configure.ac (GTK_AWT): Remove automake conditional. * include/jvm.h (_Jv_PrependVersionedLibdir): New function declaration. * gij.cc (main): Prepend LD_LIBRARY_PATH with GCJ_VERSIONED_LIBDIR and re-exec self. * Makefile.am (AM_CXXFLAGS): Define GCJ_VERSIONED_LIBDIR, GIJ_EXECUTABLE and PATH_SEPARATOR macros. Remove lib-gnu-java-awt-peer-gtk.la and libgcjawt.la build logic. * prims.cc (_Jv_PrependVersionedLibdir): New function. 2006-05-30 Thomas Fitzsimmons <fitzsim@redhat.com> * native/jni/gtk-peer/Makefile.am (gcc_version): New variable. (gcjversionedlibdir): Likewise. (libgtkpeer_la_LDFLAGS): Likewise. Install libgtkpeer.so in GCJ versioned library directory. * native/jawt/Makefile.am (gcc_version): New variable. (gcjversionedlibdir): Likewise. (libjawt_la_LDFLAGS): Likewise. Rename libjawtgnu.so libjawt.so. Install libjawt.so in GCJ versioned library directory. * gnu/java/awt/peer/gtk/GdkFontPeer.java (static): Call System.loadLibrary unconditionally. * gnu/java/awt/peer/gtk/GdkPixbufDecoder.java: Likewise. * gnu/java/awt/peer/gtk/GdkGraphics2D.java: Likewise. * gnu/java/awt/peer/gtk/GdkGraphics.java: Likewise. * gnu/java/awt/peer/gtk/GtkToolkit.java: Likewise. * gnu/java/awt/peer/gtk/GdkTextLayout.java: Likewise. From-SVN: r114247
21 lines
884 B
Makefile
21 lines
884 B
Makefile
## 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 = libjawt.la
|
|
|
|
libjawt_la_SOURCES = jawt.c
|
|
libjawt_la_LIBADD = $(top_builddir)/native/jni/gtk-peer/libgtkpeer.la
|
|
|
|
## 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`
|
|
|
|
AM_LDFLAGS = @CLASSPATH_MODULE@ @GTK_LIBS@ @CAIRO_LIBS@ @PANGOFT2_LIBS@ @X_LIBS@ -lXtst
|
|
AM_CPPFLAGS = @CLASSPATH_INCLUDES@
|
|
|
|
# Just the WARNING_CFLAGS. We cannot use the strict flags since the gtk
|
|
# headers contain broken prototypes (by design, see gtkitemfactory.h).
|
|
AM_CFLAGS = @WARNING_CFLAGS@ @ERROR_CFLAGS@ \
|
|
@GTK_CFLAGS@ @CAIRO_CFLAGS@ @PANGOFT2_CFLAGS@
|