From 3072e0b2e868f563079602dd029a7d1f7ad975cc Mon Sep 17 00:00:00 2001 From: Joseph Coffland Date: Fri, 13 Jan 2017 17:22:36 -0800 Subject: [PATCH] Version change, Makefile improvements --- Makefile | 18 +++++++++--------- package.json | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index 762fc56..c5a7683 100644 --- 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 162db98..55c598f 100644 --- 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+", -- 2.27.0