Restructured to separate fast and full rebuilding.

git-svn-id: file:///home/phd/archive/SVN/phdru.name/scripts@125 7bb0bf08-9e0d-0410-b083-99cee3bf18b8

diff --git a/Makefile b/Makefile
index 06c0cdbc0f696395ff99d1294ed484ba7c8969df..303c42d2d3d11eb1bae518e325ac039dcc622a5f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -18,22 +18,31 @@
        umask 022; PYTHONPATH=. cheetah fill --nobackup $<
 
 
-.PHONY: phdru.name
-phdru.name: phd_site.py news blog html
+.PHONY: fast
+fast: news html
 
 
-.PHONY: news
-news: atom_10.py rss_20.py
-       (umask 022; PYTHONPATH=. ./make-news.py en ../htdocs/phdru.name/public_html && ./make-news.py ru ../htdocs/phdru.name/public_html/Russian)
+.PHONY: all
+all: phdru.name
+
+
+.PHONY: phdru.name
+phdru.name: news blog
 
 
 .PHONY: blog
 blog: atom_10.py rss_20.py
        ./reindex_blog_ru
+       $(MAKE) html
 
 
 templates = $(shell find ../htdocs/phdru.name/public_html -type f -name \*.tmpl -print)
 htmls = $(patsubst %.tmpl,%.html,$(templates))
 
 .PHONY: html
-html: $(htmls)
+html: phd_site.py $(htmls)
+
+
+.PHONY: news
+news: atom_10.py rss_20.py
+       (umask 022; PYTHONPATH=. ./make-news.py en ../htdocs/phdru.name/public_html && ./make-news.py ru ../htdocs/phdru.name/public_html/Russian)