diff --git a/README.md b/README.md index 98a3dc3..0d884a1 100644 --- a/README.md +++ b/README.md @@ -32,21 +32,14 @@ Note that this script is quite experimental, and your system is different from m Installation ------------ -WiggleTools requires three main dependencies: LibBigWig, HTSLib and GSL (GNU scientific) libraries. - -They themselves require: -* [zlib](http://www.zlib.net/) -* [libcurl](https://curl.haxx.se/download.html) +WiggleTools requires three main dependencies: [LibBigWig](https://github.com/dpryan79/libBigWig), [HTSLib](https://github.com/samtools/htslib) and [GSL (GNU scientific)](https://www.gnu.org/software/gsl/) libraries. They themselves require [zlib](http://www.zlib.net/) and [libcurl](https://curl.haxx.se/download.html). **Installing LibBigWig** ``` git clone https://github.com/dpryan79/libBigWig.git cd libBigWig -make -setenv LIBBIGWIG_SRC $PWD -# or, if you use bash... -export LIBIGWIG_SRC=$PWD +make install ``` **Installing the htslib library** @@ -54,10 +47,17 @@ export LIBIGWIG_SRC=$PWD ``` git clone https://github.com/samtools/htslib.git cd htslib +make install +``` + +**Installing the GSL library** +``` +wget ftp://www.mirrorservice.org/sites/ftp.gnu.org/gnu/gsl/gsl-latest.tar.gz +tar -xvzpf gsl-latest.tar.gz +cd gsl* +./configure make -setenv HTSLIB_SRC $PWD -# or, if you use bash... -export HTSLIB_SRC=$PWD +make install ``` Obtaining WiggleTools diff --git a/src/Makefile b/src/Makefile index aa847ee..7dd8cb8 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,9 +1,9 @@ CFLAGS=-g -Wall -O3 -std=gnu99 LIBDIR=../lib BINDIR=../bin -INC=-I${HTSLIB_SRC}/htslib -I${LIBBIGWIG_SRC} -LIB_PATHS=-L${LIBBIGWIG_SRC} -L${HTSLIB_SRC} -L${LIBDIR} -LIBS= -lwiggletools ${LIBBIGWIG_SRC}/libBigWig.a -lcurl -lhts -lgsl -lgslcblas -lz -lpthread -lm +INC= +LIB_PATHS=-L${LIBDIR} +LIBS= -lwiggletools -lBigWig -lcurl -lhts -lgsl -lgslcblas -lz -lpthread -lm OPTS=-D_PBGZF_USE default: lib bin diff --git a/src/bamReader.c b/src/bamReader.c index 23eec50..3095314 100644 --- a/src/bamReader.c +++ b/src/bamReader.c @@ -13,8 +13,8 @@ // limitations under the License. #include -#include "sam.h" -#include "hts.h" +#include "htslib/sam.h" +#include "htslib/hts.h" #include "wiggleIterator.h" #include "bufferedReader.h" #include "fib.h" diff --git a/src/bcfReader.c b/src/bcfReader.c index b8d6848..19a271a 100644 --- a/src/bcfReader.c +++ b/src/bcfReader.c @@ -14,7 +14,7 @@ #include #include -#include "vcf.h" +#include "htslib/vcf.h" #include "wiggleIterator.h" #include "bufferedReader.h"