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
|
Description: Use packaged nthash, do not use the vendored one
Author: Nilesh Patra <nilesh@debian.org>
Forwarded: not-needed
Last-Update: 2021-04-01
--- a/ntcard.cpp
+++ b/ntcard.cpp
@@ -1,6 +1,6 @@
#include "Uncompress.h"
-#include "vendor/ntHash/ntHashIterator.hpp"
-#include "vendor/ntHash/stHashIterator.hpp"
+#include "ntHashIterator.hpp"
+#include "stHashIterator.hpp"
#include <cassert>
#include <cmath>
--- a/nthll.cpp
+++ b/nthll.cpp
@@ -8,7 +8,7 @@
#include <cassert>
#include <cmath>
-#include "vendor/ntHash/ntHashIterator.hpp"
+#include "ntHashIterator.hpp"
#include "Uncompress.h"
#ifdef _OPENMP
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
bin_PROGRAMS = ntcard nthll
-ntcard_CPPFLAGS = -I$(top_srcdir)/Common
+ntcard_CPPFLAGS = -I$(top_srcdir)/Common -I/usr/include
ntcard_SOURCES = \
Common/Uncompress.cpp \
@@ -12,7 +12,7 @@
Common/Fcontrol.h \
ntcard.cpp
-nthll_CPPFLAGS = -I$(top_srcdir)/Common
+nthll_CPPFLAGS = -I$(top_srcdir)/Common -I/usr/include
nthll_SOURCES = \
Common/Uncompress.cpp \
@@ -32,7 +32,6 @@
EXTRA_DIST= autogen.sh
SUBDIRS = \
- vendor \
data
test-reads.fq.gz:
--- a/configure.ac
+++ b/configure.ac
@@ -88,7 +88,6 @@
AC_CONFIG_FILES([
Makefile
- vendor/Makefile
data/Makefile
])
AC_OUTPUT
|
