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. From-SVN: r42520
This commit is contained in:
parent
3610e0d548
commit
4c6a2b018f
3 changed files with 1556 additions and 55 deletions
|
@ -1,5 +1,11 @@
|
|||
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.
|
||||
|
||||
* posix-threads.cc (_Jv_self_cache): Renamed from self_cache.
|
||||
* gcj/Makefile.in: Rebuilt.
|
||||
* gcj/Makefile.am (gcj_HEADERS): Added libgcj-config.h.
|
||||
|
|
|
@ -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) $(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 @@ 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) $(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.
|
||||
|
|
1597
libjava/Makefile.in
1597
libjava/Makefile.in
File diff suppressed because one or more lines are too long
Loading…
Add table
Reference in a new issue