[Rprotobuf-commits] r535 - in pkg: . vignettes
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Fri Sep 13 10:16:48 CEST 2013
Author: murray
Date: 2013-09-13 10:16:48 +0200 (Fri, 13 Sep 2013)
New Revision: 535
Added:
pkg/vignettes/Makefile.in
Removed:
pkg/vignettes/Makefile
Modified:
pkg/ChangeLog
pkg/configure
pkg/configure.in
Log:
Replace use of a GNU make extension with a configure variable so we
can output a more portable makefile for the vignette.
Modified: pkg/ChangeLog
===================================================================
--- pkg/ChangeLog 2013-09-13 01:56:14 UTC (rev 534)
+++ pkg/ChangeLog 2013-09-13 08:16:48 UTC (rev 535)
@@ -1,3 +1,9 @@
+2013-09-13 Murray Stokely <murray at FreeBSD.org>
+
+ * vignettes/Makefile.in: Update configure to output R_HOME to the
+ vignette makefile so we can avoid the use of a non-portable GNU
+ makefile extension here.
+
2013-09-12 Murray Stokely <murray at FreeBSD.org>
* src/RcppMacros.h: Add Rcpp compatibility macros
Modified: pkg/configure
===================================================================
--- pkg/configure 2013-09-13 01:56:14 UTC (rev 534)
+++ pkg/configure 2013-09-13 08:16:48 UTC (rev 535)
@@ -589,6 +589,7 @@
ac_subst_vars='LTLIBOBJS
LIBOBJS
+R_HOME
PKG_LIBS
PKG_CPPFLAGS
RSCRIPT
@@ -3678,15 +3679,18 @@
## use pkg-config for ProtoBuf settings
##
-# First, set a reasonable default of -lprotobuf if we don't have pkg-config
-protobuf_cxxflags=""
-protobuf_libs="-lprotobuf"
-
if test x"${PKGCONFIG}" == x"yes"; then
if pkg-config --exists protobuf; then
protobuf_cxxflags=`pkg-config --cflags protobuf`
protobuf_libs=`pkg-config --libs protobuf`
+ else
+ protobuf_cxxflags=""
+ protobuf_libs="-lprotobuf"
fi
+else
+ # Add a reasonable default of -lprotobuf if we don't have pkg-config
+ protobuf_cxxflags=""
+ protobuf_libs="-lprotobuf"
fi
## And make sure these flags are used for the tests below.
@@ -4184,8 +4188,10 @@
PKG_LIBS="${PKG_LIBS} $rcpp_ldflags $protobuf_libs"
-ac_config_files="$ac_config_files src/Makevars"
+R_HOME="${R_HOME}"
+ac_config_files="$ac_config_files src/Makevars vignettes/Makefile"
+
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
# tests run on this system so they can be shared between configure
@@ -4881,6 +4887,7 @@
do
case $ac_config_target in
"src/Makevars") CONFIG_FILES="$CONFIG_FILES src/Makevars" ;;
+ "vignettes/Makefile") CONFIG_FILES="$CONFIG_FILES vignettes/Makefile" ;;
*) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
esac
Modified: pkg/configure.in
===================================================================
--- pkg/configure.in 2013-09-13 01:56:14 UTC (rev 534)
+++ pkg/configure.in 2013-09-13 08:16:48 UTC (rev 535)
@@ -142,6 +142,7 @@
## now use all these
AC_SUBST([PKG_CPPFLAGS],["${PKG_CPPFLAGS} ${CXXFLAGS} $protobuf_cxxflags"])
AC_SUBST([PKG_LIBS],["${PKG_LIBS} $rcpp_ldflags $protobuf_libs"])
-AC_CONFIG_FILES([src/Makevars])
+AC_SUBST([R_HOME],["${R_HOME}"])
+AC_CONFIG_FILES([src/Makevars vignettes/Makefile])
AC_OUTPUT
echo "Completed configuration and ready to build."
Deleted: pkg/vignettes/Makefile
===================================================================
--- pkg/vignettes/Makefile 2013-09-13 01:56:14 UTC (rev 534)
+++ pkg/vignettes/Makefile 2013-09-13 08:16:48 UTC (rev 535)
@@ -1,38 +0,0 @@
-
-## this is a 'fake' all as R-devel gets a race condition on RProtoBuf-intro and deletes the .tex file
-all: RProtoBuf-unitTests.pdf RProtoBuf-quickref.pdf
-
-## 'real all'
-pdfall: RProtoBuf-unitTests.pdf RProtoBuf-intro.pdf RProtoBuf-quickref.pdf
-
-pdfclean:
- rm -fr *.pdf
-
-clean:
- rm -f RProtoBuf-intro.aux RProtoBuf-intro.log RProtoBuf-intro.out
- rm -f RProtoBuf-quickref.aux RProtoBuf-quickref.log RProtoBuf-quickref.out
- rm -f RProtoBuf-unitTests.aux RProtoBuf-unitTests.log RProtoBuf-unitTests.out
- rm -rf auto/
-
-setvars:
-ifeq (${R_HOME},)
-R_HOME= $(shell R RHOME)
-endif
-RPROG= $(R_HOME)/bin/R
-RSCRIPT=$(R_HOME)/bin/Rscript
-
-RProtoBuf-unitTests.pdf: unitTests/RProtoBuf-unitTests.R
- $(RSCRIPT) --default-packages="RProtoBuf,Rcpp,brew,RUnit,tools,utils" unitTests/RProtoBuf-unitTests.R
-
-RProtoBuf-intro.pdf: RProtoBuf/RProtoBuf.Rnw
- cp -f RProtoBuf/RProtoBuf.Rnw RProtoBuf-intro.Rnw
- $(RSCRIPT) -e "require('highlight'); require('tools'); Sweave('RProtoBuf-intro.Rnw', driver=HighlightWeaveLatex()); texi2dvi('RProtoBuf-intro.tex', pdf=TRUE, clean=TRUE)"
- cp -f RProtoBuf/RProtoBuf-fake.Rnw RProtoBuf-intro.Rnw
-
-RProtoBuf-quickref.pdf: RProtoBuf-quickref/RProtoBuf-quickref.Rnw
- touch RProtoBuf-quickref.Rnw
- rm RProtoBuf-quickref.Rnw
- cp -f RProtoBuf-quickref/RProtoBuf-quickref.Rnw .
- $(RSCRIPT) -e "require( 'highlight'); require('tools'); Sweave('RProtoBuf-quickref.Rnw', driver=HighlightWeaveLatex()); texi2dvi('RProtoBuf-quickref.tex', pdf=TRUE, clean=TRUE)"
- cp -f RProtoBuf-quickref/RProtoBuf-quickref-fake.Rnw RProtoBuf-quickref.Rnw
-
Copied: pkg/vignettes/Makefile.in (from rev 534, pkg/vignettes/Makefile)
===================================================================
--- pkg/vignettes/Makefile.in (rev 0)
+++ pkg/vignettes/Makefile.in 2013-09-13 08:16:48 UTC (rev 535)
@@ -0,0 +1,36 @@
+
+## this is a 'fake' all as R-devel gets a race condition on RProtoBuf-intro and deletes the .tex file
+all: RProtoBuf-unitTests.pdf RProtoBuf-quickref.pdf
+
+## 'real all'
+pdfall: RProtoBuf-unitTests.pdf RProtoBuf-intro.pdf RProtoBuf-quickref.pdf
+
+pdfclean:
+ rm -fr *.pdf
+
+clean:
+ rm -f RProtoBuf-intro.aux RProtoBuf-intro.log RProtoBuf-intro.out
+ rm -f RProtoBuf-quickref.aux RProtoBuf-quickref.log RProtoBuf-quickref.out
+ rm -f RProtoBuf-unitTests.aux RProtoBuf-unitTests.log RProtoBuf-unitTests.out
+ rm -rf auto/
+
+setvars:
+R_HOME= @R_HOME@
+RPROG= $(R_HOME)/bin/R
+RSCRIPT=$(R_HOME)/bin/Rscript
+
+RProtoBuf-unitTests.pdf: unitTests/RProtoBuf-unitTests.R
+ $(RSCRIPT) --default-packages="RProtoBuf,Rcpp,brew,RUnit,tools,utils" unitTests/RProtoBuf-unitTests.R
+
+RProtoBuf-intro.pdf: RProtoBuf/RProtoBuf.Rnw
+ cp -f RProtoBuf/RProtoBuf.Rnw RProtoBuf-intro.Rnw
+ $(RSCRIPT) -e "require('highlight'); require('tools'); Sweave('RProtoBuf-intro.Rnw', driver=HighlightWeaveLatex()); texi2dvi('RProtoBuf-intro.tex', pdf=TRUE, clean=TRUE)"
+ cp -f RProtoBuf/RProtoBuf-fake.Rnw RProtoBuf-intro.Rnw
+
+RProtoBuf-quickref.pdf: RProtoBuf-quickref/RProtoBuf-quickref.Rnw
+ touch RProtoBuf-quickref.Rnw
+ rm RProtoBuf-quickref.Rnw
+ cp -f RProtoBuf-quickref/RProtoBuf-quickref.Rnw .
+ $(RSCRIPT) -e "require( 'highlight'); require('tools'); Sweave('RProtoBuf-quickref.Rnw', driver=HighlightWeaveLatex()); texi2dvi('RProtoBuf-quickref.tex', pdf=TRUE, clean=TRUE)"
+ cp -f RProtoBuf-quickref/RProtoBuf-quickref-fake.Rnw RProtoBuf-quickref.Rnw
+
Property changes on: pkg/vignettes/Makefile.in
___________________________________________________________________
Added: svn:mergeinfo
+
More information about the Rprotobuf-commits
mailing list