Package: sumaclust / 1.0.36+ds-2

use_debian_packaged_sumalibs.patch Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
Description: Do not rely on a sumalibs/ directory but link against shared lib
Author: Pierre Gruet <pgt@debian.org>
Forwarded: not-needed
Last-Update: 2020-04-13

--- a/Makefile
+++ b/Makefile
@@ -44,7 +44,6 @@
 clean:
 	rm -f $(SUMACLUST_OBJ)	
 	rm -f $(EXEC)
-	$(MAKE) -C ./sumalibs clean
 
 install: all
 	install -d $(DESTDIR)$(PREFIX)/bin/
--- a/global.mk
+++ b/global.mk
@@ -1,7 +1,7 @@
 
-LIBSUMAPATH = -L./sumalibs
+LIBSUMAPATH =
 
-LIBSUMA = ./sumalibs/libsuma.a
+LIBSUMA =
 
 CC=gcc
 LDFLAGS:=$(LDFLAGS)
@@ -18,13 +18,3 @@
 
 %.o: %.c
 	$(CC) $(CFLAGS) -c -o $@ $< $(LIB)
-
-
-########
-#
-# libraries compilation
-#
-########
-
-./sumalibs/libsuma.a:
-	$(MAKE) -C ./sumalibs
--- a/mtcompare_sumaclust.c
+++ b/mtcompare_sumaclust.c
@@ -15,10 +15,10 @@
 #include <math.h>
 #include <sys/time.h>
 
-#include "sumalibs/libfasta/sequence.h"
-#include "sumalibs/libutils/utilities.h"
-#include "sumalibs/liblcs/upperband.h"
-#include "sumalibs/liblcs/sse_banded_LCS_alignment.h"
+#include "libfasta/sequence.h"
+#include "libutils/utilities.h"
+#include "liblcs/upperband.h"
+#include "liblcs/sse_banded_LCS_alignment.h"
 
 #include "sumaclust.h"
 
--- a/sumaclust.c
+++ b/sumaclust.c
@@ -12,13 +12,13 @@
 #include <math.h>
 #include <sys/time.h>
 
-#include "sumalibs/libutils/utilities.h"
-#include "sumalibs/libfasta/sequence.h"
-#include "sumalibs/libfasta/fasta_header_parser.h"
-#include "sumalibs/libfasta/fasta_header_handler.h"
-#include "sumalibs/libfasta/fasta_seq_writer.h"
-#include "sumalibs/liblcs/upperband.h"
-#include "sumalibs/liblcs/sse_banded_LCS_alignment.h"
+#include "libutils/utilities.h"
+#include "libfasta/sequence.h"
+#include "libfasta/fasta_header_parser.h"
+#include "libfasta/fasta_header_handler.h"
+#include "libfasta/fasta_seq_writer.h"
+#include "liblcs/upperband.h"
+#include "liblcs/sse_banded_LCS_alignment.h"
 
 #include "mtcompare_sumaclust.h"
 #include "sumaclust.h"