From 03b8eaaddec1ba9a586be7987111526fa7ea088d Mon Sep 17 00:00:00 2001 From: fitzsim Date: Tue, 30 May 2006 21:38:51 +0000 Subject: 2006-05-30 Thomas Fitzsimmons * 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 * 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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@114247 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/Makefile.am | 33 ++------------------------------- 1 file changed, 2 insertions(+), 31 deletions(-) (limited to 'libjava/Makefile.am') diff --git a/libjava/Makefile.am b/libjava/Makefile.am index dd69270dd76..c95ccb95248 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -40,10 +40,6 @@ if XLIB_AWT toolexeclib_LTLIBRARIES += lib-gnu-awt-xlib.la endif -if GTK_AWT -toolexeclib_LTLIBRARIES += lib-gnu-java-awt-peer-gtk.la libgcjawt.la -endif - if QT_AWT toolexeclib_LTLIBRARIES += lib-gnu-java-awt-peer-qt.la endif @@ -128,6 +124,8 @@ AM_CXXFLAGS = \ -DBOOT_CLASS_PATH="\"$(BOOT_CLASS_PATH_DIR)\"" \ -DJAVA_EXT_DIRS="\"$(jardir)/ext\"" \ -DGCJ_ENDORSED_DIRS="\"$(jardir)/gcj-endorsed\"" \ + -DGCJ_VERSIONED_LIBDIR="\"$(libdir)/gcj-$(gcc_version)\"" \ + -DPATH_SEPARATOR="\"$(CLASSPATH_SEPARATOR)\"" \ -DLIBGCJ_DEFAULT_DATABASE="\"$(dbexecdir)/$(db_name)\"" \ -DLIBGCJ_DEFAULT_DATABASE_PATH_TAIL="\"$(db_pathtail)\"" \ -DTOOLEXECLIBDIR="\"$(toolexeclibdir)\"" @@ -247,33 +245,6 @@ $(db_name): gcj-dbtool$(EXEEXT) ## not available. ./gcj-dbtool -n $(db_name) || touch $(db_name) -## For the peer library, DEPENDENCIES need to come before OBJECTS so -## that JNI headers are built before JNI C files. -$(lib_gnu_java_awt_peer_gtk_la_OBJECTS): $(lib_gnu_java_awt_peer_gtk_la_DEPENDENCIES) - -lib_gnu_java_awt_peer_gtk_la_SOURCES = -lib_gnu_java_awt_peer_gtk_la_LIBADD = \ - gnu-java-awt-peer-gtk.lo \ - classpath/native/jni/gtk-peer/libgtkpeer.la \ - $(GTK_LIBS) $(GLIB_LIBS) $(LIBART_LIBS) $(CAIRO_LIBS) $(PANGOFT2_LIBS) -lib_gnu_java_awt_peer_gtk_la_DEPENDENCIES = gnu-java-awt-peer-gtk.lo \ - classpath/native/jni/gtk-peer/libgtkpeer.la \ - libgcj-$(gcc_version).jar libgcj.la libgcj.spec -## The mysterious backslash in the grep pattern is consumed by make. -lib_gnu_java_awt_peer_gtk_la_LDFLAGS = \ - -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LIBGCJ_LD_SYMBOLIC) $(X_LIBS) -lXtst -lib_gnu_java_awt_peer_gtk_la_LINK = $(LIBLINK) - -libgcjawt_la_SOURCES = classpath/native/jawt/jawt.c -libgcjawt_la_CFLAGS = -I$(srcdir)/classpath/native/jni/classpath \ - $(PEDANTIC_CFLAGS) $(X_CFLAGS) -## See jv_convert_LDADD. -libgcjawt_la_LIBADD = -L$(here)/.libs lib-gnu-java-awt-peer-gtk.la -libgcjawt_la_LDFLAGS = \ - -version-info `grep -v '^\#' $(srcdir)/libtool-version` \ - $(LIBGCJ_LD_SYMBOLIC) -libgcjawt_la_LINK = $(LIBLINK) - lib_gnu_java_awt_peer_qt_la_SOURCES = lib_gnu_java_awt_peer_qt_la_LIBADD = \ gnu-java-awt-peer-qt.lo \ -- cgit v1.2.3