diff options
| author | bothner <bothner@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-05-22 06:40:06 +0000 |
|---|---|---|
| committer | bothner <bothner@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-05-22 06:40:06 +0000 |
| commit | 7b9078179c9c941cfe4e909b0716acc06a2d3fac (patch) | |
| tree | d99d493fc461dea536ffccf885eae69b91aca1ce /libjava | |
| parent | fd781f88c9e0d9a1c7930526b027020566ee9e19 (diff) | |
* Makefile.am (libgcj_la_DEPENDENCIES): Add $(nat_files).
(libgcj_la_LIBADD): Likewise.
(libgcjx_la_DEPENDENCIES, libgcjx_la_LIBADD): Add $(x_nat_files).
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@42424 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 8 | ||||
| -rw-r--r-- | libjava/Makefile.am | 8 |
2 files changed, 11 insertions, 5 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index a6b3122af69..2227cea5472 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,5 +1,11 @@ 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. * java/lang/natString.cc (_JvFormatInt): New primitive, with logic taken from old Integer.toString code. @@ -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 2444ae7a255..424df67c0a5 100644 --- 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. |