[Rprotobuf-commits] r471 - in pkg: . vignettes

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

Author: edd
Date: 2012-08-09 05:57:25 +0200 (Thu, 09 Aug 2012)
New Revision: 471

Modified:
   pkg/cleanup
   pkg/vignettes/Makefile
Log:
minor tweaks


Modified: pkg/cleanup
===================================================================
--- pkg/cleanup	2012-08-09 02:52:30 UTC (rev 470)
+++ pkg/cleanup	2012-08-09 03:57:25 UTC (rev 471)
@@ -6,12 +6,10 @@
     src/*.o src/*.d src/*.a src/*.dll src/*.so src/*.rc */*~ *~ \
     src/symbols.rds \
     inst/doc/RProtoBuf*.aux inst/doc/RProtoBuf*.log \
-    inst/doc/RProtoBuf*.out inst/doc/RProtoBuf*.tex \
-    inst/doc/RProtoBuf*.toc 
+    inst/doc/RProtoBuf*.out inst/doc/RProtoBuf*.toc 
 rm -rf inst/doc/auto
 
-[ -d inst/doc ] && ( cd  inst/doc && make clean )
+[ -d vignettes ] && ( cd vignettes && make clean )
 
-
 [ -d inst/examples/HighFrequencyFinance ] && \
     ( cd  inst/examples/HighFrequencyFinance && make clean )

Modified: pkg/vignettes/Makefile
===================================================================
--- pkg/vignettes/Makefile	2012-08-09 02:52:30 UTC (rev 470)
+++ pkg/vignettes/Makefile	2012-08-09 03:57:25 UTC (rev 471)
@@ -1,13 +1,17 @@
 
-all: 	RProtoBuf-unitTests.pdf RProtoBuf-intro.pdf RProtoBuf-quickref.pdf
+## 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: ProtoBuf-unitTests.pdf RProtoBuf-intro.pdf RProtoBuf-quickref.pdf
+
 pdfclean:
 	rm -fr *.pdf
 
 clean:
-	rm -f  RProtoBuf-intro.tex RProtoBuf-intro.aux RProtoBuf-intro.log RProtoBuf-intro.out
-	rm -f RProtoBuf-quickref.tex RProtoBuf-quickref.aux RProtoBuf-quickref.log RProtoBuf-quickref.out
-	rm -f RProtoBuf-unitTests.tex RProtoBuf-unitTests.aux RProtoBuf-unitTests.log RProtoBuf-unitTests.out
+	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:
@@ -22,13 +26,13 @@
 
 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)"
+	$(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)"
+	$(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