git-svn-id: file:///home/git/hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/seqbias@99905 bc3139a8-67e5-0310-9ffc-ced21a209358
... | ... |
@@ -1,5 +1,5 @@ |
1 | 1 |
Package: seqbias |
2 |
-Version: 1.15.0 |
|
2 |
+Version: 1.15.1 |
|
3 | 3 |
Date: 25-12-2010 |
4 | 4 |
Title: Estimation of per-position bias in high-throughput sequencing |
5 | 5 |
data |
... | ... |
@@ -11,7 +11,7 @@ Author: Daniel Jones <dcjones@cs.washington.edu> |
11 | 11 |
Maintainer: Daniel Jones <dcjones@cs.washington.edu> |
12 | 12 |
Depends: R (>= 2.13.0), GenomicRanges (>= 0.1.0), Biostrings (>= |
13 | 13 |
2.15.0), methods |
14 |
-LinkingTo: Rsamtools |
|
14 |
+LinkingTo: Rsamtools (>= 1.19.36) |
|
15 | 15 |
Imports: zlibbioc |
16 | 16 |
Suggests: Rsamtools, ggplot2 |
17 | 17 |
LazyLoad: yes |
... | ... |
@@ -1,5 +1,16 @@ |
1 | 1 |
include Makevars.common |
2 | 2 |
|
3 |
+SAMTOOLS_PATH=\ |
|
4 |
+ `echo 'cat(system.file("usrlib", package="Rsamtools", mustWork=TRUE))' |\ |
|
5 |
+ "${R_HOME}/bin/R" --vanilla --slave` |
|
6 |
+SAMTOOLS_LIBS="$(SAMTOOLS_PATH)/libbam.a" "$(SAMTOOLS_PATH)/libbcf.a"\ |
|
7 |
+ "$(SAMTOOLS_PATH)/libtabix.a" -lz -pthread |
|
8 |
+SAMTOOLS_CPPFLAGS=-D_USE_KNETFILE -DBGZF_CACHE -D_FILE_OFFSET_BITS=64 \ |
|
9 |
+ -D_LARGEFILE64_SOURCE |
|
10 |
+ |
|
11 |
+PKG_LIBS=$(SAMTOOLS_LIBS) |
|
12 |
+PKG_CPPFLAGS=$(SAMTOOLS_CPPFLAGS) |
|
13 |
+ |
|
3 | 14 |
OBJECTS = $(SEQBIAS_OBJ) \ |
4 | 15 |
$(YAML_CPP_OBJ:%=yaml-cpp/%) |
5 | 16 |
|
... | ... |
@@ -1,10 +1,3 @@ |
1 |
-SAMVARS=$(shell\ |
|
2 |
- echo 'cat(system.file(\ |
|
3 |
- "usretc", .Platform[["r_arch"]], "Rsamtools.mk",\ |
|
4 |
- package="Rsamtools", mustWork=TRUE))' |\ |
|
5 |
- "${R_HOME}/bin/R" --vanilla --slave) |
|
6 |
-include $(SAMVARS) |
|
7 |
- |
|
8 | 1 |
YAML_CPP_OBJ = aliasmanager.o conversion.o directives.o \ |
9 | 2 |
emitfromevents.o emitter.o emitterstate.o \ |
10 | 3 |
emitterutils.o exp.o iterator.o nodebuilder.o \ |
... | ... |
@@ -1,5 +1,13 @@ |
1 | 1 |
include Makevars.common |
2 | 2 |
|
3 |
+SAMVARS=$(shell echo 'cat(system.file("usretc", .Platform[["r_arch"]],\ |
|
4 |
+ "Rsamtools.mk", package="Rsamtools", mustWork=TRUE))' |\ |
|
5 |
+ "${R_HOME}/bin/R" --vanilla --slave) |
|
6 |
+include $(SAMVARS) |
|
7 |
+ |
|
8 |
+PKG_LIBS=$(SAMTOOLS_LIBS) |
|
9 |
+PKG_CPPFLAGS=$(SAMTOOLS_CPPFLAGS) |
|
10 |
+ |
|
3 | 11 |
OBJECTS = $(SEQBIAS_OBJ) \ |
4 | 12 |
$(YAML_CPP_OBJ:%=yaml-cpp/%) |
5 | 13 |
|