Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use angle-bracket includes to allow flexibile placement of dependencies #33

Merged
merged 1 commit into from
Aug 15, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ HTS_LIB=./htslib/libhts.a
HTS_INCLUDE=-I./htslib

# Include the header-only fast5 library
FAST5_INCLUDE=-I./fast5
FAST5_INCLUDE=-I./fast5/src

# Include the src subdirectories
NP_INCLUDE=$(addprefix -I./, $(SUBDIRS))
Expand Down
2 changes: 1 addition & 1 deletion src/nanopolish_poremodel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#include <sstream>
#include <cstring>
#include <bits/stl_algo.h>
#include "../fast5/src/fast5.hpp"
#include <fast5.hpp>

void PoreModel::bake_gaussian_parameters()
{
Expand Down
2 changes: 1 addition & 1 deletion src/nanopolish_poremodel.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#include <string>
#include <map>
#include "nanopolish_model_names.h"
#include "../fast5/src/fast5.hpp"
#include <fast5.hpp>

//
struct PoreModelStateParams
Expand Down
2 changes: 1 addition & 1 deletion src/nanopolish_squiggle_read.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#include "nanopolish_squiggle_read.h"
#include "nanopolish_pore_model_set.h"
#include "nanopolish_methyltrain.h"
#include "src/fast5.hpp"
#include <fast5.hpp>

//
SquiggleRead::SquiggleRead(const std::string& name, const std::string& path, const uint32_t flags) :
Expand Down