From aacf7716ce93f4b88dee248b54172396d9bab298 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Thu, 25 May 2017 15:18:03 +0200 Subject: [PATCH] Cleanup makefiles MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- Makefile | 6 +++--- js/Makefile | 10 ---------- 2 files changed, 3 insertions(+), 13 deletions(-) delete mode 100644 js/Makefile diff --git a/Makefile b/Makefile index 82a92837a..cc7768876 100644 --- a/Makefile +++ b/Makefile @@ -27,11 +27,11 @@ install-deps: build: build-js -build-js: - $(MAKE) -C js build +build-js: install-deps + cd js && ./node_modules/.bin/grunt build watch: - $(make) -C js watch + cd js && ./node_modules/.bin/grunt watch # appstore: clean install-deps appstore: clean-build build diff --git a/js/Makefile b/js/Makefile deleted file mode 100644 index 520ccc77b..000000000 --- a/js/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -build: - ./node_modules/.bin/grunt build - -watch: - ./node_modules/.bin/grunt watch - -install: - npm install - ./node_modules/.bin/bower install -