This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
[gcjx] Patch: FYI: gcjx -vs- jni headers in libjava
- From: Tom Tromey <tromey at redhat dot com>
- To: Java Patch List <java-patches at gcc dot gnu dot org>
- Date: 17 Apr 2005 15:30:13 -0600
- Subject: [gcjx] Patch: FYI: gcjx -vs- jni headers in libjava
- Reply-to: tromey at redhat dot com
I'm checking this in on the gcjx branch.
This updates the libjava Makefile to use gcjx to generate the JNI
headers.
Tom
Index: ChangeLog
from Tom Tromey <tromey@redhat.com>
* Makefile.in, configure: Rebuilt.
* Makefile.am ($(gtk_jni_headers)): Use GCJX.
* configure.ac (GCJH): Removed.
Index: Makefile.am
===================================================================
RCS file: /cvs/gcc/gcc/libjava/Makefile.am,v
retrieving revision 1.435.2.2
diff -u -r1.435.2.2 Makefile.am
--- Makefile.am 17 Apr 2005 20:42:16 -0000 1.435.2.2
+++ Makefile.am 17 Apr 2005 21:29:50 -0000
@@ -434,9 +434,9 @@
jniinclude/gnu_java_awt_peer_gtk_GdkFontPeer.h: gnu/java/awt/peer/gtk/GdkFontPeer.java
$(gtk_jni_headers): %.h:
- @input=`echo $@ | sed -e 's,jniinclude/,,' -e 's,_,.,g' -e 's,.h$$,,'`; \
- echo "$(GCJH) -jni -d jniinclude -classpath '' -bootclasspath $(top_builddir) $$input"; \
- $(GCJH) -jni -d jniinclude -classpath '' -bootclasspath $(top_builddir) $$input
+ @input=`echo $@ | sed -e 's,jniinclude/,,' -e 's,_,/,g' -e 's,.h$$,.class,'`; \
+ echo "$(GCJX) -o jni -d jniinclude -classpath '' -bootclasspath $(top_builddir) $$input"; \
+ $(GCJX) -o jni -d jniinclude -classpath '' -bootclasspath $(top_builddir) $$input
jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontMetrics.lo: $(top_builddir)/jniinclude/gnu_java_awt_peer_gtk_GdkFontMetrics.h
jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.lo: $(top_builddir)/jniinclude/gnu_java_awt_peer_gtk_GdkFontPeer.h
Index: configure.ac
===================================================================
RCS file: /cvs/gcc/gcc/libjava/configure.ac,v
retrieving revision 1.16.2.2
diff -u -r1.16.2.2 configure.ac
--- configure.ac 17 Apr 2005 21:07:21 -0000 1.16.2.2
+++ configure.ac 17 Apr 2005 21:29:57 -0000
@@ -1073,7 +1073,6 @@
case "${which_gcj}" in
built)
GCJ="$built_gcc_dir/gcj -B`${PWDCMD-pwd}`/ -B$built_gcc_dir/"
- GCJH='$(MULTIBUILDTOP)../$(COMPPATH)/gcc/gcjh'
GCJX='$(MULTIBUILDTOP)../$(COMPPATH)/gcjx/gcjx'
ZIP='$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/fastjar'
;;
@@ -1086,7 +1085,6 @@
GCJ="${target_noncanonical}-gcj -B`${PWDCMD-pwd}`/"
fi
ZIP=jar
- GCJH='$(target_noncanonical)-gcjh'
GCJX='$(target_noncanonical)-gcjx'
;;
path)
@@ -1094,12 +1092,10 @@
## In this case, gcj is found outside the build tree. However, zip is
## found in the build tree.
ZIP='$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/fastjar'
- GCJH=gcjh
GCJX=gcjx
;;
esac
-AC_SUBST(GCJH)
AC_SUBST(ZIP)
AC_SUBST(GCJX)