Revision: 4573
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4573&view=rev
Author: fer_perez
Date: 2007-12-03 22:24:07 -0800 (Mon, 03 Dec 2007)
Log Message:
-----------
Get skeleton to build correctly, rewrite makefile to do as few latex runs as
possible
Modified Paths:
--------------
trunk/py4science/workbook/Makefile
Added Paths:
-----------
trunk/py4science/workbook/problems_skel/basemap1.py
trunk/py4science/workbook/problems_skel/basemap2.py
trunk/py4science/workbook/problems_skel/basemap3.py
trunk/py4science/workbook/problems_skel/basemap4.py
trunk/py4science/workbook/problems_skel/basemap5.py
Modified: trunk/py4science/workbook/Makefile
===================================================================
--- trunk/py4science/workbook/Makefile 2007-12-04 03:18:39 UTC (rev 4572)
+++ trunk/py4science/workbook/Makefile 2007-12-04 06:24:07 UTC (rev 4573)
@@ -1,20 +1,55 @@
-solved:
+# Makefile for the py4science book.
+
+# Dependencies
+
+# Warning: list the .aux *before* the bbl. It's probably possible to get the
+# rules right, but I'm not sure how.
+SKEL_SRC = workbook_skeletons.aux workbook_skeletons.bbl \
+workbook_skeletons.tex main.tex
+
+SOL_SRC = $(subst _skeletons,_solved,$(SKEL_SRC))
+
+# programs
+PDFTEX = pdflatex -file-line-error
+FASTPDFTEX = pdflatex -file-line-error -draftmode -halt-on-error
+
+# convenience shorthand for targets
+sol: workbook_solved.pdf
+skel: workbook_skeletons.pdf
+all: sol skel
+
+# actual targets
+workbook_solved.pdf: $(SOL_SRC)
rm -f problems
- ln -s problems_solved problems
- rm -f workbook_solved.tex
- ln -s main.tex workbook_solved.tex
- pdflatex workbook_solved
- bibtex workbook_solved
- pdflatex workbook_solved
- rm -f workbook_solved.tex
+ ln -sf problems_solved problems
+ $(PDFTEX) workbook_solved
+ $(PDFTEX) workbook_solved
-skeletons:
+workbook_skeletons.pdf: $(SKEL_SRC)
rm -f problems
- ln -s problems_skel problems
- rm -f workbook_skeletons.tex
- ln -s main.tex workbook_skeletons.tex
- pdflatex workbook_skeletons
- rm -f workbook_skeletons.tex
+ ln -sf problems_skel problems
+ $(PDFTEX) workbook_skeletons
+workbook_skeletons.tex:
+ ln -sf main.tex workbook_skeletons.tex
+
+workbook_solved.tex:
+ ln -sf main.tex workbook_solved.tex
+
clean:
- rm -f *~ *.aux *.log *.toc *.out
\ No newline at end of file
+ rm -f *~ *.aux *.log *.toc *.out *.bbl *.blg
+
+distclean: clean
+ rm -f workbook_solved.pdf workbook_skeletons.pdf
+
+# Basic rules
+empty :=
+%.bbl : %.aux
+ bibtex $(subst .aux,$(empty),$<)
+ $(FASTPDFTEX) $(subst .aux,$(empty),$<)
+
+%.aux : %.tex
+ $(FASTPDFTEX) $<
+
+# Phony targets
+.PHONY: all clean
Added: trunk/py4science/workbook/problems_skel/basemap1.py
===================================================================
--- trunk/py4science/workbook/problems_skel/basemap1.py
(rev 0)
+++ trunk/py4science/workbook/problems_skel/basemap1.py 2007-12-04 06:24:07 UTC
(rev 4573)
@@ -0,0 +1 @@
+link ../../examples/skel/basemap1_skel.py
\ No newline at end of file
Property changes on: trunk/py4science/workbook/problems_skel/basemap1.py
___________________________________________________________________
Name: svn:special
+ *
Added: trunk/py4science/workbook/problems_skel/basemap2.py
===================================================================
--- trunk/py4science/workbook/problems_skel/basemap2.py
(rev 0)
+++ trunk/py4science/workbook/problems_skel/basemap2.py 2007-12-04 06:24:07 UTC
(rev 4573)
@@ -0,0 +1 @@
+link ../../examples/skel/basemap2_skel.py
\ No newline at end of file
Property changes on: trunk/py4science/workbook/problems_skel/basemap2.py
___________________________________________________________________
Name: svn:special
+ *
Added: trunk/py4science/workbook/problems_skel/basemap3.py
===================================================================
--- trunk/py4science/workbook/problems_skel/basemap3.py
(rev 0)
+++ trunk/py4science/workbook/problems_skel/basemap3.py 2007-12-04 06:24:07 UTC
(rev 4573)
@@ -0,0 +1 @@
+link ../../examples/skel/basemap3_skel.py
\ No newline at end of file
Property changes on: trunk/py4science/workbook/problems_skel/basemap3.py
___________________________________________________________________
Name: svn:special
+ *
Added: trunk/py4science/workbook/problems_skel/basemap4.py
===================================================================
--- trunk/py4science/workbook/problems_skel/basemap4.py
(rev 0)
+++ trunk/py4science/workbook/problems_skel/basemap4.py 2007-12-04 06:24:07 UTC
(rev 4573)
@@ -0,0 +1 @@
+link ../../examples/skel/basemap4_skel.py
\ No newline at end of file
Property changes on: trunk/py4science/workbook/problems_skel/basemap4.py
___________________________________________________________________
Name: svn:special
+ *
Added: trunk/py4science/workbook/problems_skel/basemap5.py
===================================================================
--- trunk/py4science/workbook/problems_skel/basemap5.py
(rev 0)
+++ trunk/py4science/workbook/problems_skel/basemap5.py 2007-12-04 06:24:07 UTC
(rev 4573)
@@ -0,0 +1 @@
+link ../../examples/skel/basemap5_skel.py
\ No newline at end of file
Property changes on: trunk/py4science/workbook/problems_skel/basemap5.py
___________________________________________________________________
Name: svn:special
+ *
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
SF.Net email is sponsored by: The Future of Linux Business White Paper
from Novell. From the desktop to the data center, Linux is going
mainstream. Let it simplify your IT future.
http://altfarm.mediaplex.com/ad/ck/8857-50307-18918-4
_______________________________________________
Matplotlib-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
