This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[tcb] import fix for libjava building from the mainline
- From: Andrew Pinski <pinskia at physics dot uc dot edu>
- To: GCC Patches <gcc-patches at gcc dot gnu dot org>
- Cc: Diego Novillo <dnovillo at redhat dot com>
- Date: Wed, 29 Sep 2004 19:51:05 -0400
- Subject: [tcb] import fix for libjava building from the mainline
I noticed this while trying to bootstrap the branch.
OK to apply?
Thanks,
Andrew Pinski
ChangeLog:
* Makefile.am: Import fix from the mainline.
* Makefile.in: Regenerate.
Index: Makefile.am
===================================================================
RCS file: /cvs/gcc/gcc/libjava/Makefile.am,v
retrieving revision 1.409.2.1
diff -u -p -r1.409.2.1 Makefile.am
--- Makefile.am 22 Sep 2004 23:45:16 -0000 1.409.2.1
+++ Makefile.am 29 Sep 2004 23:48:09 -0000
@@ -364,7 +364,8 @@ org/ietf/jgss/GSSName.java \
org/ietf/jgss/MessageProp.java \
org/ietf/jgss/Oid.java
-lib_org_ietf_jgss_la_DEPENDENCIES= $(jgss_propertyo_files)
+lib_org_ietf_jgss_la_DEPENDENCIES= $(jgss_propertyo_files) \
+ libgcj-@gcc_version@.jar libgcj.la libgcj.spec
## See jv_convert_LDADD.
lib_org_ietf_jgss_la_LIBADD = -L$(here)/.libs $(jgss_propertyo_files)
Index: Makefile.in
===================================================================
RCS file: /cvs/gcc/gcc/libjava/Makefile.in,v
retrieving revision 1.436.2.1
diff -u -p -r1.436.2.1 Makefile.in
--- Makefile.in 22 Sep 2004 23:45:18 -0000 1.436.2.1
+++ Makefile.in 29 Sep 2004 23:49:01 -0000
@@ -4564,7 +4564,8 @@ org/ietf/jgss/GSSName.java \
org/ietf/jgss/MessageProp.java \
org/ietf/jgss/Oid.java
-lib_org_ietf_jgss_la_DEPENDENCIES = $(jgss_propertyo_files)
+lib_org_ietf_jgss_la_DEPENDENCIES = $(jgss_propertyo_files) \
+ libgcj-@gcc_version@.jar libgcj.la libgcj.spec
lib_org_ietf_jgss_la_LIBADD = -L$(here)/.libs $(jgss_propertyo_files)
lib_org_ietf_jgss_la_LDFLAGS = -rpath $(toolexeclibdir) \
-version-info `grep -v '^\#' $(srcdir)/libtool-version`