Browse code

Further fixes for Mac platform; version number bumped to 0.99.5

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

Ulrich Bodenhofer authored on 12/04/2015 19:59:20
Showing3 changed files

... ...
@@ -1,8 +1,8 @@
1 1
 Package: msa
2 2
 Type: Package
3 3
 Title: Multiple Sequence Alignment
4
-Version: 0.99.4
5
-Date: 2015-04-11
4
+Version: 0.99.5
5
+Date: 2015-04-12
6 6
 Author: Enrico Bonatesta, Christoph Horejs-Kainrath, Ulrich Bodenhofer
7 7
 Maintainer: Ulrich Bodenhofer <bodenhofer@bioinf.jku.at>
8 8
 Description: This package provides a unified R/Bioconductor interface to the
... ...
@@ -1,3 +1,10 @@
1
+OS := $(shell uname)
2
+ifeq ($(OS), Darwin)
3
+	CONFIGURE_FLAGS='--without-openmp'
4
+else 
5
+	CONFIGURE_FLAGS=''
6
+endif
7
+
1 8
 CPPNames=\
2 9
 exceptions4c/e4c_lite.c \
3 10
 argtable2/argtable2.c argtable2/arg_end.c argtable2/arg_rem.c argtable2/arg_lit.c argtable2/arg_int.c \
... ...
@@ -35,11 +42,11 @@ RClustalOmega.o mymain.o clustal-omega.o
35 42
 all: clustalomega
36 43
 
37 44
 clustalomega:
38
-	./configure; \
45
+	./configure $(CONFIGURE_FLAGS); \
39 46
 	export PKG_LIBS="$(PKG_LIBS) $(SHLIB_OPENMP_CFLAGS) `Rscript -e "Rcpp:::LdFlags()"`"; \
40 47
 	export PKG_CXXFLAGS="$(PKG_CXXFLAGS) $(SHLIB_OPENMP_CXXFLAGS) -fPIC -DHAVE_CONFIG_H -I. -DCLUSTALO -DCLUSTALO_NOFILE -DDEFAULT_FILTER=90 -I"../../gc-7.2/include" `Rscript -e "Rcpp:::CxxFlags()"`"; \
41 48
 	export PKG_CFLAGS="$(PKG_CFLAGS) $(SHLIB_OPENMP_CFLAGS) -fPIC -DHAVE_CONFIG_H -I. -DCLUSTALO -DCLUSTALO_NOFILE -DDEFAULT_FILTER=90 -I"../../gc-7.2/include" `Rscript -e "Rcpp:::CxxFlags()"`"; \
42 49
 	cd src; \
43
-	R CMD SHLIB -o libClustalOmega.so $(CPPNames); \
44
-	ar rcs libClustalOmega.a $(OBJNames); \
50
+	R CMD SHLIB -o libClustalOmega.so $(CPPNames) && \
51
+	ar rcs libClustalOmega.a $(OBJNames) && \
45 52
 	cp libClustalOmega.a ../../
... ...
@@ -9,6 +9,6 @@ clustalw:
9 9
 	cd src; \
10 10
 	export PKG_LIBS="$(PKG_LIBS) `Rscript -e "Rcpp:::LdFlags()"`"; \
11 11
 	export PKG_CXXFLAGS="-DHAVE_CONFIG_H -I. $(PKG_CXXFLAGS) `Rscript -e "Rcpp:::CxxFlags()"`"; \
12
-	R CMD SHLIB -o libClustalW.so $(CPPNames); \
13
-	ar rcs libClustalW.a $(OBJNames); \
12
+	R CMD SHLIB -o libClustalW.so $(CPPNames) && \
13
+	ar rcs libClustalW.a $(OBJNames) && \
14 14
 	cp libClustalW.a ../../