[SCM] master: Add --jni option to Makefile.gen.sh.

[cagney@sourceware.org]

The branch, master has been updated
       via  ed76fbbf22fd2ebcc1eb96e78e3acaa3b83b1a1a (commit)
      from  202ff1ef1dc5ae45101a21b83b1cd391226bbf9c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email.

- Log -----------------------------------------------------------------
commit ed76fbbf22fd2ebcc1eb96e78e3acaa3b83b1a1a
Author: Andrew Cagney <cagney@redhat.com>
Date:   Mon Nov 26 10:00:52 2007 -0500

    Add --jni option to Makefile.gen.sh.

-----------------------------------------------------------------------

Summary of changes:
 frysk-common/ChangeLog       |    4 ++++
 frysk-common/Makefile.gen.sh |   28 +++++++++++++++++++++-------
 frysk-gtk/ChangeLog          |    5 +++++
 frysk-gtk/bootstrap.sh       |    2 +-
 4 files changed, 31 insertions(+), 8 deletions(-)

First 500 lines of diff:
diff --git a/frysk-common/ChangeLog b/frysk-common/ChangeLog
index 3558aad..389f0eb 100644
--- a/frysk-common/ChangeLog
+++ b/frysk-common/ChangeLog
@@ -1,3 +1,7 @@
+2007-11-26  Andrew Cagney  <cagney@redhat.com>
+
+	* Makefile.gen.sh (--jni): New option.
+
 2007-11-23  Andrew Cagney  <cagney@redhat.com>
 
 	* Makefile.rules (.java-sh.java): Add mkdir -p.
diff --git a/frysk-common/Makefile.gen.sh b/frysk-common/Makefile.gen.sh
index da6b5fc..6d30fcb 100755
--- a/frysk-common/Makefile.gen.sh
+++ b/frysk-common/Makefile.gen.sh
@@ -40,11 +40,10 @@
 
 if test $# -eq 0 ; then
     cat <<EOF 1>&2
-Usage: $0 [ --cni ] <source-dir>... <.jar-file>... <_JAR-macro>...
+Usage: $0 [ --cni | --jni ] <source-dir>... <.jar-file>... <_JAR-macro>...
 
---cni:
-
-Include CNI directories in build.
+--cni: Include CNI directories in build.
+--jni: Include JNI directories in build and build with JNI abi.
 
 <source-dir>:
 
@@ -68,6 +67,7 @@ EOF
 fi
 
 cni=false
+jni=false
 dirs=
 jars=
 JARS=
@@ -75,7 +75,8 @@ GEN_ARGS="$@"
 while test $# -gt 0
 do
   case "$1" in
-      --cni ) cni=true ;;
+      --cni ) cni=true ; jni=false ;;
+      --jni ) jni=true ; cni=false ;;
       *.jar ) jars="${jars} $1" ;;
       *_JAR ) JARS="${JARS} $1" ;;
       * ) dirs="${dirs} $1" ;;
@@ -121,8 +122,12 @@ JARS=`echo ${JARS}`
     -o -path '[A-Za-z]*\.c-in' -print \
     -o -path '[A-Za-z]*\.cxx' -print \
     -o -path '*/cni/[A-Za-z]*\.[sS]' -print \
+    -o -path '*/jni/[A-Za-z]*\.[sS]' -print \
     -o -type f -name 'test*' -print
-    ) | if $cni ; then cat ; else grep -v '/cni/' ; fi | sort -f > files.tmp
+    ) \
+| if $cni ; then cat ; else grep -v '/cni/' ; fi \
+| if $jni ; then cat ; else grep -v '/jni/' ; fi \
+| sort -f > files.tmp
 
 if cmp files.tmp files.list > /dev/null 2>&1
 then
@@ -546,6 +551,15 @@ for suffix in .cxx .c .hxx .s .S .c-sh .c-in .cxx-sh .cxx-in; do
     done
 done
 
+# What type of build?
+if $cni ; then
+    : default
+elif $jni ; then
+    echo "AM_GCJFLAGS += -fjni"
+else
+    : default
+fi
+
 # Grep the cni/*.cxx files forming a list of included files.  Assume
 # these are all generated from .class files.  The list can be pruned a
 # little since, given Class$Nested and Class, generating Class.h will
@@ -557,7 +571,7 @@ done
 # #define A_FILE "a/file/dot.h"
 
 print_header "... *.{hxx,cxx}=.h"
-grep -e '/cni/' files.list \
+grep -e '/cni/' -e '/jni/' files.list \
     | xargs -r grep -H \
     	-e '#include ".*.h"' \
         -e '#define [A-Z_]* ".*.h"' \
diff --git a/frysk-gtk/ChangeLog b/frysk-gtk/ChangeLog
index eb97cfe..5da0eaf 100644
--- a/frysk-gtk/ChangeLog
+++ b/frysk-gtk/ChangeLog
@@ -1,3 +1,8 @@
+2007-11-26  Andrew Cagney  <cagney@redhat.com>
+
+	* bootstrap.sh: Pass --jni to Makefile.gen.sh.
+	* Makefile.am (AM_GCJFLAGS): Do not add -fjni.
+
 2007-11-23  Andrew Cagney  <cagney@redhat.com>
 
 	* Makefile.am (GEN_GCJ_LDADD_LIST): Add libunwind-ppc32.a
diff --git a/frysk-gtk/bootstrap.sh b/frysk-gtk/bootstrap.sh
index 9204268..18da4d6 100755
--- a/frysk-gtk/bootstrap.sh
+++ b/frysk-gtk/bootstrap.sh
@@ -41,7 +41,7 @@
 set -e
 
 ./common/Makefile.gen.sh \
-    --cni \
+    --jni \
     tlwidgets/ftk.jar \
     org
 


hooks/post-receive
--
frysk system monitor/debugger