X-Git-Url: https://jasonwoof.com/gitweb/?p=hexbog.git;a=blobdiff_plain;f=Makefile;h=9807ae8495c506984c1cca0052dc9d4fe8e53c44;hp=3c4d9723895df1353d2c3b36aefe6be36ca9fb64;hb=5c9ec279c15c135b7e84501a5b2426e8f06fde60;hpb=c5ea138fb8cfce9977ce486c9fbceedebe8af2c4

diff --git a/Makefile b/Makefile
index 3c4d972..9807ae8 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,7 @@
-all: index.html
+all: index.html index.html.gz
+
+install: all
+	cp index.html index.html.gz favicon.ico appfog/hexbog.jasonwoof.com/
 
 wordlist_compressed.js: compress.coffee wordlist.txt
 	coffee compress.coffee
@@ -6,14 +9,21 @@ wordlist_compressed.js: compress.coffee wordlist.txt
 main.js: main.coffee
 	coffee -bc main.coffee
 
-all_min.js: wordlist_compressed.js main.js
-	cat /usr/share/javascript/jquery/jquery.min.js main.js wordlist_compressed.js | uglifyjs -nc -o all_min.js
+main_min.js: wordlist_compressed.js main.js
+	cat /usr/share/javascript/jquery/jquery.min.js main.js | uglifyjs -nc -o $@
+
+wordlist_min.js: wordlist_compressed.js main.js
+	cat wordlist_compressed.js | uglifyjs -nc -o $@
 
-index.html: all_min.js main.html
-	(head -n -2 main.html; echo '<script>'; cat all_min.js; echo '</script>'; tail -n 2 main.html) > index.html
+style.css: style.less
+	lessc style.less style.css
+
+index.html: main_min.js wordlist_min.js main.html style.css
+	bash combine.bash main.html > $@ || (rm -f $@; exit 1)
 
 index.html.gz: index.html
 	gzip --best -c $< > $@
 
+
 clean:
-	rm -f main.js all_min.js wordlist_compressed.js index.html
+	rm -f main.js main_min.js wordlist_compressed.js wordlist_min.js style.css index.html index.html.gz