X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=Makefile;h=b6ef862543b3a17f1bf6144c6eda6673ab12071c;hb=b33c6ab57943b861817299ce21a416ed3504eaa6;hp=76e1b33362ec7190931f2ad69f60a60b962dc43f;hpb=cae86b8e934b75b21708bc644820345006a0f223;p=blog.git

diff --git a/Makefile b/Makefile
index 76e1b33..b6ef862 100644
--- a/Makefile
+++ b/Makefile
@@ -2,8 +2,8 @@
 
 emacs ?= emacs
 OUTDIR := _site
-FORCE := "no"
 BLOGDIR := $(PWD)
+UPDATE :=
 
 # To color the code block, install htmlize package
 INIT_PACKAGES = "(progn \
@@ -12,23 +12,11 @@ INIT_PACKAGES = "(progn \
 				(package-initialize) \
 				(unless (package-installed-p 'htmlize) (package-refresh-contents) (package-install 'htmlize)))"
 
-# used for automation on server
 CSS := $(wildcard css/*.css)
-OBJS := $(addprefix $(OUTDIR)/,$(CSS))
 
-#$(OUTDIR)/css/%.css:css/%.css
-#	echo "***** css changed remove timestamps *****\n"
-#	rm -rf ~/.org-timestamps
-#$(OBJS): $(CSS) my-publish.el
-$(OBJS): _site/css/%.css:css/%.css
-	rm -rf ~/.org-timestamps
-
-.PHONY: update publish test clean
-
-update:
-	git pull
+.PHONY: update publish clean
 
-publish: update $(OBJS)
+publish: update temp
 	$(emacs) -Q --batch  \
 		--eval $(INIT_PACKAGES) \
 		--eval '(setq debug-on-error t)' \
@@ -36,14 +24,16 @@ publish: update $(OBJS)
 		--eval '(blog-setup-project-alist "$(BLOGDIR)" "$(OUTDIR)")' \
 		--eval '(org-publish-current-project)'
 
-# test will force publishing all files in the porject 
-test:
-	$(emacs) -Q --batch \
-		--eval $(INIT_PACKAGES) \
-		--eval '(setq debug-on-error t)' \
-		-l my-publish.el index.org \
-		--eval '(blog-setup-project-alist "$(BLOGDIR)")' \
-		--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/*