[Phylobase-commits] r714 - pkg

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

Author: edd
Date: 2010-01-24 03:36:55 +0100 (Sun, 24 Jan 2010)
New Revision: 714

Modified:
   pkg/cleanup
   pkg/configure
   pkg/configure.in
Log:
simplify build by 
 -- telling ncl to only build statically and not shared
 -- providing a target directory still with the src/ tree of the package
 -- running 'make install' so that libtool actually builds the final libncl.a
 -- pointing src/Makevars to use this new library and the assorted header files
update cleanup to also prune the new temporary files created by the ncl build


Modified: pkg/cleanup
===================================================================
--- pkg/cleanup	2010-01-24 02:33:28 UTC (rev 713)
+++ pkg/cleanup	2010-01-24 02:36:55 UTC (rev 714)
@@ -7,13 +7,14 @@
 rm -f inst/Rcpp-license.txt
 rm -rf inst/doc/auto
 rm -rf autom4te.cache
-cd src/ncl
-make clean
+rm -rf src/include src/lib src/ncl/auto4te.cache
+cd src/ncl  
+test -f Makefile && make clean
 rm -f stamp-h1
 rm -f libtool
 rm -f configure.lineno
 rm -f Makefile
-rm -rf ncl/.deps
+rm -rf ncl/.deps autom4te.cache
 cd ncl
 rm -f Makefile
 cd ../../..

Modified: pkg/configure
===================================================================
--- pkg/configure	2010-01-24 02:33:28 UTC (rev 713)
+++ pkg/configure	2010-01-24 02:36:55 UTC (rev 714)
@@ -2494,9 +2494,9 @@
     exit 1
 fi
 
-CPPFLAGS="${CPPFLAGS} ${rcpp_cxxflags} -Incl/ncl"
+CPPFLAGS="${CPPFLAGS} ${rcpp_cxxflags} -Iinclude/ncl"
 
-LDFLAGS="${LDFLAGS} ${rcpp_ldflags} -Lncl/ncl/.libs -lncl"
+LDFLAGS="${LDFLAGS} ${rcpp_ldflags} -Llib/ncl -lncl"
 
 
 #echo "Building libRcpp.a in RcppSrc..."
@@ -2504,11 +2504,16 @@
 #make RHOME=${R_HOME}
 #cd ../..
 
-echo "Building libncl.a in ncl..."
+{ $as_echo "$as_me:${as_lineno-$LINENO}: starting to build libncl.a in ncl" >&5
+$as_echo "$as_me: starting to build libncl.a in ncl" >&6;}
 cd src/ncl
-./configure
+./configure --quiet --enable-static --disable-shared --prefix=`pwd`/..
 make
+make install
 cd ../..
+#ls -ltr src/
+{ $as_echo "$as_me:${as_lineno-$LINENO}: finished building libncl.a in ncl" >&5
+$as_echo "$as_me: finished building libncl.a in ncl" >&6;}
 
 if test \! -d inst
 then

Modified: pkg/configure.in
===================================================================
--- pkg/configure.in	2010-01-24 02:33:28 UTC (rev 713)
+++ pkg/configure.in	2010-01-24 02:36:55 UTC (rev 714)
@@ -1,11 +1,11 @@
-AC_PREREQ(2.50) dnl require version 2.5+ of autoconf
+AC_PREREQ(2.50) 		## require version 2.5+ of autoconf
 
-AC_INIT([phylobase], 0.2) dnl package name, version
+AC_INIT([phylobase], 0.5) 	## package name, version
 
-dnl the CC and CFLAGS variables control configure tests, and they need to
-dnl be the same as what will be used when the package is built. There is
-dnl no need to place these flags in Makevars, and if no configure tests are
-dnl done they are not needed here (see "Writing R Extensions" manual).
+## the CC and CFLAGS variables control configure tests, and they need to
+## be the same as what will be used when the package is built. There is
+## no need to place these flags in Makevars, and if no configure tests are
+## done they are not needed here (see "Writing R Extensions" manual).
 : ${R_HOME=`R RHOME`}
 if test -z "${R_HOME}"; then
     echo "Could not determine R home directory"
@@ -14,14 +14,15 @@
 CXX=`"${R_HOME}/bin/R" CMD config CXX`
 CXXFLAGS=`"${R_HOME}/bin/R" CMD config CXXFLAGS`
 
-AC_LANG(C++) dnl using C++
+AC_LANG(C++) ## using C++
 
 AC_REQUIRE_CPP
 
 AC_DEFUN([AC_PROG_R], [AC_CHECK_PROG(R,R,yes)])
 AC_PROG_R
 
-## With thanks to Kurt
+## Make sure we find R_HOME as several R instances could be installed 
+## on the same machine -- with thanks to Kurt Hornik for the hint
 : ${R_HOME=`R RHOME`}
 if test -z "${R_HOME}"; then
     AC_MSG_ERROR([Could not determine R_HOME.])
@@ -43,20 +44,17 @@
     exit 1
 fi
 
-dnl configure include/load flags and copy sample source to inst/doc
-AC_SUBST([CPPFLAGS],["${CPPFLAGS} ${rcpp_cxxflags} -Incl/ncl"])
-AC_SUBST([LDFLAGS],["${LDFLAGS} ${rcpp_ldflags} -Lncl/ncl/.libs -lncl"])
+## configure include/load flags and copy sample source to inst/doc
+AC_SUBST([CPPFLAGS],["${CPPFLAGS} ${rcpp_cxxflags} -Iinclude/ncl"])
+AC_SUBST([LDFLAGS],["${LDFLAGS} ${rcpp_ldflags} -Llib/ncl -lncl"])
 
-#echo "Building libRcpp.a in RcppSrc..."
-#cd src/RcppSrc
-#make RHOME=${R_HOME}
-#cd ../..
-
-echo "Building libncl.a in ncl..."
+AC_MSG_NOTICE([starting to build libncl.a in ncl])
 cd src/ncl
-./configure
+./configure --quiet --enable-static --disable-shared --prefix=`pwd`/..
 make
+make install
 cd ../..
+AC_MSG_NOTICE([finished building libncl.a in ncl])
 
 if test \! -d inst
 then