From ea5fdbbd9778e9fc8ec183029d92e3657597c61f Mon Sep 17 00:00:00 2001
From: =?utf8?q?G=C3=B6tz=20Lindenmaier?= <goetz@ipd.info.uni-karlsruhe.de>
Date: Thu, 13 Mar 2003 09:00:54 +0000
Subject: [PATCH] Adapted firmjni build process in main Makefile.

[r878]
---
 Makefile.in  | 11 +++++++++--
 configure    |  4 ++--
 configure.in |  2 +-
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 7d6162f40..b433ab1e7 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -34,9 +34,11 @@ XOFILES += $(addsuffix /subdir.o, $(subdirs))
 
 include $(top_srcdir)/MakeTargets
 
-
+# add target firmjni if configured with --enable-firmjni
 all: config.h Makefile libfirm.a
 
+firm: config.h Makefile libfirm.a
+
 libfirm.a: subdir_all $(XOFILES) $(OFILES)
 	$(AR) $(ARFLAGS) $@.new $(XOFILES) $(OFILES)
 	$(RANLIB) $@.new
@@ -44,8 +46,9 @@ libfirm.a: subdir_all $(XOFILES) $(OFILES)
 
 testprograms:	libfirm.a
 	$(MAKE) -C testprograms
-#	$(MAKE) -C firmjni  test  Tut nicht in craks Makefile
 
+firmjni:: libfirm.a
+	$(MAKE) -C firmjni
 
 # gernerate program documentation
 .PHONY: autodoc
@@ -75,8 +78,11 @@ stamp-h: config.h.in config.status
 config.status: configure
 	./config.status --recheck
 
+# add target test-firmjni if configured with --enable-firmjni
 test::
 	$(MAKE) -C testprograms test;
+
+test-firmjni::
 	$(MAKE) -C firmjni test;
 
 test-reference::
@@ -84,3 +90,4 @@ test-reference::
 
 test-clean:
 	$(MAKE) -C testprograms realclean
+	$(MAKE) -C firmjni/testprograms clean;
diff --git a/configure b/configure
index c72a56b4a..82ca0dcd9 100755
--- a/configure
+++ b/configure
@@ -3356,8 +3356,8 @@ fi
 done
 
   if test "$ac_jni_headers" != yes; then
-    { { echo "$as_me:$LINENO: error: jni header file not found. (IPD: add -I/usr/public2/java/jdk1.3.1-sun/include/ -I/usr/public2/java/jdk1.3.1-sun/include/linux/ to CPPFLAGS)" >&5
-echo "$as_me: error: jni header file not found. (IPD: add -I/usr/public2/java/jdk1.3.1-sun/include/ -I/usr/public2/java/jdk1.3.1-sun/include/linux/ to CPPFLAGS)" >&2;}
+    { { echo "$as_me:$LINENO: error: jni header file not found. (IPD: add --with-includedir=/usr/public2/java/jdk1.3.1-sun/include/:/usr/public2/java/jdk1.3.1-sun/include/linux/ to configure flags)" >&5
+echo "$as_me: error: jni header file not found. (IPD: add --with-includedir=/usr/public2/java/jdk1.3.1-sun/include/:/usr/public2/java/jdk1.3.1-sun/include/linux/ to configure flags)" >&2;}
    { (exit 1); exit 1; }; }
   fi
 fi
diff --git a/configure.in b/configure.in
index f35f27a2a..b76021742 100644
--- a/configure.in
+++ b/configure.in
@@ -202,7 +202,7 @@ dnl check for jni header files
 if test "$enable_firm_jni" = yes; then
   AC_CHECK_HEADERS(jni.h, ac_jni_headers="yes", ac_jni_headers="no")
   if test "$ac_jni_headers" != yes; then
-    AC_MSG_ERROR(jni header file not found. (IPD: add -I/usr/public2/java/jdk1.3.1-sun/include/ -I/usr/public2/java/jdk1.3.1-sun/include/linux/ to CPPFLAGS))
+    AC_MSG_ERROR(jni header file not found. (IPD: add --with-includedir=/usr/public2/java/jdk1.3.1-sun/include/:/usr/public2/java/jdk1.3.1-sun/include/linux/ to configure flags))
   fi
 fi
 
-- 
2.20.1