Browse code

don't hardcode netcdf package libs; use output of nc-config --libs instead

git-svn-id: file:///home/git/hedgehog.fhcrc.org/bioconductor/branches/RELEASE_2_9/madman/Rpacks/mzR@60414 bc3139a8-67e5-0310-9ffc-ced21a209358

Dan Tenenbaum authored on 17/11/2011 00:05:53
Showing2 changed files

... ...
@@ -1,7 +1,7 @@
1 1
 Package: mzR
2 2
 Type: Package
3 3
 Title: parser for netCDF, mzXML, mzData and mzML files (mass spectrometry data)
4
-Version: 1.0.1
4
+Version: 1.0.2
5 5
 Author: Bernd Fischer, Steffen Neumann, Laurent Gatto
6 6
 Maintainer: Bernd Fischer <bernd.fischer@embl.de>, 
7 7
 	    Steffen Neumann <sneumann@ipb-halle.de>,
... ...
@@ -74,7 +74,7 @@ PWIZ_CPPFLAGS=-I./boost_aux/ -I. -DHAVE_PWIZ_MZML_LIB
74 74
 
75 75
 ## Use the R_HOME indirection to support installations of multiple R version
76 76
 PKG_CPPFLAGS=-D_LARGEFILE_SOURCE $(PWIZ_CPPFLAGS)
77
-PKG_LIBS = $(shell $(R_HOME)/bin/Rscript -e "Rcpp:::LdFlags()" ) $(PWIZ_LDFLAGS) -lnetcdf -lz
77
+PKG_LIBS = $(shell $(R_HOME)/bin/Rscript -e "Rcpp:::LdFlags()" ) $(PWIZ_LDFLAGS) $(shell nc-config --libs)
78 78
 
79 79
 all: clean $(SHLIB)
80 80