From edb42c50f8f3b8f39fecff350feb70b1cbce2a79 Mon Sep 17 00:00:00 2001
From: Emily Eisenberg <emily@khanacademy.org>
Date: Fri, 5 Sep 2014 13:24:31 -0700
Subject: [PATCH] Clean up the Makefile, package.json

Make the makefile more sane, add minification of CSS, and add and remove
necessary npm modules.

Auditors: alpert
---
 Makefile     | 19 +++++++++++++------
 package.json |  4 ++--
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index 21003aee9..f47544fc8 100644
--- a/Makefile
+++ b/Makefile
@@ -1,22 +1,29 @@
 .PHONY: build setup copy serve clean metrics
-build: setup build/katex.js build/katex.less.css
+build: setup build/katex.min.js build/katex.min.css compress
 
 setup:
 	npm install
 
-compress: build/katex.min.js
-	@printf "Minified, gzipped size: "
-	@gzip -c $^ | wc -c
-
 build/katex.js: katex.js $(wildcard *.js)
 	./node_modules/.bin/browserify $< --standalone katex > $@
 
 build/katex.min.js: build/katex.js
-	uglifyjs --mangle < $< > $@
+	./node_modules/.bin/uglifyjs --mangle < $< > $@
 
 build/katex.less.css: static/katex.less
 	./node_modules/.bin/lessc $< > $@
 
+build/katex.min.css: build/katex.less.css
+	./node_modules/.bin/cleancss -o $@ $<
+
+compress: build/katex.min.js build/katex.min.css
+	@$(eval JSSIZE!=gzip -c build/katex.min.js | wc -c)
+	@$(eval CSSSIZE!=gzip -c build/katex.min.css | wc -c)
+	@$(eval TOTAL!=echo ${JSSIZE}+${CSSSIZE} | bc)
+	@printf "Minified, gzipped js:  %6d\n" "${JSSIZE}"
+	@printf "Minified, gzipped css: %6d\n" "${CSSSIZE}"
+	@printf "Total:                 %6d\n" "${TOTAL}"
+
 serve:
 	node server.js
 
diff --git a/package.json b/package.json
index 6d67f361e..96e2aa0f2 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,7 @@
         "browserify": "~2.29.1",
         "express": "~3.3.3",
         "less": "~1.4.2",
-        "through": "~2.3.4",
-        "gm": "~1.14.2"
+        "uglify-js": "~2.4.15",
+        "clean-css": "~2.2.15"
     }
 }