Browse code

updated to build against Rsamtools 1.3.29

git-svn-id: file:///home/git/hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/seqbias@54033 bc3139a8-67e5-0310-9ffc-ced21a209358

Daniel Jones authored on 25/03/2011 05:34:07
Showing 5 changed files

... ...
@@ -1,5 +1,5 @@
1 1
 Package: seqbias
2
-Version: 0.99.7
2
+Version: 0.99.8
3 3
 Date: 25-12-2010
4 4
 Title: Estimation of per-position bias in high-throughput sequencing data
5 5
 Description: This package implements a model of per-position sequencing bias in
6 6
new file mode 100644
... ...
@@ -0,0 +1,23 @@
1
+\name{seqbias}
2
+\docType{class}
3
+\alias{seqbias-class}
4
+
5
+\title{The seqbias model}
6
+
7
+\description{
8
+The \code{seqbias} class maintains a model of the sequencing bias of from an
9
+experiment, which can be saved, loaded, trained, and used to make predictions of
10
+bias.
11
+
12
+The class is manipulated with the following functions:
13
+\code{\link{seqbias.fit}}
14
+\code{\link{seqbias.load}}
15
+\code{\link{seqbias.predict}}
16
+\code{\link{seqbias.save}}
17
+}
18
+\author{
19
+    Daniel Jones
20
+    \email{dcjones@cs.washington.edu}
21
+}
22
+
23
+
... ...
@@ -1,11 +1,5 @@
1
-
2 1
 include Makevars.common
3 2
 
4 3
 OBJECTS = $(SEQBIAS_OBJ) \
5 4
 		  $(YAML_CPP_OBJ:%=yaml-cpp/%)
6 5
 
7
-all : $(SHLIB)
8
-
9
-clean:
10
-	rm -f $(OBJECTS)
11
-
... ...
@@ -1,10 +1,9 @@
1
-
2
-MYPKG_PATH=`echo 'cat(system.file("usrlib", \
3
-                      .Platform[["r_arch"]], \
4
-                      package="Rsamtools", mustWork=TRUE))' | \
5
-                  ${R_HOME}/bin/R --vanilla --slave`
6
-
7
-PKG_LIBS=-L$(MYPKG_PATH) -lbam
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)
8 7
 
9 8
 YAML_CPP_OBJ = aliascontent.o conversion.o emitter.o emitterstate.o \
10 9
                emitterutils.o exp.o iterator.o map.o node.o null.o \
... ...
@@ -17,7 +16,5 @@ SEQBIAS_OBJ = sequencing_bias.o kmers.o miscmath.o common.o \
17 16
 
18 17
 GNULIB_OBJ = asprintf.o printf-args.o printf-parse.o vasnprintf.o vasprintf.o
19 18
 
20
-DFLAGS = -D_USE_KNETFILE -D_FILE_OFFSET_BITS=64
21
-PKG_CFLAGS  += $(DFLAGS) -Wall
22
-PKG_CPPFLAGS = $(PKG_CFLAGS)
19
+PKG_CFLAGS  += -Wall
23 20
 
... ...
@@ -1,15 +1,5 @@
1
-
2
-PKG_LIBS+=-lws2_32
3
-PKG_CFLAGS+=-D_LARGEFILE64_SOURCE -DNEED_ASPRINTF
4
-
5 1
 include Makevars.common
6
-
2
+PKG_CPPFLAGS+=-DNEED_ASPRINTF
7 3
 OBJECTS = $(SEQBIAS_OBJ) \
8 4
 		  $(YAML_CPP_OBJ:%=yaml-cpp/%) \
9 5
 		  $(GNULIB_OBJ:%=gnulib/%)
10
-
11
-all : $(SHLIB)
12
-
13
-clean:
14
-	rm -f $(OBJECTS)
15
-