diff options
| author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-02-02 23:06:39 +0000 |
|---|---|---|
| committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-02-02 23:06:39 +0000 |
| commit | 65c9162c856eda48e37b49e7c6b25278172edb8d (patch) | |
| tree | 7fd7b19a1258563476fc0b51812976d8b55a5c6f /libjava | |
| parent | 70e7788a948db6da07dfda6146f1a263f6e054eb (diff) | |
| download | gcc-65c9162c856eda48e37b49e7c6b25278172edb8d.tar.gz | |
* Makefile.in: Rebuilt.
* Makefile.am (lib_gnu_awt_xlib_la_LDFLAGS): Link against
libstdc++.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@62291 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 6 | ||||
| -rw-r--r-- | libjava/Makefile.am | 3 | ||||
| -rw-r--r-- | libjava/Makefile.in | 5 |
3 files changed, 11 insertions, 3 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 8b181d89f45..6f9592d0438 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,9 @@ +2003-02-02 Tom Tromey <tromey@redhat.com> + + * Makefile.in: Rebuilt. + * Makefile.am (lib_gnu_awt_xlib_la_LDFLAGS): Link against + libstdc++. + 2003-01-31 Mark WIelaard <mark@klomp.org> * Makefile.in: Rebuilt. diff --git a/libjava/Makefile.am b/libjava/Makefile.am index 45495f8dafb..28b67a3f41b 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -308,7 +308,8 @@ lib_gnu_awt_xlib_la_SOURCES = $(x_nat_source_files) EXTRA_lib_gnu_awt_xlib_la_SOURCES = $(x_java_source_files) lib_gnu_awt_xlib_la_DEPENDENCIES = libgcj-@gcc_version@.jar $(x_javao_files) lib_gnu_awt_xlib_la_LIBADD = $(x_javao_files) -lib_gnu_awt_xlib_la_LDFLAGS = @X_PRE_LIBS@ @X_LIBS@ -lX11 @X_EXTRA_LIBS@ \ +lib_gnu_awt_xlib_la_LDFLAGS = ../libstdc++-v3/src/libstdc++.la \ + @X_PRE_LIBS@ @X_LIBS@ -lX11 @X_EXTRA_LIBS@ \ -rpath $(toolexeclibdir) \ ## The mysterious backslash is consumed by make. -version-info `grep -v '^\#' $(srcdir)/libtool-version` diff --git a/libjava/Makefile.in b/libjava/Makefile.in index 0ca9cc8cae2..06c9a2977da 100644 --- a/libjava/Makefile.in +++ b/libjava/Makefile.in @@ -390,7 +390,8 @@ lib_gnu_awt_xlib_la_SOURCES = $(x_nat_source_files) EXTRA_lib_gnu_awt_xlib_la_SOURCES = $(x_java_source_files) lib_gnu_awt_xlib_la_DEPENDENCIES = libgcj-@gcc_version@.jar $(x_javao_files) lib_gnu_awt_xlib_la_LIBADD = $(x_javao_files) -lib_gnu_awt_xlib_la_LDFLAGS = @X_PRE_LIBS@ @X_LIBS@ -lX11 @X_EXTRA_LIBS@ \ +lib_gnu_awt_xlib_la_LDFLAGS = ../libstdc++-v3/src/libstdc++.la \ + @X_PRE_LIBS@ @X_LIBS@ -lX11 @X_EXTRA_LIBS@ \ -rpath $(toolexeclibdir) \ -version-info `grep -v '^\#' $(srcdir)/libtool-version` @@ -2529,7 +2530,7 @@ libgcj-test.spec.in libgcj.spec.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = tar +TAR = gtar GZIP_ENV = --best DIST_SUBDIRS = @DIRLTDL@ testsuite gcj include @DIRLTDL@ gcj include DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \ |