* Makefile.am (generic_header_files): Add $(inner_nat_headers).

	* Makefile.in: Rebuilt.
	* testsuite/Makefile.am (check-dejaGNU): Depend on compile-tests.
	(MYGCJH): New variable.
	(compile-tests): New goal.
	* testsuite/Makefile.in: Rebuilt.


git-svn-id: https://gcc.gnu.org/svn/gcc/branches/redhat/gcc-4_1-branch-java-merge-20070117@121125 138bc75d-0d04-0410-961f-82ee72b054a4

5 files changed, 150 insertions, 15 deletions

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 9a3d46e2771..dbdb4ea1408 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,12 @@
+2007-01-24  Jakub Jelinek  <jakub@redhat.com>
+
+	* Makefile.am (generic_header_files): Add $(inner_nat_headers).
+	* Makefile.in: Rebuilt.
+	* testsuite/Makefile.am (check-dejaGNU): Depend on compile-tests.
+	(MYGCJH): New variable.
+	(compile-tests): New goal.
+	* testsuite/Makefile.in: Rebuilt.
+
 2007-01-24  Andrew Haley  <aph@redhat.com>
 
 	* gnu/classpath/natVMStackWalker.cc: Call InitClass everywhere.
diff --git a/libjava/Makefile.am b/libjava/Makefile.am
index fe8c732b434..89278e1908c 100644
--- a/libjava/Makefile.am
+++ b/libjava/Makefile.am
@@ -391,19 +391,6 @@ omitted_headers = java/lang/ClassLoader.h java/lang/Thread.h \
 	java/lang/reflect/Field.h java/lang/reflect/Method.h \
 	java/lang/reflect/Proxy.h gnu/gcj/runtime/ExtensionClassLoader.h
 
-generic_header_files = $(ordinary_header_files) $(xlib_nat_headers)
-
-MYGCJH = gjavah
-
-$(generic_header_files): gcjh.stamp
-
-gcjh.stamp: classpath/lib/compile-classes
-if JAVA_MAINTAINER_MODE
-	$(MYGCJH) --cni --all $(srcdir)/classpath/lib \
-	    --cmdfile=$(srcdir)/headers.txt -d $(srcdir) --force
-endif
-	echo > gcjh.stamp
-
 inner_nat_headers = java/io/ObjectOutputStream$$PutField.h \
 	java/io/ObjectInputStream$$GetField.h \
 	java/nio/DirectByteBufferImpl$$ReadWrite.h \
@@ -416,6 +403,20 @@ inner_nat_headers = java/io/ObjectOutputStream$$PutField.h \
 	gnu/java/nio/PipeImpl$$SinkChannelImpl.h \
 	gnu/java/nio/PipeImpl$$SourceChannelImpl.h
 
+generic_header_files = $(ordinary_header_files) $(inner_nat_headers) \
+	$(xlib_nat_headers)
+
+MYGCJH = gjavah
+
+$(generic_header_files): gcjh.stamp
+
+gcjh.stamp: classpath/lib/compile-classes
+if JAVA_MAINTAINER_MODE
+	$(MYGCJH) --cni --all $(srcdir)/classpath/lib \
+	    --cmdfile=$(srcdir)/headers.txt -d $(srcdir) --force
+endif
+	echo > gcjh.stamp
+
 nat_headers = $(ordinary_header_files) $(inner_nat_headers)
 nat_headers_install = $(ordinary_header_files)
 
diff --git a/libjava/Makefile.in b/libjava/Makefile.in
index 8808cfd6f22..35377b0858d 100644
--- a/libjava/Makefile.in
+++ b/libjava/Makefile.in
@@ -7729,8 +7729,6 @@ omitted_headers = java/lang/ClassLoader.h java/lang/Thread.h \
 	java/lang/reflect/Field.h java/lang/reflect/Method.h \
 	java/lang/reflect/Proxy.h gnu/gcj/runtime/ExtensionClassLoader.h
 
-generic_header_files = $(ordinary_header_files) $(xlib_nat_headers)
-MYGCJH = gjavah
 inner_nat_headers = java/io/ObjectOutputStream$$PutField.h \
 	java/io/ObjectInputStream$$GetField.h \
 	java/nio/DirectByteBufferImpl$$ReadWrite.h \
@@ -7743,6 +7741,10 @@ inner_nat_headers = java/io/ObjectOutputStream$$PutField.h \
 	gnu/java/nio/PipeImpl$$SinkChannelImpl.h \
 	gnu/java/nio/PipeImpl$$SourceChannelImpl.h
 
+generic_header_files = $(ordinary_header_files) $(inner_nat_headers) \
+	$(xlib_nat_headers)
+
+MYGCJH = gjavah
 nat_headers = $(ordinary_header_files) $(inner_nat_headers)
 nat_headers_install = $(ordinary_header_files)
 xlib_nat_headers = $(gnu_awt_xlib_header_files) $(gnu_gcj_xlib_header_files)
diff --git a/libjava/testsuite/Makefile.am b/libjava/testsuite/Makefile.am
index e2775f164b8..371d34ca407 100644
--- a/libjava/testsuite/Makefile.am
+++ b/libjava/testsuite/Makefile.am
@@ -19,3 +19,66 @@ RUNTEST = "`if [ -f $(top_srcdir)/../dejagnu/runtest ] ; then \
 
 ## Tell dejagnu whether the interpreter is enabled.
 AM_RUNTESTFLAGS = INTERPRETER=$(INTERPRETER)
+
+MYGCJH = gjavah
+
+.PHONY: compile-tests
+
+check-dejaGNU: compile-tests
+
+compile-tests:
+if JAVA_MAINTAINER_MODE
+	for test in `cd $(srcdir) > /dev/null; \
+		     find libjava.cni libjava.jni libjava.jvmti libjava.lang \
+			  libjava.loader libjava.verify -name \*.java`; do \
+	  testjar=$(srcdir)/`echo $$test | sed -e 's/\.java$$/\.jar/'`; \
+	  testdep=; \
+	  genheader=; \
+	  case "$$test" in \
+	    libjava.loader/dummy.java) \
+	      testjar=$(srcdir)/libjava.loader/dummy.class;; \
+	    libjava.loader/MyLoader.java) \
+	      continue;; \
+	    libjava.loader/*.java) \
+	      testdep="libjava.loader/MyLoader.java";; \
+	    libjava.jni/register2.java) \
+	      ;; \
+	    libjava.jni/*.java) \
+	      genheader=-jni;; \
+	    libjava.jvmti/*.java|libjava.cni/*.java) \
+	      genheader=-cni;; \
+	  esac; \
+	  if test -f $$testjar; then \
+	    if ! test $(srcdir)/$$test -nt $$testjar; then \
+	      test -z "$$testdep" && continue; \
+	      test $(srcdir)/$$testdep -nt $$testjar || continue; \
+	    fi; \
+	  fi; \
+	  echo Compiling $$test; \
+	  testtmpdir=`echo $$test | sed -e 's,/,_,g'`T; \
+	  rm -rf $$testtmpdir; $(mkdir_p) $$testtmpdir; \
+	  if test -n "$$testdep"; then \
+	    $(GCJ) -C -g -w --encoding=UTF-8 -bootclasspath \
+	      $(top_builddir)/libgcj-$(gcc_version).jar::$testtmpdir \
+	      -d $$testtmpdir $(srcdir)/$$testdep || exit; \
+	  fi; \
+	  $(GCJ) -C -g -w --encoding=UTF-8 -bootclasspath \
+	    $(top_builddir)/libgcj-$(gcc_version).jar:$$testtmpdir \
+	    -d $$testtmpdir $(srcdir)/$$test || exit; \
+	  case "$$test" in \
+	    libjava.loader/dummy.java) \
+	      cp $$testtmpdir/dummy.class $$testjar;; \
+	    *) \
+	      $(JAR) cf $$testjar \
+		`ls $$testtmpdir/*.class \
+		 | sed -e 's,^,-C ,;s,/\([^/]*\.class\)$$, \1,'` || exit ;; \
+	  esac; \
+	  if test -n "$$genheader"; then \
+	    $(MYGCJH) $$genheader $$testtmpdir/*.class \
+	      -bootclasspath $(top_builddir)/libgcj-$(gcc_version).jar \
+	      -d $$testtmpdir/ || exit; \
+	    mv $$testtmpdir/*.h $(srcdir)/`dirname $$test`/; \
+	  fi; \
+	  rm -rf $$testtmpdir; \
+	done
+endif
diff --git a/libjava/testsuite/Makefile.in b/libjava/testsuite/Makefile.in
index 67231dc65e4..dbd8a1c7006 100644
--- a/libjava/testsuite/Makefile.in
+++ b/libjava/testsuite/Makefile.in
@@ -320,6 +320,7 @@ RUNTEST = "`if [ -f $(top_srcdir)/../dejagnu/runtest ] ; then \
 	    else echo runtest; fi` $(AM_RUNTESTFLAGS)"
 
 AM_RUNTESTFLAGS = INTERPRETER=$(INTERPRETER)
+MYGCJH = gjavah
 all: all-am
 
 .SUFFIXES:
@@ -518,6 +519,65 @@ uninstall-am: uninstall-info-am
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	uninstall uninstall-am uninstall-info-am
 
+
+.PHONY: compile-tests
+
+check-dejaGNU: compile-tests
+
+compile-tests:
+@JAVA_MAINTAINER_MODE_TRUE@	for test in `cd $(srcdir) > /dev/null; \
+@JAVA_MAINTAINER_MODE_TRUE@		     find libjava.cni libjava.jni libjava.jvmti libjava.lang \
+@JAVA_MAINTAINER_MODE_TRUE@			  libjava.loader libjava.verify -name \*.java`; do \
+@JAVA_MAINTAINER_MODE_TRUE@	  testjar=$(srcdir)/`echo $$test | sed -e 's/\.java$$/\.jar/'`; \
+@JAVA_MAINTAINER_MODE_TRUE@	  testdep=; \
+@JAVA_MAINTAINER_MODE_TRUE@	  genheader=; \
+@JAVA_MAINTAINER_MODE_TRUE@	  case "$$test" in \
+@JAVA_MAINTAINER_MODE_TRUE@	    libjava.loader/dummy.java) \
+@JAVA_MAINTAINER_MODE_TRUE@	      testjar=$(srcdir)/libjava.loader/dummy.class;; \
+@JAVA_MAINTAINER_MODE_TRUE@	    libjava.loader/MyLoader.java) \
+@JAVA_MAINTAINER_MODE_TRUE@	      continue;; \
+@JAVA_MAINTAINER_MODE_TRUE@	    libjava.loader/*.java) \
+@JAVA_MAINTAINER_MODE_TRUE@	      testdep="libjava.loader/MyLoader.java";; \
+@JAVA_MAINTAINER_MODE_TRUE@	    libjava.jni/register2.java) \
+@JAVA_MAINTAINER_MODE_TRUE@	      ;; \
+@JAVA_MAINTAINER_MODE_TRUE@	    libjava.jni/*.java) \
+@JAVA_MAINTAINER_MODE_TRUE@	      genheader=-jni;; \
+@JAVA_MAINTAINER_MODE_TRUE@	    libjava.jvmti/*.java|libjava.cni/*.java) \
+@JAVA_MAINTAINER_MODE_TRUE@	      genheader=-cni;; \
+@JAVA_MAINTAINER_MODE_TRUE@	  esac; \
+@JAVA_MAINTAINER_MODE_TRUE@	  if test -f $$testjar; then \
+@JAVA_MAINTAINER_MODE_TRUE@	    if ! test $(srcdir)/$$test -nt $$testjar; then \
+@JAVA_MAINTAINER_MODE_TRUE@	      test -z "$$testdep" && continue; \
+@JAVA_MAINTAINER_MODE_TRUE@	      test $(srcdir)/$$testdep -nt $$testjar || continue; \
+@JAVA_MAINTAINER_MODE_TRUE@	    fi; \
+@JAVA_MAINTAINER_MODE_TRUE@	  fi; \
+@JAVA_MAINTAINER_MODE_TRUE@	  echo Compiling $$test; \
+@JAVA_MAINTAINER_MODE_TRUE@	  testtmpdir=`echo $$test | sed -e 's,/,_,g'`T; \
+@JAVA_MAINTAINER_MODE_TRUE@	  rm -rf $$testtmpdir; $(mkdir_p) $$testtmpdir; \
+@JAVA_MAINTAINER_MODE_TRUE@	  if test -n "$$testdep"; then \
+@JAVA_MAINTAINER_MODE_TRUE@	    $(GCJ) -C -g -w --encoding=UTF-8 -bootclasspath \
+@JAVA_MAINTAINER_MODE_TRUE@	      $(top_builddir)/libgcj-$(gcc_version).jar::$testtmpdir \
+@JAVA_MAINTAINER_MODE_TRUE@	      -d $$testtmpdir $(srcdir)/$$testdep || exit; \
+@JAVA_MAINTAINER_MODE_TRUE@	  fi; \
+@JAVA_MAINTAINER_MODE_TRUE@	  $(GCJ) -C -g -w --encoding=UTF-8 -bootclasspath \
+@JAVA_MAINTAINER_MODE_TRUE@	    $(top_builddir)/libgcj-$(gcc_version).jar:$$testtmpdir \
+@JAVA_MAINTAINER_MODE_TRUE@	    -d $$testtmpdir $(srcdir)/$$test || exit; \
+@JAVA_MAINTAINER_MODE_TRUE@	  case "$$test" in \
+@JAVA_MAINTAINER_MODE_TRUE@	    libjava.loader/dummy.java) \
+@JAVA_MAINTAINER_MODE_TRUE@	      cp $$testtmpdir/dummy.class $$testjar;; \
+@JAVA_MAINTAINER_MODE_TRUE@	    *) \
+@JAVA_MAINTAINER_MODE_TRUE@	      $(JAR) cf $$testjar \
+@JAVA_MAINTAINER_MODE_TRUE@		`ls $$testtmpdir/*.class \
+@JAVA_MAINTAINER_MODE_TRUE@		 | sed -e 's,^,-C ,;s,/\([^/]*\.class\)$$, \1,'` || exit ;; \
+@JAVA_MAINTAINER_MODE_TRUE@	  esac; \
+@JAVA_MAINTAINER_MODE_TRUE@	  if test -n "$$genheader"; then \
+@JAVA_MAINTAINER_MODE_TRUE@	    $(MYGCJH) $$genheader $$testtmpdir/*.class \
+@JAVA_MAINTAINER_MODE_TRUE@	      -bootclasspath $(top_builddir)/libgcj-$(gcc_version).jar \
+@JAVA_MAINTAINER_MODE_TRUE@	      -d $$testtmpdir/ || exit; \
+@JAVA_MAINTAINER_MODE_TRUE@	    mv $$testtmpdir/*.h $(srcdir)/`dirname $$test`/; \
+@JAVA_MAINTAINER_MODE_TRUE@	  fi; \
+@JAVA_MAINTAINER_MODE_TRUE@	  rm -rf $$testtmpdir; \
+@JAVA_MAINTAINER_MODE_TRUE@	done
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT: