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
|
Description: Use shared libs
Subject: use-shared-libs
From: Debian Med Packaging Team <debian-med-packaging@lists.alioth.debian.org>
kmer_counter/fastq_reader.h | 8 ++++----
makefile | 8 ++------
2 files changed, 6 insertions(+), 10 deletions(-)
@@ -17,8 +17,8 @@
#include <stdio.h>
#include <iostream>
-#include "libs/zlib.h"
-#include "libs/bzlib.h"
+#include <zlib.h>
+#include <bzlib.h>
using namespace std;
@@ -96,4 +96,4 @@
#endif
-// ***** EOF
\ No newline at end of file
+// ***** EOF
@@ -53,14 +53,6 @@
ifeq ($(UNAME_S),Darwin)
RADULS_OBJS =
- KMC_LIBS = \
- $(KMC_MAIN_DIR)/libs/libz.1.2.5.dylib \
- $(KMC_MAIN_DIR)/libs/libbz2.1.0.5.dylib
-
- KMC_TOOLS_LIBS = \
- $(KMC_TOOLS_DIR)/libs/libz.1.2.5.dylib \
- $(KMC_TOOLS_DIR)/libs/libbz2.1.0.5.dylib
-
LIB_KMC_CORE = $(OUT_BIN_DIR)/libkmc_core.mac.a
else
RADULS_OBJS = \
@@ -69,14 +61,6 @@
$(KMC_MAIN_DIR)/raduls_avx2.o \
$(KMC_MAIN_DIR)/raduls_avx.o
- KMC_LIBS = \
- $(KMC_MAIN_DIR)/libs/libz.a \
- $(KMC_MAIN_DIR)/libs/libbz2.a
-
- KMC_TOOLS_LIBS = \
- $(KMC_TOOLS_DIR)/libs/libz.a \
- $(KMC_TOOLS_DIR)/libs/libbz2.a
-
LIB_KMC_CORE = $(OUT_BIN_DIR)/libkmc_core.a
endif
@@ -15,8 +15,8 @@
#include "params.h"
#include <stdio.h>
-#include "libs/zlib.h"
-#include "libs/bzlib.h"
+#include <zlib.h>
+#include <bzlib.h>
using namespace std;
|
