2007-01-23 H.J. Lu <hongjiu.lu@intel.com>

	PR libgcj/30550
	* Makefile.am (ecjx_DEPENDENCIES): Add libgcj_bc.la if needed.
	* Makefile.in: Regenerated.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@121086 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 5ab1789..9b785af 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+2007-01-23  H.J. Lu  <hongjiu.lu@intel.com>
+
+       PR libgcj/30550
+       * Makefile.am (ecjx_DEPENDENCIES): Add libgcj_bc.la if needed.
+       * Makefile.in: Regenerated.
+

 2007-01-22  Keith Seitz  <keiths@redhat.com>
 
        * gnu/classpath/jdwp/natVMVirtualMachine.cc
 2007-01-22  Keith Seitz  <keiths@redhat.com>
 
        * gnu/classpath/jdwp/natVMVirtualMachine.cc

diff --git a/libjava/Makefile.am b/libjava/Makefile.am
index eed4f6b..2b75f9d 100644 (file)
--- a/libjava/Makefile.am
+++ b/libjava/Makefile.am
@@ -678,6 +678,9 @@ endif !ENABLE_SHARED
 
 ecjx_LDADD = -L$(here)/.libs libgcj.la
 ecjx_DEPENDENCIES = libgcj.la libgcj.spec
 
 ecjx_LDADD = -L$(here)/.libs libgcj.la
 ecjx_DEPENDENCIES = libgcj.la libgcj.spec

+if USE_LIBGCJ_BC
+ecjx_DEPENDENCIES += libgcj_bc.la
+endif

 
 else !NATIVE
 
 
 else !NATIVE
 

diff --git a/libjava/Makefile.in b/libjava/Makefile.in
index 37eced9..c674a67 100644 (file)
--- a/libjava/Makefile.in
+++ b/libjava/Makefile.in
@@ -74,7 +74,8 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/../compile \
        $(top_srcdir)/scripts/jar.in COPYING ChangeLog NEWS THANKS
 @MAINTAINER_MODE_TRUE@@NATIVE_TRUE@noinst_PROGRAMS =  \
 @MAINTAINER_MODE_TRUE@@NATIVE_TRUE@    gen-from-JIS$(EXEEXT)
        $(top_srcdir)/scripts/jar.in COPYING ChangeLog NEWS THANKS
 @MAINTAINER_MODE_TRUE@@NATIVE_TRUE@noinst_PROGRAMS =  \
 @MAINTAINER_MODE_TRUE@@NATIVE_TRUE@    gen-from-JIS$(EXEEXT)

-@XLIB_AWT_TRUE@am__append_15 = $(xlib_nat_headers)
+@NATIVE_TRUE@@USE_LIBGCJ_BC_TRUE@am__append_15 = libgcj_bc.la
+@XLIB_AWT_TRUE@am__append_16 = $(xlib_nat_headers)

 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \


@@ -7799,7 +7800,8 @@ ECJX_BASE_FLAGS = -findirect-dispatch \
 @NATIVE_FALSE@ecjx_LDADD = 
 @NATIVE_TRUE@ecjx_LDADD = -L$(here)/.libs libgcj.la
 @NATIVE_FALSE@ecjx_DEPENDENCIES = 
 @NATIVE_FALSE@ecjx_LDADD = 
 @NATIVE_TRUE@ecjx_LDADD = -L$(here)/.libs libgcj.la
 @NATIVE_FALSE@ecjx_DEPENDENCIES = 

-@NATIVE_TRUE@ecjx_DEPENDENCIES = libgcj.la libgcj.spec
+@NATIVE_TRUE@ecjx_DEPENDENCIES = libgcj.la libgcj.spec \
+@NATIVE_TRUE@  $(am__append_15)

 gappletviewer_SOURCES = 
 gappletviewer_LDFLAGS = --main=gnu.classpath.tools.appletviewer.Main \
        -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS)
 gappletviewer_SOURCES = 
 gappletviewer_LDFLAGS = --main=gnu.classpath.tools.appletviewer.Main \
        -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS)


@@ -7990,7 +7992,7 @@ gnu/gcj/xlib/natXImage.cc \
 gnu/gcj/xlib/natXUnmapEvent.cc
 
 sourcesdir = $(jardir)
 gnu/gcj/xlib/natXUnmapEvent.cc
 
 sourcesdir = $(jardir)

-headers_to_make = $(nat_headers) $(am__append_15)
+headers_to_make = $(nat_headers) $(am__append_16)

 
 # Work around what appears to be a GNU make bug handling MAKEFLAGS
 # values defined in terms of make variables, as is the case for CC and
 
 # Work around what appears to be a GNU make bug handling MAKEFLAGS
 # values defined in terms of make variables, as is the case for CC and