git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/Rdisop@63750 bc3139a8-67e5-0310-9ffc-ced21a209358
s.neumann authored on 11/03/2012 19:53:36
| ... | ... |
@@ -1,7 +1,7 @@ |
| 1 | 1 |
Package: Rdisop |
| 2 | 2 |
Title: Decomposition of Isotopic Patterns |
| 3 |
-Version: 1.15.7 |
|
| 4 |
-Date: 2012-03-10 |
|
| 3 |
+Version: 1.15.8 |
|
| 4 |
+Date: 2012-03-11 |
|
| 5 | 5 |
Author: Anton Pervukhin <apervukh@minet.uni-jena.de>, Steffen Neumann <sneumann@ipb-halle.de> |
| 6 | 6 |
Maintainer: Steffen Neumann <sneumann@ipb-halle.de> |
| 7 | 7 |
Description: Identification of metabolites using high precision mass |
| ... | ... |
@@ -2,7 +2,7 @@ |
| 2 | 2 |
|
| 3 | 3 |
PKG_CXXFLAGS=-I./imslib/src/ |
| 4 | 4 |
|
| 5 |
-PKG_LIBS=`${R_HOME}/bin/Rscript -e "Rcpp:::LdFlags()"` `${R_HOME}/bin/Rscript -e "RcppClassic:::LdFlags()"`
|
|
| 5 |
+PKG_LIBS=`${R_HOME}/bin/Rscript -e "RcppClassic:::LdFlags()"` `${R_HOME}/bin/Rscript -e "Rcpp:::LdFlags()"`
|
|
| 6 | 6 |
|
| 7 | 7 |
.PHONY: all |
| 8 | 8 |
all: $(SHLIB) |
| ... | ... |
@@ -3,10 +3,8 @@ |
| 3 | 3 |
|
| 4 | 4 |
PKG_CXXFLAGS+= -I./imslib/src/ |
| 5 | 5 |
|
| 6 |
-PKG_LIBS=`${R_HOME}/bin/Rscript -e "Rcpp:::LdFlags()" | sed -e "s/Rcpp/RcppClassic/g" ` `${R_HOME}/bin/Rscript -e "Rcpp:::LdFlags()"`
|
|
| 6 |
+PKG_LIBS=`${R_HOME}/bin/Rscript -e "RcppClassic:::LdFlags()" ` `${R_HOME}/bin/Rscript -e "Rcpp:::LdFlags()"`
|
|
| 7 | 7 |
|
| 8 |
-#PKG_LIBS += $(shell "${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe" -e "Rcpp:::LdFlags()")
|
|
| 9 |
-#PKG_LIBS += $(shell "${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe" -e "Rcpp:::LdFlags()")
|
|
| 10 | 8 |
|
| 11 | 9 |
.PHONY: all |
| 12 | 10 |
all: $(SHLIB) |