Makefile.am (libgcj_la_DEPENDENCIES): Add $(nat_files).

	* Makefile.am (libgcj_la_DEPENDENCIES):  Add $(nat_files).
	(libgcj_la_LIBADD):  Likewise.
	(libgcjx_la_DEPENDENCIES, libgcjx_la_LIBADD):  Add $(x_nat_files).

From-SVN: r42424

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index a6b3122af695ab08860136b16db075654e1d48c3..2227cea5472e6f6681a7a522468d54116d2a6678 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+2001-05-21  Per Bothner  <per@bothner.com>
+
+       * Makefile.am (libgcj_la_DEPENDENCIES):  Add $(nat_files).
+       (libgcj_la_LIBADD):  Likewise.
+       (libgcjx_la_DEPENDENCIES, libgcjx_la_LIBADD):  Add $(x_nat_files).
+       
 2001-05-21  Per Bothner  <per@bothner.com>
 
        * gcj/javaprims.h (_Jv_FormatInt):  New declaration.
@@ -9,7 +15,7 @@
        * java/lang/String.java (valueOf(int)):  Make native.
        * java/lang/StringBuffer.java (append(int)):  Make native.
        * java/lang/natStringBuffer.cc:  New file, for append(jint).
-       * Makefile.am (ant_source_files):  Add java/lang/natStringBuffer.cc.
+       * Makefile.am (nat_source_files):  Add java/lang/natStringBuffer.cc.
 
 2001-05-21  Tom Tromey  <tromey@redhat.com>
 

diff --git a/libjava/Makefile.am b/libjava/Makefile.am
index 2444ae7a255e43c53bf5000773e9abd69cd82118..424df67c0a534c3f6a0d137e1ee55b9694a00ffd 100644 (file)
--- a/libjava/Makefile.am
+++ b/libjava/Makefile.am
@@ -133,10 +133,10 @@ libgcj_la_SOURCES = prims.cc posix.cc jni.cc exception.cc \
        $(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) \
+libgcj_la_DEPENDENCIES = libgcj.jar $(javao_files) $(nat_files) \
        $(c_files) $(GCOBJS) $(THREADOBJS) $(LIBLTDL)
 
-libgcj_la_LIBADD = $(javao_files) $(c_files) $(GCOBJS) \
+libgcj_la_LIBADD = $(javao_files) $(c_files) $(nat_files) $(GCOBJS) \
        $(THREADOBJS)
 # Include THREADLIBS here to ensure that the correct version of
 # certain linuxthread functions get linked:
@@ -147,8 +147,8 @@ libgcj_la_LINK = $(LIBLINK)
 
 libgcjx_la_SOURCES = $(x_nat_source_files)
 EXTRA_libgcjx_la_SOURCES = $(x_java_source_files)
-libgcjx_la_DEPENDENCIES = libgcj.jar $(x_javao_files)
-libgcjx_la_LIBADD = $(x_javao_files)
+libgcjx_la_DEPENDENCIES = libgcj.jar $(x_javao_files) $(x_nat_files)
+libgcjx_la_LIBADD = $(x_javao_files) $(x_nat_files)
 libgcjx_la_LDFLAGS = @X_PRE_LIBS@ @X_LIBS@ -lX11 @X_EXTRA_LIBS@ \
         -rpath $(toolexeclibdir) \
 ## The mysterious backslash is consumed by make.