public inbox for frysk-cvs@sourceware.org
help / color / mirror / Atom feed
* [SCM]  master: Fix generated jnixx file's dependency on jnixx sources.
@ 2008-05-02 18:39 cagney
  0 siblings, 0 replies; only message in thread
From: cagney @ 2008-05-02 18:39 UTC (permalink / raw)
  To: frysk-cvs

The branch, master has been updated
       via  7ce3168066508c638de88f15eb839a829710b16a (commit)
      from  af25ece64f0052558eafb2673a73c972b434ca2a (commit)

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

- Log -----------------------------------------------------------------
commit 7ce3168066508c638de88f15eb839a829710b16a
Author: Andrew Cagney <cagney@redhat.com>
Date:   Fri May 2 14:36:02 2008 -0400

    Fix generated jnixx file's dependency on jnixx sources.
    
    frysk-common/ChangeLog
    2008-05-02  Andrew Cagney  <cagney@redhat.com>
    
    	* Makefile.rules (root_srcdir, abs_root_srcdir): Define.
    	* Makefile.gen.sh (generate_jnixx_sources): Depend on all jnixx
    	java files.

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

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

First 500 lines of diff:
diff --git a/frysk-common/ChangeLog b/frysk-common/ChangeLog
index ba5bcd8..282a1ee 100644
--- a/frysk-common/ChangeLog
+++ b/frysk-common/ChangeLog
@@ -1,5 +1,9 @@
 2008-05-02  Andrew Cagney  <cagney@redhat.com>
 
+	* Makefile.rules (root_srcdir, abs_root_srcdir): Define.
+	* Makefile.gen.sh (generate_jnixx_sources): Depend on all jnixx
+	java files.
+
 	* Makefile.rules (JNIXX): Update; frysk.jnixx.jnixx refactored,
 	main in frysk.jnixx.Main.
 
diff --git a/frysk-common/Makefile.gen.sh b/frysk-common/Makefile.gen.sh
index 177683c..eb7bbef 100755
--- a/frysk-common/Makefile.gen.sh
+++ b/frysk-common/Makefile.gen.sh
@@ -659,6 +659,7 @@ generate_cni_header () {
 
 echo "JNIXX_BUILT ="
 echo "CLEANFILES += \$(JNIXXX_BUILT)"
+echo "jnixx_sources = \$(wildcard \$(root_srcdir)/frysk-sys/frysk/jnixx/*.java)"
 generate_jnixx_sources () {
     local file=$1
     local d=$2
@@ -682,8 +683,11 @@ generate_jnixx_sources () {
 	    echo "${sources} += ${h}-jni.cxx"
 	    echo "${h}-jni.o: ${h}-jni.hxx"
 	    j=`echo ${h} | tr '[_]' '[/]'`
-	    echo "${h}-jni.hxx: $j.java frysk/jni/jnixx.java | ${GEN_DIRNAME}.jar"
-	    echo "${h}-jni.cxx: $j.java frysk/jni/jnixx.java | ${GEN_DIRNAME}.jar"
+	    # Hack, try to trigger jni regen when jnixx changes
+	    echo "${h}-jni.hxx ${h}-jni.cxx: \$(jnixx_sources)"
+	    echo "${h}-jni.hxx ${h}-jni.cxx: | ${GEN_DIRNAME}.jar"
+	    echo "${h}-jni.hxx: $j.java"
+	    echo "${h}-jni.cxx: $j.java"
 	    case $action in
 		include)
 		    case "$suffix" in
diff --git a/frysk-common/Makefile.rules b/frysk-common/Makefile.rules
index 5382b2a..56839bc 100644
--- a/frysk-common/Makefile.rules
+++ b/frysk-common/Makefile.rules
@@ -82,6 +82,8 @@ LDADD =
 ANTLR_BUILT =
 SCRIPT_BUILT =
 JAVAH_CNI_BUILT =
+root_srcdir = $(dir $(top_srcdir))
+abs_root_srcdir = $(dir $(abs_top_srcdir))
 
 check_SCRIPTS =
 check_PROGRAMS =
@@ -254,7 +256,7 @@ SUFFIXES += .c-sh
 
 # Don't be confused by top_builddir and top_srcdir, they are actually
 # the directory corresponding to current sub-directory (frysk-gui,
-# frysk-core, ...).  Instead there is root_srcdir.
+# frysk-core, ...).  Instead there is a local root_srcdir.
 
 SUBST_SED = sed \
 		-e 's,[@]prefix[@],@prefix@,g' \
@@ -263,8 +265,8 @@ SUBST_SED = sed \
 		-e 's,[@]datadir[@],@datadir@,g' \
 		-e 's,[@]builddir[@],@top_builddir@,g' \
 		-e 's,[@]srcdir[@],@top_srcdir@,g' \
-		-e 's,[@]root_srcdir[@],$(dir $(top_srcdir)),g' \
-		-e 's,[@]abs_root_srcdir[@],$(dir $(abs_top_srcdir)),g' \
+		-e 's,[@]root_srcdir[@],$(root_srcdir),g' \
+		-e 's,[@]abs_root_srcdir[@],$(abs_root_srcdir),g' \
 		-e 's,[@]abs_builddir[@],@abs_top_builddir@,g' \
 		-e 's,[@]abs_srcdir[@],@abs_top_srcdir@,g' \
 		-e 's,[@]gladedir[@],$(gladedir),g' \


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


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2008-05-02 18:39 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-05-02 18:39 [SCM] master: Fix generated jnixx file's dependency on jnixx sources cagney

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).