This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
Patch: Makefile.am reversion
- To: Java Patch List <java-patches at gcc dot gnu dot org>
- Subject: Patch: Makefile.am reversion
- From: Tom Tromey <tromey at redhat dot com>
- Date: 23 May 2001 23:51:18 -0600
- Reply-To: tromey at redhat dot com
I'm checking this in.
2001-05-23 Tom Tromey <tromey@redhat.com>
Revert patch of 2001-05-21:
* Makefile.am (libgcj_la_DEPENDENCIES): Removed nat_files.
(libgcj_la_LIBADD): Likewise.
(libgcjx_la_DEPENDENCIES): Removed x_nat_files.
(libgcjx_la_LIBADD): Likewise.
Tom
Index: Makefile.am
===================================================================
RCS file: /cvs/gcc/gcc/libjava/Makefile.am,v
retrieving revision 1.147
diff -u -r1.147 Makefile.am
--- Makefile.am 2001/05/22 06:47:48 1.147
+++ Makefile.am 2001/05/24 05:41:09
@@ -133,10 +133,10 @@
$(nat_source_files)
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.jar $(javao_files) $(nat_files) \
+libgcj_la_DEPENDENCIES = libgcj.jar $(javao_files) \
$(c_files) $(GCOBJS) $(THREADOBJS) $(LIBLTDL)
-libgcj_la_LIBADD = $(javao_files) $(c_files) $(nat_files) $(GCOBJS) \
+libgcj_la_LIBADD = $(javao_files) $(c_files) $(GCOBJS) \
$(THREADOBJS)
# Include THREADLIBS here to ensure that the correct version of
# certain linuxthread functions get linked:
@@ -147,8 +147,8 @@
libgcjx_la_SOURCES = $(x_nat_source_files)
EXTRA_libgcjx_la_SOURCES = $(x_java_source_files)
-libgcjx_la_DEPENDENCIES = libgcj.jar $(x_javao_files) $(x_nat_files)
-libgcjx_la_LIBADD = $(x_javao_files) $(x_nat_files)
+libgcjx_la_DEPENDENCIES = libgcj.jar $(x_javao_files)
+libgcjx_la_LIBADD = $(x_javao_files)
libgcjx_la_LDFLAGS = @X_PRE_LIBS@ @X_LIBS@ -lX11 @X_EXTRA_LIBS@ \
-rpath $(toolexeclibdir) \
## The mysterious backslash is consumed by make.