[SCM] master: Add missing dependencies for libfrysk-sys-jni.so, add generic jni target.

[SCM] master: Add missing dependencies for libfrysk-sys-jni.so, add generic jni target.

[cagney]

The branch, master has been updated
       via  847c1c52413c34619621fad761bc8e47c897c978 (commit)
      from  edfa23da73934bf0ab40697a13b0731feabb337c (commit)

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

- Log -----------------------------------------------------------------
commit 847c1c52413c34619621fad761bc8e47c897c978
Author: Andrew Cagney <cagney@redhat.com>
Date:   Thu Jun 19 21:54:27 2008 -0400

    Add missing dependencies for libfrysk-sys-jni.so, add generic jni target.
    
    frysk-common/ChangeLog
    2008-06-19  Andrew Cagney  <cagney@redhat.com>
    
    	* Makefile.gen.sh (jni): Delete.
    	* Makefile.rules (%-jni.so): Depend on $(JNI_ARCHIVE_LIST) and
    	$(JNI_OBJECT_LIST).
    	(jni): New phony target.

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

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

First 500 lines of diff:
diff --git a/frysk-common/ChangeLog b/frysk-common/ChangeLog
index 2c22c3d..a44bebe 100644
--- a/frysk-common/ChangeLog
+++ b/frysk-common/ChangeLog
@@ -1,5 +1,10 @@
 2008-06-19  Andrew Cagney  <cagney@redhat.com>
 
+	* Makefile.gen.sh (jni): Delete.
+	* Makefile.rules (%-jni.so): Depend on $(JNI_ARCHIVE_LIST) and
+	$(JNI_OBJECT_LIST).
+	(jni): New phony target.
+	
 	* Makefile.rules (JNI_OBJECT_LIST): Define.
 	(JNI_LIBRARY_LIST): Define.
 	(JNI_ARCHIVE_LIST): Define.
diff --git a/frysk-common/Makefile.gen.sh b/frysk-common/Makefile.gen.sh
index a9dc667..6e7c3ab 100755
--- a/frysk-common/Makefile.gen.sh
+++ b/frysk-common/Makefile.gen.sh
@@ -895,8 +895,7 @@ noinst_LIBRARIES += lib${GEN_DIRNAME}-jni.a
 lib${GEN_MAKENAME}_jni_so_SOURCES =
 solib_PROGRAMS += lib${GEN_DIRNAME}-jni.so
 lib${GEN_DIRNAME}-jni.so: lib${GEN_DIRNAME}-jni.a
-.PHONY: jni
-jni: lib${GEN_DIRNAME}-jni.so ${GEN_DIRNAME}.jar
+jni: lib${GEN_DIRNAME}-jni.so
 lib${GEN_MAKENAME}_jni_a_SOURCES += jni.cxx
 jnixx_sources = \$(wildcard \$(root_srcdir)/frysk-sys/jnixx/*.java)
 CLEANFILES += jni.hxx jni.cxx jni.hxx.gch
diff --git a/frysk-common/Makefile.rules b/frysk-common/Makefile.rules
index 3c7d8fc..3292bb8 100644
--- a/frysk-common/Makefile.rules
+++ b/frysk-common/Makefile.rules
@@ -190,6 +190,10 @@ AM_CCASFLAGS = \
 	$(ZZZ)
 
 \f
+# Just build the jar / jni dependencies files.
+.PHONY: jni
+jni: ${GEN_DIRNAME}.jar
+\f
 # Within the BUILT_SOURCES, need to force some dependencies.  For
 # instance: JAVAH isn't run until all script-generated files it may
 # need to import have been generated.
@@ -482,7 +486,7 @@ JNI_LIBRARY_LIST =
 # A list of extra object files that should be added to the .so.
 JNI_OBJECT_LIST =
 
-%-jni.so: %-jni.a
+%-jni.so: %-jni.a $(JNI_ARCHIVE_LIST) $(JNI_OBJECT_LIST)
 	soname=`basename $@` ; \
 	$(CC) -shared -o $@.tmp \
 		-Wl,--whole-archive \


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