X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;ds=sidebyside;f=Makefile;h=b6ef862543b3a17f1bf6144c6eda6673ab12071c;hb=8cd3d8902baade6c093b52913b68fd9149861c43;hp=c2a4638260adaedebbcada82de46d42034a905c1;hpb=b64a35c35d21c7c0687b10c109de1e378addb515;p=blog.git

diff --git a/Makefile b/Makefile
index c2a4638..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
-#	rm -rf ~/.org-timestamps
-#$(OBJS): $(CSS) my-publish.el
-# remove the timestamp file to force publish all files
-$(OBJS): $(OUTDIR)/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/*