refinements to Makefiles

Author: eddelbuettel

ChangeLog

@@ -3,6 +3,9 @@
 	* vignettes/Rcpp-package.Rnw: Another wrapper
 	* vignettes/Rcpp-jss-2011.Rnw: Idem
 
+	* vignettes/Makefile: Refinements 
+	* vignettes/rmd/Makefile: Idem
+
 2019-10-23  Dirk Eddelbuettel  <[email protected]>
 
 	* vignettes/Rcpp-*.Rnw: Wrappers around pdf/*pdf

vignettes/Makefile

@@ -1,7 +1,29 @@
 
+## No GNUmake for R so replacing efficient wildcard ops with explicit enumeration
+## Remove spaces between ': =' and '$ ( ... )' to re-activate
 
-rnwsources := 		$(wildcard *.Rnw)
-rnwvignettes := 	$(rnwsources:.Rnw=.pdf)
+##rnwsources : = 	$ ( wildcard *.Rnw )
+##rnwvignettes : = 	$ ( rnwsources:.Rnw=.pdf )
+
+rnwsources  = 		Rcpp-attributes.Rnw \
+			Rcpp-extending.Rnw \
+			Rcpp-FAQ.Rnw \
+			Rcpp-introduction.Rnw \
+			Rcpp-jss-2011.Rnw \
+			Rcpp-modules.Rnw \
+			Rcpp-package.Rnw \
+			Rcpp-quickref.Rnw \
+			Rcpp-sugar.Rnw
+
+rnwvignettes  = 	Rcpp-attributes.pdf \
+			Rcpp-extending.pdf \
+			Rcpp-FAQ.pdf \
+			Rcpp-introduction.pdf \
+			Rcpp-jss-2011.pdf \
+			Rcpp-modules.pdf \
+			Rcpp-package.pdf \
+			Rcpp-quickref.pdf \
+			Rcpp-sugar.pdf
 
 %.tex:			%.Rnw
 			Rscript -e 'Sweave("$<")'
@@ -12,6 +34,4 @@ rnwvignettes := 	$(rnwsources:.Rnw=.pdf)
 			Rscript -e 'tools::compactPDF("$@", gs_quality="ebook")'
 
 all:			${rnwvignettes}
-
-clean:
-			rm -f *.aux *.log *.tex
+			@rm -f *.aux *.log *.tex

vignettes/rmd/Makefile

@@ -1,4 +1,5 @@
 
+## This Makefile is not included in the package sources so we can use GNUmake idioms. Yay.
 
 rmdsources := 		$(wildcard *.Rmd)
 rmdvignettes := 	$(rmdsources:.Rmd=.pdf)
@@ -10,9 +11,14 @@ rmdvignettes := 	$(rmdsources:.Rmd=.pdf)
 
 all:			${rmdvignettes} Rcpp-jss-2011.pdf
 
-Rcpp-jss-2011.pdf:	Rcpp-jss-2011.Rnw
+Rcpp-jss-2011.tex:	Rcpp-jss-2011.Rnw
 			Rscript -e 'Sweave("$<")'
+
+Rcpp-jss-2011.pdf:	Rcpp-jss-2011.tex
+			Rscript -e 'tools::texi2pdf("$<", texi2dvi="pdflatex")'
+			Rscript -e 'tools::texi2pdf("$<", texi2dvi="pdflatex")'
 			Rscript -e 'tools::compactPDF("$@", gs_quality="ebook")'
+			cp -vax $@ ../pdf
 
 clean:
-			rm -rf *.aux *.log *.tex *.pdf Rcpp-introduction_cache pinp.cls jss.bst
+			@rm -rf *.aux *.log *.out *.tex *.pdf Rcpp-introduction_cache pinp.cls