diff options
| author | Tom Tromey <tromey@cygnus.com> | 2000-01-17 19:22:20 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2000-01-17 19:22:20 +0000 |
| commit | 7af85558553980230b15cc7df9288ed0718af73c (patch) | |
| tree | abbebe060c5e4dbbfb15413e91ce07c0ef855016 /libjava/Makefile.am | |
| parent | 06f56737169a939227bfac13f099484ad09b3bf4 (diff) | |
| download | gcc-7af85558553980230b15cc7df9288ed0718af73c.zip gcc-7af85558553980230b15cc7df9288ed0718af73c.tar.gz gcc-7af85558553980230b15cc7df9288ed0718af73c.tar.bz2 | |
Runtime.java (loadLibraryInternal): Declare.
* java/lang/Runtime.java (loadLibraryInternal): Declare.
* java/lang/natClassLoader.cc (_Jv_FindClass): Removed dead copy.
(_Jv_FindClassInCache): Likewise.
(_Jv_FindClass): Don't conditionalize body on INTERPRETER.
(findSystemClass): Try to load class from compiled module.
Include Runtime.h.
* java/lang/natRuntime.cc (load): Use UTF-8 copy of filename.
(loadLibrary): Likewise.
(lt_preloaded_symbols): Define.
(loadLibraryInternal): New method.
* include/config.h.in: Rebuilt.
* acconfig.h (USE_LTDL): Added.
* Makefile.am (SUBDIRS): Added $(DIRLTDL).
(INCLUDES): Added $(INCLTDL).b
(libgcj_la_DEPENDENCIES): Added $(LIBLTDL).
(libgcj_la_LIBADD): Likewise.
* aclocal.m4, configure: Rebuilt.
* configure.in: Added libltdl support.
From-SVN: r31472
Diffstat (limited to 'libjava/Makefile.am')
| -rw-r--r-- | libjava/Makefile.am | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libjava/Makefile.am b/libjava/Makefile.am index bc828ce..91d851e 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -3,9 +3,9 @@ AUTOMAKE_OPTIONS = foreign no-installinfo if TESTSUBDIR -SUBDIRS = testsuite gcj include +SUBDIRS = $(DIRLTDL) testsuite gcj include else -SUBDIRS = gcj include +SUBDIRS = $(DIRLTDL) gcj include endif ## ################################################################ @@ -90,7 +90,7 @@ JC1FLAGS = -g -L$(here) @LIBGCJ_JAVAFLAGS@ LIBFFIINCS = -I$(top_srcdir)/../libffi/include -I../libffi/include INCLUDES = -I$(top_srcdir) -Iinclude -I$(top_srcdir)/include \ - $(GCINCS) $(THREADINCS) \ + $(GCINCS) $(THREADINCS) $(INCLTDL) \ $(EH_COMMON_INCLUDE) $(ZINCS) $(LIBFFIINCS) @@ -116,9 +116,9 @@ libgcj_la_SOURCES = prims.cc jni.cc exception.cc \ EXTRA_libgcj_la_SOURCES = boehm.cc nogc.cc posix-threads.cc no-threads.cc \ $(c_source_files) $(java_source_files) $(built_java_source_files) libgcj_la_DEPENDENCIES = libgcj.zip $(javao_files) $(nat_files) \ - $(c_files) $(GCOBJS) $(THREADOBJS) + $(c_files) $(GCOBJS) $(THREADOBJS) $(LIBLTDL) libgcj_la_LIBADD = $(javao_files) $(nat_files) $(c_files) $(GCOBJS) \ - $(THREADOBJS) $(libffi_files) + $(THREADOBJS) $(libffi_files) $(LIBLTDL) libgcj_la_LDFLAGS = -rpath $(toolexeclibdir) \ ## The mysterious backslash is consumed by make. -version-info `grep -v '^\#' $(srcdir)/libtool-version` |