[Phylobase-commits] r732 - in pkg: . src/ncl/ncl

[noreply at r-forge.r-project.org]

Author: edd
Date: 2010-02-01 20:07:11 +0100 (Mon, 01 Feb 2010)
New Revision: 732

Added:
   pkg/src/ncl/ncl/Makefile.unix
Modified:
   pkg/DESCRIPTION
   pkg/configure
   pkg/configure.in
Log:
used a pre-determined and constant Makefile to build a static libncl.a on Unix variants jsut like we do on Windows
rolled Rcpp dependency to release 0.7.4


Modified: pkg/DESCRIPTION
===================================================================
--- pkg/DESCRIPTION	2010-01-31 14:56:45 UTC (rev 731)
+++ pkg/DESCRIPTION	2010-02-01 19:07:11 UTC (rev 732)
@@ -3,7 +3,7 @@
 Title: Base package for phylogenetic structures and comparative data
 Version: 0.5
 Date: 2009-10-30
-Depends: methods, grid, ape(>= 2.1), Rcpp (>= 0.7.3)
+Depends: methods, grid, ape(>= 2.1), Rcpp (>= 0.7.4)
 Suggests: ade4, MASS
 Author: R Hackathon et al. (alphabetically: Ben Bolker, Marguerite Butler, Peter Cowan,  Damien de Vienne, Thibaut Jombart, Steve Kembel, Francois Michonneau, David Orme, Brian O'Meara, Emmanuel Paradis, Jim Regetz, Derrick Zwickl)
 Maintainer:  Ben Bolker <bolker at ufl.edu>

Modified: pkg/configure
===================================================================
--- pkg/configure	2010-01-31 14:56:45 UTC (rev 731)
+++ pkg/configure	2010-02-01 19:07:11 UTC (rev 732)
@@ -2502,18 +2502,19 @@
 fi
 
 ## configure include/load flags and copy sample source to inst/doc
-CPPFLAGS="${CPPFLAGS} ${rcpp_cxxflags} -Iinclude"
+CPPFLAGS="${CPPFLAGS} ${rcpp_cxxflags} -Incl"
 
-LDFLAGS="${LDFLAGS} ${rcpp_ldflags} -Llib/ncl -lncl"
+LDFLAGS="${LDFLAGS} ${rcpp_ldflags} -Lncl/ncl -lncl"
 
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: starting to build libncl.a in src/ncl" >&5
 $as_echo "$as_me: starting to build libncl.a in src/ncl" >&6;}
-cd src/ncl
-./configure --quiet --enable-static --disable-shared --prefix=`pwd`/..
-make 2>&1 > /dev/null
-make install 2>&1 > /dev/null
-cd ../..
+cd src/ncl/ncl
+#./configure --quiet --enable-static --disable-shared --prefix=`pwd`/..
+#make 2>&1 > /dev/null
+make -f Makefile.unix
+#make install 2>&1 > /dev/null
+cd ../../..
 { $as_echo "$as_me:${as_lineno-$LINENO}: finished building libncl.a in src/ncl" >&5
 $as_echo "$as_me: finished building libncl.a in src/ncl" >&6;}
 

Modified: pkg/configure.in
===================================================================
--- pkg/configure.in	2010-01-31 14:56:45 UTC (rev 731)
+++ pkg/configure.in	2010-02-01 19:07:11 UTC (rev 732)
@@ -45,15 +45,16 @@
 fi
 
 ## configure include/load flags and copy sample source to inst/doc
-AC_SUBST([CPPFLAGS],["${CPPFLAGS} ${rcpp_cxxflags} -Iinclude"])
-AC_SUBST([LDFLAGS],["${LDFLAGS} ${rcpp_ldflags} -Llib/ncl -lncl"])
+AC_SUBST([CPPFLAGS],["${CPPFLAGS} ${rcpp_cxxflags} -Incl"])
+AC_SUBST([LDFLAGS],["${LDFLAGS} ${rcpp_ldflags} -Lncl/ncl -lncl"])
 
 AC_MSG_NOTICE([starting to build libncl.a in src/ncl])
-cd src/ncl
-./configure --quiet --enable-static --disable-shared --prefix=`pwd`/..
-make 2>&1 > /dev/null
-make install 2>&1 > /dev/null
-cd ../..
+cd src/ncl/ncl
+##./configure --quiet --enable-static --disable-shared --prefix=`pwd`/..
+##make 2>&1 > /dev/null
+make -f Makefile.unix
+##make install 2>&1 > /dev/null
+cd ../../..
 AC_MSG_NOTICE([finished building libncl.a in src/ncl])
 
 if test \! -d inst

Added: pkg/src/ncl/ncl/Makefile.unix
===================================================================
--- pkg/src/ncl/ncl/Makefile.unix	                        (rev 0)
+++ pkg/src/ncl/ncl/Makefile.unix	2010-02-01 19:07:11 UTC (rev 732)
@@ -0,0 +1,63 @@
+##
+
+SRC = \
+	nxsassumptionsblock.cpp \
+	nxsblock.cpp \
+	nxscharactersblock.cpp \
+	nxscxxdiscretematrix.cpp \
+	nxsdatablock.cpp \
+	nxsdistancedatum.cpp \
+	nxsdistancesblock.cpp \
+	nxsexception.cpp \
+	nxsmultiformat.cpp \
+	nxspublicblocks.cpp \
+	nxsreader.cpp \
+	nxssetreader.cpp \
+	nxsstring.cpp \
+	nxstaxablock.cpp \
+	nxstoken.cpp \
+	nxstreesblock.cpp \
+	nxsunalignedblock.cpp 
+
+## nxsemptyblock.cpp 
+
+OBJ = \
+	nxsassumptionsblock.o \
+	nxsblock.o \
+	nxscharactersblock.o \
+	nxscxxdiscretematrix.o \
+	nxsdatablock.o \
+	nxsdistancedatum.o \
+	nxsdistancesblock.o \
+	nxsexception.o \
+	nxsmultiformat.o \
+	nxspublicblocks.o \
+	nxsreader.o \
+	nxssetreader.o \
+	nxsstring.o \
+	nxstaxablock.o \
+	nxstoken.o \
+	nxstreesblock.o \
+	nxsunalignedblock.o 
+
+LINKOBJ = $(OBJ) $(RES)
+
+LIB  = libncl.a
+CXXFLAGS = $(CPPFLAGS) -fPIC -Wall -O2 -I..
+RM = rm -f
+	
+.PHONY: all all-before all-after clean clean-custom
+
+all: all-before libncl.a  all-after
+
+clean: clean-custom
+	${RM} $(LINKOBJ) $(LIB)
+
+$(OBJ): $(SRC)
+	$(CXX) -c $*.cpp -o $*.o $(CXXFLAGS)
+	
+$(LIB): $(LINKOBJ)
+	ar r $(LIB) $(OBJ)
+	ranlib $(LIB)
+	rm $(OBJ)
+