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

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


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@121217 138bc75d-0d04-0410-961f-82ee72b054a4

2 files changed, 123 insertions, 0 deletions

diff --git a/libjava/testsuite/Makefile.am b/libjava/testsuite/Makefile.am
index e2775f164b8..eafdc1bb5d4 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-am: 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`/ 2>/dev/null; \
+	  fi; \
+	  rm -rf $$testtmpdir; \
+	done
+endif
diff --git a/libjava/testsuite/Makefile.in b/libjava/testsuite/Makefile.in
index 79a0476cb93..a2b5311e458 100644
--- a/libjava/testsuite/Makefile.in
+++ b/libjava/testsuite/Makefile.in
@@ -322,6 +322,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:
@@ -520,6 +521,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-am: 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`/ 2>/dev/null; \
+@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: