[SCM] master: Do not exclude .cxx when --enable-jar-compile.

[cagney@sourceware.org]

The branch, master has been updated
       via  135c45a136420c58d54870c399082358a6446e3d (commit)
      from  6840ce70d778da308f98bc60074182c6d098adc0 (commit)

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

- Log -----------------------------------------------------------------
commit 135c45a136420c58d54870c399082358a6446e3d
Author: Andrew Cagney <cagney@toil.yyz.redhat.com>
Date:   Mon Nov 26 12:29:49 2007 -0500

    Do not exclude .cxx when --enable-jar-compile.
    
    frysk-common/ChangeLog
    2007-11-26  Andrew Cagney  <cagney@redhat.com>
    
    	* Makefile.gen.sh (.cxx): Fix typo, do not conditionally add .cxx
    	files to sources.
    	* Makefile.rules (.jar.o): Remove  -fjni option.

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

Summary of changes:
 frysk-common/ChangeLog       |    4 ++++
 frysk-common/Makefile.gen.sh |    7 ++-----
 frysk-common/Makefile.rules  |    2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

First 500 lines of diff:
diff --git a/frysk-common/ChangeLog b/frysk-common/ChangeLog
index 4753032..ec27921 100644
--- a/frysk-common/ChangeLog
+++ b/frysk-common/ChangeLog
@@ -1,5 +1,9 @@
 2007-11-26  Andrew Cagney  <cagney@redhat.com>
 
+	* Makefile.gen.sh (.cxx): Fix typo, do not conditionally add .cxx
+	files to sources.
+	* Makefile.rules (.jar.o): Remove  -fjni option.
+
 	* Makefile.gen.sh (sources): When JAR_COMPILE, add .jar, instead
 	of .java files, to ${sources}.
 	* frysk-common.ac (--enable-jar-compile): New option.
diff --git a/frysk-common/Makefile.gen.sh b/frysk-common/Makefile.gen.sh
index 5a70d3e..11b6de8 100755
--- a/frysk-common/Makefile.gen.sh
+++ b/frysk-common/Makefile.gen.sh
@@ -408,10 +408,9 @@ cat <<EOF
 # the relevant files.
 
 noinst_LIBRARIES += lib${GEN_DIRNAME}.a
-if JAR_COMPILE
-${sources} = ${GEN_DIRNAME}.jar
-else
 ${sources} =
+if JAR_COMPILE
+${sources} += ${GEN_DIRNAME}.jar
 endif
 GEN_GCJ_LDADD_LIST += lib${GEN_DIRNAME}.a
 
@@ -541,9 +540,7 @@ for suffix in .cxx .c .hxx .s .S .c-sh .c-in .cxx-sh .cxx-in; do
             # Generate the rules for arch32 test
 	    echo_arch32_PROGRAMS ${name} ${name}${s}
 	else
-	    echo "if !JAR_COMPILE"
 	    echo "${sources} += ${file}"
-	    echo "endif"
 	fi
         case "${suffix}" in
 	    *-in | *-sh)
diff --git a/frysk-common/Makefile.rules b/frysk-common/Makefile.rules
index b1ebe23..1852afc 100644
--- a/frysk-common/Makefile.rules
+++ b/frysk-common/Makefile.rules
@@ -434,7 +434,7 @@ autogen: clean
 
 SUFFIXES += .jar
 .jar.o:
-	$(GCJCOMPILE) -fjni -c $<
+	$(GCJCOMPILE) -c $<
 
 # Since automake only adds GCJCOMPILE to Makefile.in when its seen
 # .java source, provide our own definition.


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