aboutsummaryrefslogtreecommitdiff
path: root/libjava
diff options
context:
space:
mode:
authorThomas Fitzsimmons <fitzsim@redhat.com>2006-07-04 19:05:19 +0000
committerThomas Fitzsimmons <fitzsim@gcc.gnu.org>2006-07-04 19:05:19 +0000
commit56d30bd5c8440e8596a4165f2d42d09a28fc062c (patch)
treea0023ac68eb48a7c308aa3da84babb52b811edca /libjava
parent3329fcdc38863c561d0d4c55fbce2f1185e8ec19 (diff)
downloadgcc-56d30bd5c8440e8596a4165f2d42d09a28fc062c.zip
gcc-56d30bd5c8440e8596a4165f2d42d09a28fc062c.tar.gz
gcc-56d30bd5c8440e8596a4165f2d42d09a28fc062c.tar.bz2
re PR libgcj/28244 (missing dependency causes build failure)
2006-07-04 Thomas Fitzsimmons <fitzsim@redhat.com> PR libgcj/28244: * Makefile.am (libgcj_tools_la_DEPENDENCIES): Add libgcj.la and libgcj.spec. * Makefile.in: Regenerate. From-SVN: r115180
Diffstat (limited to 'libjava')
-rw-r--r--libjava/ChangeLog7
-rw-r--r--libjava/Makefile.am1
-rw-r--r--libjava/Makefile.in1
3 files changed, 9 insertions, 0 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 8f53b0a..7fbac79 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,10 @@
+2006-07-04 Thomas Fitzsimmons <fitzsim@redhat.com>
+
+ PR libgcj/28244:
+ * Makefile.am (libgcj_tools_la_DEPENDENCIES): Add libgcj.la and
+ libgcj.spec.
+ * Makefile.in: Regenerate.
+
2006-06-30 Thomas Fitzsimmons <fitzsim@redhat.com>
* classpath/tools/Makefile.am: Comment out tools wrapper creation.
diff --git a/libjava/Makefile.am b/libjava/Makefile.am
index 8acc260..95d4c50 100644
--- a/libjava/Makefile.am
+++ b/libjava/Makefile.am
@@ -239,6 +239,7 @@ libgcj_tools_la_SOURCES = classpath/tools/tools.jar
libgcj_tools_la_GCJFLAGS = $(AM_GCJFLAGS) -findirect-dispatch
libgcj_tools_la_LDFLAGS = -rpath $(toolexeclibdir) \
-version-info `grep -v '^\#' $(srcdir)/libtool-version`
+libgcj_tools_la_DEPENDENCIES = libgcj.la libgcj.spec
libgcj_tools_la_LINK = $(LIBLINK)
## libjvm.so
diff --git a/libjava/Makefile.in b/libjava/Makefile.in
index 457d11c..6337fed 100644
--- a/libjava/Makefile.in
+++ b/libjava/Makefile.in
@@ -787,6 +787,7 @@ libgcj_tools_la_GCJFLAGS = $(AM_GCJFLAGS) -findirect-dispatch
libgcj_tools_la_LDFLAGS = -rpath $(toolexeclibdir) \
-version-info `grep -v '^\#' $(srcdir)/libtool-version`
+libgcj_tools_la_DEPENDENCIES = libgcj.la libgcj.spec
libgcj_tools_la_LINK = $(LIBLINK)
libjvm_la_SOURCES = jni-libjvm.cc
libjvm_la_DEPENDENCIES = libgcj.la libgcj.spec