Browse code

Adjust Makevars to work with latest Rhtslib

Hervé Pagès authored on 12/10/2019 20:57:09
Showing 3 changed files

... ...
@@ -1,6 +1,6 @@
1 1
 Package: seqbias
2
-Version: 1.33.0
3
-Date: 2019-03-15
2
+Version: 1.33.1
3
+Date: 2019-10-12
4 4
 Title: Estimation of per-position bias in high-throughput sequencing
5 5
         data
6 6
 Description: This package implements a model of per-position sequencing
... ...
@@ -12,6 +12,7 @@ Maintainer: Daniel Jones <dcjones@cs.washington.edu>
12 12
 Depends: R (>= 3.0.2), GenomicRanges (>= 0.1.0), Biostrings (>=
13 13
         2.15.0), methods
14 14
 LinkingTo: Rhtslib (>= 1.15.3)
15
+SystemRequirements: GNU make
15 16
 Suggests: Rsamtools, ggplot2
16 17
 LazyLoad: yes
17 18
 License: LGPL-3
... ...
@@ -1,9 +1,13 @@
1
+## This file uses GNU make syntax $(shell ...) so we need to
2
+## have "SystemRequirements: GNU make" in the DESCRIPTION file.
3
+## See Rhtslib's vignette for details.
4
+
1 5
 include Makevars.common
2 6
 
3
-RHTSLIB_LIBS=`echo 'Rhtslib::pkgconfig("PKG_LIBS")'|\
4
-    "${R_HOME}/bin/R" --vanilla --slave`
5
-RHTSLIB_CPPFLAGS=`echo 'Rhtslib::pkgconfig("PKG_CPPFLAGS")'|\
6
-    "${R_HOME}/bin/R" --vanilla --slave`
7
+RHTSLIB_LIBS=$(shell echo 'Rhtslib::pkgconfig("PKG_LIBS")'|\
8
+    "${R_HOME}/bin/R" --vanilla --slave)
9
+RHTSLIB_CPPFLAGS=$(shell echo 'Rhtslib::pkgconfig("PKG_CPPFLAGS")'|\
10
+    "${R_HOME}/bin/R" --vanilla --slave)
7 11
 
8 12
 PKG_LIBS=$(RHTSLIB_LIBS)
9 13
 PKG_CPPFLAGS=$(RHTSLIB_CPPFLAGS)
10 14
deleted file mode 100644
... ...
@@ -1,17 +0,0 @@
1
-include Makevars.common
2
-
3
-RHTSLIB_LIBS=$(shell echo 'Rhtslib::pkgconfig("PKG_LIBS")'|\
4
-    "${R_HOME}/bin/R" --vanilla --slave)
5
-RHTSLIB_CPPFLAGS=$(shell echo 'Rhtslib::pkgconfig("PKG_CPPFLAGS")'|\
6
-    "${R_HOME}/bin/R" --vanilla --slave)
7
-
8
-PKG_LIBS=$(RHTSLIB_LIBS)
9
-PKG_CPPFLAGS=$(RHTSLIB_CPPFLAGS)
10
-
11
-OBJECTS = $(SEQBIAS_OBJ) $(YAML_CPP_OBJ:%=yaml-cpp/%)
12
-
13
-all : $(SHLIB)
14
-
15
-clean :
16
-	rm -rf $(OBJECTS)
17
-