[med-svn] [libssw] 01/02: clean up Java building

[Sascha Steinbiss]

This is an automated email from the git hooks/post-receive script.

satta pushed a commit to branch master
in repository libssw.

commit 93020c051df387d820dec8052d261ea9fdaa9b7f
Author: Sascha Steinbiss <satta at debian.org>
Date:   Fri Jun 24 12:18:53 2016 +0000

    clean up Java building
---
 debian/patches/build_all_libs.patch | 13 +++++++++----
 debian/patches/hardening.patch      |  4 ++--
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/debian/patches/build_all_libs.patch b/debian/patches/build_all_libs.patch
index 89f352e..fbaf5fb 100644
--- a/debian/patches/build_all_libs.patch
+++ b/debian/patches/build_all_libs.patch
@@ -19,8 +19,9 @@ Author: Sascha Steinbiss <sascha at steinbiss.name>
  JAVA_JAR = ssw.jar
  JAVA_LIB = libsswjni.so
 -JAVA_INLCUDES = -I"$(JAVA_HOME)/include" -I"$(JAVA_HOME)/include/linux"
+-JAVA_OBJ = ssw/Aligner.class ssw/Alignment.class ssw/Example.class
 +JAVA_INLCUDES = -I"$(JAVA_HOME)/include" -I"$(JAVA_HOME)/include/linux" -I/usr/lib/jvm/default-java/include/  -I/usr/lib/jvm/default-java/include/linux
- JAVA_OBJ = ssw/Aligner.class ssw/Alignment.class ssw/Example.class
++JAVA_OBJ = ssw/Aligner.class ssw/Alignment.class
  
  .PHONY: all default java clean
  
@@ -41,12 +42,16 @@ Author: Sascha Steinbiss <sascha at steinbiss.name>
  
  $(PROG): main.c kseq.h
  
-@@ -41,7 +46,7 @@
- 	jar cvfe $@ ssw.Example $^
+@@ -38,10 +43,10 @@
+ 	$(CC) $(CFLAGS) $(JAVA_INLCUDES) -fPIC -shared -rdynamic -o $@ $< ssw.c 
+ 
+ $(JAVA_JAR): $(JAVA_OBJ)
+-	jar cvfe $@ ssw.Example $^
++	jar cvf $@ $^
  
  %.class: %.java
 -	javac -cp ./ $<
-+	javac -target 1.6 -source 1.6 -cp ./ $<
++	javac -target 1.6 -source 1.6 $<
  	
  ssw.o: ssw.c ssw.h
  	$(CC) -c -o $@ $< $(CFLAGS)
diff --git a/debian/patches/hardening.patch b/debian/patches/hardening.patch
index d0e72ea..dfa5cd7 100644
--- a/debian/patches/hardening.patch
+++ b/debian/patches/hardening.patch
@@ -37,9 +37,9 @@ Author: Sascha Steinbiss <sascha at steinbiss.name>
 +	$(CC) $(CPPFLAGS) $(CFLAGS) $(JAVA_INLCUDES) -fPIC -shared -rdynamic -o $@ $< ssw.c $(LDFLAGS)
  
  $(JAVA_JAR): $(JAVA_OBJ)
- 	jar cvfe $@ ssw.Example $^
+ 	jar cvf $@ $^
 @@ -49,10 +49,10 @@
- 	javac -target 1.6 -source 1.6 -cp ./ $<
+ 	javac -target 1.6 -source 1.6 $<
  	
  ssw.o: ssw.c ssw.h
 -	$(CC) -c -o $@ $< $(CFLAGS)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/libssw.git