summaryrefslogtreecommitdiffstats
path: root/libjava
diff options
context:
space:
mode:
authoraph <aph@138bc75d-0d04-0410-961f-82ee72b054a4>2004-10-15 17:01:19 +0000
committeraph <aph@138bc75d-0d04-0410-961f-82ee72b054a4>2004-10-15 17:01:19 +0000
commit8f55b131b07f2fbb1a0f4b57d7359b6a00581765 (patch)
treef09f9a0a55dae2ce9478531d5ef727fa0f3937f5 /libjava
parent70ba601b2f69d4609cc9e6ffa1e5c4ad59d05be0 (diff)
downloadppe42-gcc-8f55b131b07f2fbb1a0f4b57d7359b6a00581765.tar.gz
ppe42-gcc-8f55b131b07f2fbb1a0f4b57d7359b6a00581765.zip
2004-10-15 Andrew Haley <aph@redhat.com>
* Makefile.am (nat_files, xlib_nat_files): New. * Makefile.in: Regenerate. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@89104 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
-rw-r--r--libjava/ChangeLog5
-rw-r--r--libjava/Makefile.am4
-rw-r--r--libjava/Makefile.in2
3 files changed, 11 insertions, 0 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 2a0fa475725..5600321cb23 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-15 Andrew Haley <aph@redhat.com>
+
+ * Makefile.am (nat_files, xlib_nat_files): New.
+ * Makefile.in: Regenerate.
+
2004-10-14 Ulrich Weigand <uweigand@de.ibm.com>
* jni.cc (_Jv_JNIMethod::call): Use ffi_java_raw_call instead of
diff --git a/libjava/Makefile.am b/libjava/Makefile.am
index 1e0e9c07870..13a31180ca0 100644
--- a/libjava/Makefile.am
+++ b/libjava/Makefile.am
@@ -211,6 +211,10 @@ libgcj_la_DEPENDENCIES = libgcj-@gcc_version@.jar \
java/lang/fdlibm.h java/lang/ieeefp.h java/lang/mprec.h \
$(LIBLTDL) $(LIBFFI) $(ZLIBS) $(GCLIBS) $(propertyo_files)
+## Objects from C++ sources in subdirs.
+nat_files = $(nat_source_files:.cc=.lo)
+xlib_nat_files = $(xlib_nat_source_files:.cc=.lo)
+
# Include THREADLIBS here to ensure that the correct version of
# certain linuxthread functions get linked:
## The mysterious backslash in the grep pattern is consumed by make.
diff --git a/libjava/Makefile.in b/libjava/Makefile.in
index 678acdcb493..0d00ec0186c 100644
--- a/libjava/Makefile.in
+++ b/libjava/Makefile.in
@@ -4432,6 +4432,8 @@ libgcj_la_DEPENDENCIES = libgcj-@gcc_version@.jar \
java/lang/fdlibm.h java/lang/ieeefp.h java/lang/mprec.h \
$(LIBLTDL) $(LIBFFI) $(ZLIBS) $(GCLIBS) $(propertyo_files)
+nat_files = $(nat_source_files:.cc=.lo)
+xlib_nat_files = $(xlib_nat_source_files:.cc=.lo)
# Include THREADLIBS here to ensure that the correct version of
# certain linuxthread functions get linked:
OpenPOWER on IntegriCloud