Version change, Makefile improvements

diff --git a/Makefile b/Makefile
index 762fc568b36157197f856ee3adc5067afade714c..c5a7683e3305563f6fe8ec6bd043fb65d594578f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -6,16 +6,16 @@ STYLUS     := $(NODE_MODS)/stylus/bin/stylus
 AP         := $(NODE_MODS)/autoprefixer/autoprefixer
 BROWSERIFY := $(NODE_MODS)/browserify/bin/cmd.js
 
-TARGET    := build/http
-HTML      := index
-HTML      := $(patsubst %,$(TARGET)/%.html,$(HTML))
-CSS       := $(wildcard src/stylus/*.styl)
+TARGET     := build/http
+HTML       := index
+HTML       := $(patsubst %,$(TARGET)/%.html,$(HTML))
+CSS        := $(wildcard src/stylus/*.styl)
 CSS_ASSETS := build/css/style.css
-JS        := $(wildcard src/js/*.js)
-JS_ASSETS := $(TARGET)/js/assets.js
-STATIC    := $(shell find src/resources -type f)
-STATIC    := $(patsubst src/resources/%,$(TARGET)/%,$(STATIC))
-TEMPLS    := $(wildcard src/jade/templates/*.jade)
+JS         := $(wildcard src/js/*.js)
+JS_ASSETS  := $(TARGET)/js/assets.js
+STATIC     := $(shell find src/resources -type f)
+STATIC     := $(patsubst src/resources/%,$(TARGET)/%,$(STATIC))
+TEMPLS     := $(wildcard src/jade/templates/*.jade)
 
 RSYNC_EXCLUDE := \*.pyc __pycache__ \*.egg-info \\\#* \*~ .\\\#\*
 RSYNC_EXCLUDE := $(patsubst %,--exclude %,$(RSYNC_EXCLUDE))

diff --git a/package.json b/package.json
index 162db98d99c301483cfd0fe1c102892490e73a90..55c598ffffc4835d6d94c4ab52d0fce65e3a5c8a 100644 (file)
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "bbctrl",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "homepage": "https://github.com/buildbotics/rpi-firmware",
   "license": "GPL 3+",