From 5f9cea34bb64e74edc3994d146a992b494ffd6f2 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sun, 2 Feb 2003 23:06:39 +0000 Subject: [PATCH] Makefile.in: Rebuilt. * Makefile.in: Rebuilt. * Makefile.am (lib_gnu_awt_xlib_la_LDFLAGS): Link against libstdc++. From-SVN: r62291 --- libjava/ChangeLog | 6 ++++++ libjava/Makefile.am | 3 ++- 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 + + * Makefile.in: Rebuilt. + * Makefile.am (lib_gnu_awt_xlib_la_LDFLAGS): Link against + libstdc++. + 2003-01-31 Mark WIelaard * 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 \ -- 2.30.2