Makefile.in: Rebuilt.

* Makefile.in: Rebuilt.
	* Makefile.am (libgij_la_LIBADD): Moved SAX and DOM...
	(libgcj0_convenience_la_LIBADD): ... here.

From-SVN: r98200
This commit is contained in:
Tom Tromey 2005-04-15 18:45:16 +00:00 committed by Tom Tromey
parent 9f1054af04
commit 84c4029365
3 changed files with 16 additions and 10 deletions

View File

@ -1,3 +1,9 @@
2005-04-15 Tom Tromey <tromey@redhat.com>
* Makefile.in: Rebuilt.
* Makefile.am (libgij_la_LIBADD): Moved SAX and DOM...
(libgcj0_convenience_la_LIBADD): ... here.
2005-04-14 Thomas Fitzsimmons <fitzsim@redhat.com>
* gij.cc (version): Properly quote java version.

View File

@ -235,9 +235,7 @@ BOOTCLASSPATH = $(here)'$(CLASSPATH_SEPARATOR)'$(srcdir)'$(CLASSPATH_SEPARATOR)'
libgij_la_SOURCES = gij.cc
libgij_la_DEPENDENCIES = libgcj.la libgcj.spec
## See jv_convert_LDADD.
libgij_la_LIBADD = -L$(here)/.libs libgcj.la \
external/sax/libsax-gcj.la \
external/w3c_dom/libw3c-gcj.la
libgij_la_LIBADD = -L$(here)/.libs libgcj.la
## The mysterious backslash in the grep pattern is consumed by make.
libgij_la_LDFLAGS = -rpath $(toolexeclibdir) \
-version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LIBGCJ_LD_SYMBOLIC)
@ -257,7 +255,9 @@ libgcj0_convenience_la_SOURCES = prims.cc jni.cc exception.cc stacktrace.cc \
$(POSIX_THREAD_SRC) $(WIN32_THREAD_SRC) $(NO_THREAD_SRC)
libgcj0_convenience_la_LIBADD = \
gnu-xml.lo javax-imageio.lo \
javax-xml.lo gnu-java-beans.lo
javax-xml.lo gnu-java-beans.lo \
external/sax/libsax-gcj.la \
external/w3c_dom/libw3c-gcj.la
noinst_LTLIBRARIES = libgcj0_convenience.la

View File

@ -234,7 +234,8 @@ am__DEPENDENCIES_3 = $(am__DEPENDENCIES_2)
am_libgcj_la_OBJECTS =
libgcj_la_OBJECTS = $(am_libgcj_la_OBJECTS)
libgcj0_convenience_la_DEPENDENCIES = gnu-xml.lo javax-imageio.lo \
javax-xml.lo gnu-java-beans.lo
javax-xml.lo gnu-java-beans.lo external/sax/libsax-gcj.la \
external/w3c_dom/libw3c-gcj.la
am__libgcj0_convenience_la_SOURCES_DIST = prims.cc jni.cc exception.cc \
stacktrace.cc link.cc defineclass.cc interpret.cc verify.cc \
gnu/gcj/natCore.cc gnu/gcj/convert/JIS0208_to_Unicode.cc \
@ -4508,10 +4509,7 @@ AM_CPPFLAGS = -I$(top_srcdir) -Iinclude -I$(top_srcdir)/include \
BOOTCLASSPATH = $(here)'$(CLASSPATH_SEPARATOR)'$(srcdir)'$(CLASSPATH_SEPARATOR)'$(srcdir)/external/w3c_dom'$(CLASSPATH_SEPARATOR)'$(srcdir)/external/sax
libgij_la_SOURCES = gij.cc
libgij_la_DEPENDENCIES = libgcj.la libgcj.spec
libgij_la_LIBADD = -L$(here)/.libs libgcj.la \
external/sax/libsax-gcj.la \
external/w3c_dom/libw3c-gcj.la
libgij_la_LIBADD = -L$(here)/.libs libgcj.la
libgij_la_LDFLAGS = -rpath $(toolexeclibdir) \
-version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LIBGCJ_LD_SYMBOLIC)
@ -4532,7 +4530,9 @@ libgcj0_convenience_la_SOURCES = prims.cc jni.cc exception.cc stacktrace.cc \
libgcj0_convenience_la_LIBADD = \
gnu-xml.lo javax-imageio.lo \
javax-xml.lo gnu-java-beans.lo
javax-xml.lo gnu-java-beans.lo \
external/sax/libsax-gcj.la \
external/w3c_dom/libw3c-gcj.la
noinst_LTLIBRARIES = libgcj0_convenience.la
libgcj_la_SOURCES =