[med-svn] [daligner] 06/07: Update patches...

[Afif Elghraoui]

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

afif pushed a commit to branch master
in repository daligner.

commit 3034f8443029b6f28bc5ab4b4afa47785334b856
Author: Afif Elghraoui <afif at debian.org>
Date:   Tue Oct 11 21:10:51 2016 -0700

    Update patches...
---
 debian/patches/cflags.patch          |  6 ++++--
 debian/patches/destdir-install.patch |  4 ++--
 debian/patches/lddflags.patch        | 29 +++++++++++------------------
 3 files changed, 17 insertions(+), 22 deletions(-)

diff --git a/debian/patches/cflags.patch b/debian/patches/cflags.patch
index ad6e94f..045be72 100644
--- a/debian/patches/cflags.patch
+++ b/debian/patches/cflags.patch
@@ -4,9 +4,11 @@ Forwarded: not-needed
 Last-Update: 2016-01-08
 --- daligner.orig/Makefile
 +++ daligner/Makefile
-@@ -1,4 +1,4 @@
+@@ -1,6 +1,6 @@
+ DEST_DIR = ~/bin
+ 
 -CFLAGS = -O3 -Wall -Wextra -Wno-unused-result -fno-strict-aliasing
 +CFLAGS += -O3 -Wall -Wextra -Wno-unused-result -fno-strict-aliasing
  
- ALL = daligner HPCdaligner HPCmapper LAsort LAmerge LAsplit LAcat LAshow LAdump LAcheck LAindex
+ ALL = daligner HPC.daligner LAsort LAmerge LAsplit LAcat LAshow LAdump LAcheck LAindex
  
diff --git a/debian/patches/destdir-install.patch b/debian/patches/destdir-install.patch
index 5bfb224..d33b5e3 100644
--- a/debian/patches/destdir-install.patch
+++ b/debian/patches/destdir-install.patch
@@ -4,11 +4,11 @@ Forwarded: not-needed
 Last-Update: 2016-01-08
 --- daligner.orig/Makefile
 +++ daligner/Makefile
-@@ -47,7 +47,8 @@
+@@ -37,7 +37,8 @@
  	rm -f daligner.tar.gz
  
  install:
--	cp $(ALL) ~/bin
+-	cp $(ALL) $(DEST_DIR)
 +	install -d $(DESTDIR)/usr/bin
 +	install $(ALL) $(DESTDIR)/usr/bin
  
diff --git a/debian/patches/lddflags.patch b/debian/patches/lddflags.patch
index 092704e..e92ec4a 100644
--- a/debian/patches/lddflags.patch
+++ b/debian/patches/lddflags.patch
@@ -6,56 +6,49 @@ Forwarded: not-needed
 Last-Update: 2016-01-08
 --- daligner.orig/Makefile
 +++ daligner/Makefile
-@@ -5,40 +5,40 @@
+@@ -1,43 +1,34 @@
+ DEST_DIR = ~/bin
+ 
+ CFLAGS += -O3 -Wall -Wextra -Wno-unused-result -fno-strict-aliasing
++LDFLAGS += -lm
+ 
+ ALL = daligner HPC.daligner LAsort LAmerge LAsplit LAcat LAshow LAdump LAcheck LAindex
+ 
  all: $(ALL)
  
++daligner: LDFLAGS += -lpthread
  daligner: daligner.c filter.c filter.h align.c align.h DB.c DB.h QV.c QV.h
 -	gcc $(CFLAGS) -o daligner daligner.c filter.c align.c DB.c QV.c -lpthread -lm
-+	gcc $(CFLAGS) -o daligner daligner.c filter.c align.c DB.c QV.c -lpthread -lm $(LDFLAGS)
- 
- HPCdaligner: HPCdaligner.c DB.c DB.h QV.c QV.h
--	gcc $(CFLAGS) -o HPCdaligner HPCdaligner.c DB.c QV.c -lm
-+	gcc $(CFLAGS) -o HPCdaligner HPCdaligner.c DB.c QV.c -lm $(LDFLAGS)
  
- HPCmapper: HPCmapper.c DB.c DB.h QV.c QV.h
--	gcc $(CFLAGS) -o HPCmapper HPCmapper.c DB.c QV.c -lm
-+	gcc $(CFLAGS) -o HPCmapper HPCmapper.c DB.c QV.c -lm $(LDFLAGS)
+ HPC.daligner: HPC.daligner.c DB.c DB.h QV.c QV.h
+-	gcc $(CFLAGS) -o HPC.daligner HPC.daligner.c DB.c QV.c -lm
  
  LAsort: LAsort.c align.h DB.c DB.h QV.c QV.h
 -	gcc $(CFLAGS) -o LAsort LAsort.c DB.c QV.c -lm
-+	gcc $(CFLAGS) -o LAsort LAsort.c DB.c QV.c -lm $(LDFLAGS)
  
  LAmerge: LAmerge.c align.h DB.c DB.h QV.c QV.h
 -	gcc $(CFLAGS) -o LAmerge LAmerge.c DB.c QV.c -lm
-+	gcc $(CFLAGS) -o LAmerge LAmerge.c DB.c QV.c -lm $(LDFLAGS)
  
  LAshow: LAshow.c align.c align.h DB.c DB.h QV.c QV.h
 -	gcc $(CFLAGS) -o LAshow LAshow.c align.c DB.c QV.c -lm
-+	gcc $(CFLAGS) -o LAshow LAshow.c align.c DB.c QV.c -lm $(LDFLAGS)
  
  LAdump: LAdump.c align.c align.h DB.c DB.h QV.c QV.h
 -	gcc $(CFLAGS) -o LAdump LAdump.c align.c DB.c QV.c -lm
-+	gcc $(CFLAGS) -o LAdump LAdump.c align.c DB.c QV.c -lm $(LDFLAGS)
  
  LAcat: LAcat.c align.h DB.c DB.h QV.c QV.h
 -	gcc $(CFLAGS) -o LAcat LAcat.c DB.c QV.c -lm
-+	gcc $(CFLAGS) -o LAcat LAcat.c DB.c QV.c -lm $(LDFLAGS)
  
  LAsplit: LAsplit.c align.h DB.c DB.h QV.c QV.h
 -	gcc $(CFLAGS) -o LAsplit LAsplit.c DB.c QV.c -lm
-+	gcc $(CFLAGS) -o LAsplit LAsplit.c DB.c QV.c -lm $(LDFLAGS)
  
  LAcheck: LAcheck.c align.c align.h DB.c DB.h QV.c QV.h
 -	gcc $(CFLAGS) -o LAcheck LAcheck.c align.c DB.c QV.c -lm
-+	gcc $(CFLAGS) -o LAcheck LAcheck.c align.c DB.c QV.c -lm $(LDFLAGS)
  
  LAupgrade.Dec.31.2014: LAupgrade.Dec.31.2014.c align.c align.h DB.c DB.h QV.c QV.h
 -	gcc $(CFLAGS) -o LAupgrade.Dec.31.2014 LAupgrade.Dec.31.2014.c align.c DB.c QV.c -lm
-+	gcc $(CFLAGS) -o LAupgrade.Dec.31.2014 LAupgrade.Dec.31.2014.c align.c DB.c QV.c -lm $(LDFLAGS)
  
  LAindex: LAindex.c align.c align.h DB.c DB.h QV.c QV.h
 -	gcc $(CFLAGS) -o LAindex LAindex.c align.c DB.c QV.c -lm
-+	gcc $(CFLAGS) -o LAindex LAindex.c align.c DB.c QV.c -lm $(LDFLAGS)
  
  clean:
  	rm -f $(ALL)

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