diff options
| author | fitzsim <fitzsim@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-06-20 19:25:32 +0000 |
|---|---|---|
| committer | fitzsim <fitzsim@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-06-20 19:25:32 +0000 |
| commit | 10fd8185f15498797ae2ee1e6fc2722b5d47379c (patch) | |
| tree | 0045d406677ce30008114e5f5c2fe72d66197382 /libjava/Makefile.am | |
| parent | 545ee73275915a5217ba63b4fe90587a96d47496 (diff) | |
| download | gcc-10fd8185f15498797ae2ee1e6fc2722b5d47379c.tar.gz | |
2006-06-20 Thomas Fitzsimmons <fitzsim@redhat.com>
* Makefile.am (AM_CXXFLAGS): Define GCJ_VERSIONED_LIBDIR to
"$(dbexecdir)".
Build libjvm.la.
* Makefile.in: Regenerate.
* jni.cc (the_vm): Rename and export as ...
(_Jv_the_vm): New exported symbol.
(_Jv_JNI_AttachCurrentThread): Export.
(_Jv_JNI_DestroyJavaVM): Replace the_vm references with _Jv_the_vm
references.
(_Jv_GetJavaVM): Likewise.
(JNI_GetDefaultJavaVMInitArgs, JNI_CreateJavaVM,
JNI_GetCreatedJavaVMs): Move to ...
* jni-libjvm.cc: New file.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@114824 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/Makefile.am')
| -rw-r--r-- | libjava/Makefile.am | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/libjava/Makefile.am b/libjava/Makefile.am index d3a637613d7..b7221b5c9ba 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -40,6 +40,8 @@ if XLIB_AWT toolexeclib_LTLIBRARIES += lib-gnu-awt-xlib.la endif +dbexec_LTLIBRARIES = libjvm.la + pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libgcj.pc @@ -122,7 +124,7 @@ 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)\"" \ + -DGCJ_VERSIONED_LIBDIR="\"$(dbexecdir)\"" \ -DPATH_SEPARATOR="\"$(CLASSPATH_SEPARATOR)\"" \ -DLIBGCJ_DEFAULT_DATABASE="\"$(dbexecdir)/$(db_name)\"" \ -DLIBGCJ_DEFAULT_DATABASE_PATH_TAIL="\"$(db_pathtail)\"" \ @@ -232,6 +234,14 @@ libgcj_la_DEPENDENCIES = libgcj-$(gcc_version).jar \ $(LIBLTDL) $(libgcj_la_LIBADD) libgcj_la_LINK = $(LIBLINK) +## libjvm.so +libjvm_la_SOURCES = jni-libjvm.cc +libjvm_la_DEPENDENCIES = libgcj.la libgcj.spec +## See jv_convert_LDADD. +libjvm_la_LIBADD = -L$(here)/.libs libgcj.la +## The mysterious backslash in the grep pattern is consumed by make. +libjvm_la_LDFLAGS = -rpath $(toolexeclibdir) \ + -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LIBGCJ_LD_SYMBOLIC) ## The .db file. This rule is only used for native builds, so it is ## safe to invoke gcj-dbtool. @@ -887,6 +897,7 @@ create-headers: $(headers_to_make) $(libgcj_la_OBJECTS) $(gcj_dbtool_OBJECTS) $(xlib_nat_files): headers.stamp $(libgij_la_OBJECTS): headers.stamp +$(libjvm_la_OBJECTS): headers.stamp ## ################################################################ |