X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=Makefile;h=b6ef862543b3a17f1bf6144c6eda6673ab12071c;hb=5637acae53f3f08d569eef7dd83e679a5d3aa37e;hp=00e53a254449694a1e4242e3243be1482a2c3402;hpb=89a798f7b0e604ad3b9796601be0889bad9159ed;p=blog.git

diff --git a/Makefile b/Makefile
index 00e53a2..b6ef862 100644
--- a/Makefile
+++ b/Makefile
@@ -1,28 +1,39 @@
 ## Makefile to export org in blog file to html
 
 emacs ?= emacs
-OUTDIR := 
-FORCE := "no"
+OUTDIR := _site
 BLOGDIR := $(PWD)
+UPDATE :=
 
-all:
-	$(emacs) -Q --script blog.el $(OUTDIR) $(FORCE)
+# To color the code block, install htmlize package
+INIT_PACKAGES = "(progn \
+				(require 'package) \
+				(add-to-list 'package-archives '(\"melpa\" . \"http://melpa.org/packages/\")) \
+				(package-initialize) \
+				(unless (package-installed-p 'htmlize) (package-refresh-contents) (package-install 'htmlize)))"
 
-# used for automation on server
-update:
-	git pull && $(emacs) -Q --script blog.el "~/www/html" "true" 
+CSS := $(wildcard css/*.css)
+
+.PHONY: update publish clean
 
-publish:
-	$(emacs) -Q --batch -l my-publish.el index.org \
+publish: update temp
+	$(emacs) -Q --batch  \
+		--eval $(INIT_PACKAGES) \
 		--eval '(setq debug-on-error t)' \
+		-l my-publish.el index.org \
 		--eval '(blog-setup-project-alist "$(BLOGDIR)" "$(OUTDIR)")' \
 		--eval '(org-publish-current-project)'
 
-compile:
-	$(emacs) -Q --batch -l my-publish.el index.org \
-		--eval '(setq debug-on-error t)' \
-		--eval '(blog-setup-project-alist "$(BLOGDIR)" "$(OUTDIR)")' \
-		--eval '(org-publish-current-project t)'
+update:
+ifeq ($(UPDATE), true)
+	git pull
+endif
+
+# if the source files (css) file changed, remote the org-timestamps to 
+# re-generate all the html files
+temp: $(CSS) my-publish.el
+	rm -rf ~/.org-timestamps
+	touch temp
 
 clean:
 	rm -rf _site/*