From d25eb98272e311b3ee22fb14b5256832044618f4 Mon Sep 17 00:00:00 2001
From: Christopher Young <cyoung@gmail.com>
Date: Mon, 15 Feb 2016 12:35:37 -0500
Subject: [PATCH] Move www portion of Makefile to web/ dir.

---
 Makefile     | 33 +--------------------------------
 web/Makefile | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 32 deletions(-)
 create mode 100644 web/Makefile

diff --git a/Makefile b/Makefile
index dfc0862e..4c5fd059 100644
--- a/Makefile
+++ b/Makefile
@@ -33,38 +33,7 @@ test:
 	make -C test	
 
 www:
-	mkdir -p /var/www
-	mkdir -p /var/www/css
-	cp web/css/*.css /var/www/css
-	mkdir -p /var/www/js
-	cp web/js/main.js /var/www/js
-	cp web/js/addtohomescreen.min.js /var/www/js
-	cp web/js/j3di-all.min.js /var/www/js
-	mkdir -p /var/www/img
-	cp web/img/logo*.png /var/www/img
-	cp web/img/screen*.png /var/www/img
-	cp web/img/world.png /var/www/img
-	mkdir -p /var/www/maui
-	mkdir -p /var/www/maui/js
-	cp web/maui/js/angular-ui-router.min.js /var/www/maui/js
-	cp web/maui/js/mobile-angular-ui.min.js /var/www/maui/js
-	cp web/maui/js/angular.min.js /var/www/maui/js
-	cp web/maui/js/mobile-angular-ui.gestures.min.js /var/www/maui/js
-	cp web/maui/js/mobile-angular-ui.core.min.js /var/www/maui/js
-	mkdir -p /var/www/maui/css
-	cp web/maui/css/mobile-angular-ui-hover.min.css /var/www/maui/css
-	cp web/maui/css/mobile-angular-ui-desktop.min.css /var/www/maui/css
-	cp web/maui/css/mobile-angular-ui-base.min.css /var/www/maui/css
-	mkdir -p /var/www/maui/fonts
-	cp web/maui/fonts/fontawesome-webfont.woff /var/www/maui/fonts
-	mkdir -p /var/www/plates
-	cp web/plates/*.html /var/www/plates
-	mkdir -p /var/www/plates/js
-	cp web/plates/js/*.js /var/www/plates/js
-	cp web/index.html /var/www
-	cp web/stratux.appcache /var/www
-	# Mark the manifest with the git hash.
-	echo "# Stratux build: " `git log -n 1 --pretty=%H` >>/var/www/stratux.appcache
+	cd web && make
 
 install:
 	cp -f gen_gdl90 /usr/bin/gen_gdl90
diff --git a/web/Makefile b/web/Makefile
new file mode 100644
index 00000000..2fe57de4
--- /dev/null
+++ b/web/Makefile
@@ -0,0 +1,33 @@
+all:
+	mkdir -p /var/www
+	mkdir -p /var/www/css
+	cp css/*.css /var/www/css
+	mkdir -p /var/www/js
+	cp js/main.js /var/www/js
+	cp js/addtohomescreen.min.js /var/www/js
+	cp js/j3di-all.min.js /var/www/js
+	mkdir -p /var/www/img
+	cp img/logo*.png /var/www/img
+	cp img/screen*.png /var/www/img
+	cp img/world.png /var/www/img
+	mkdir -p /var/www/maui
+	mkdir -p /var/www/maui/js
+	cp maui/js/angular-ui-router.min.js /var/www/maui/js
+	cp maui/js/mobile-angular-ui.min.js /var/www/maui/js
+	cp maui/js/angular.min.js /var/www/maui/js
+	cp maui/js/mobile-angular-ui.gestures.min.js /var/www/maui/js
+	cp maui/js/mobile-angular-ui.core.min.js /var/www/maui/js
+	mkdir -p /var/www/maui/css
+	cp maui/css/mobile-angular-ui-hover.min.css /var/www/maui/css
+	cp maui/css/mobile-angular-ui-desktop.min.css /var/www/maui/css
+	cp maui/css/mobile-angular-ui-base.min.css /var/www/maui/css
+	mkdir -p /var/www/maui/fonts
+	cp maui/fonts/fontawesome-webfont.woff /var/www/maui/fonts
+	mkdir -p /var/www/plates
+	cp plates/*.html /var/www/plates
+	mkdir -p /var/www/plates/js
+	cp plates/js/*.js /var/www/plates/js
+	cp index.html /var/www
+	cp stratux.appcache /var/www
+	# Mark the manifest with the git hash.
+	echo "# Stratux build: " `git log -n 1 --pretty=%H` >>/var/www/stratux.appcache
\ No newline at end of file