Merge pull request #162 from nextcloud/build-cleanup

Cleanup makefiles
2017-05-28 10:56:49 +02:00
parent 314763acca aacf7716ce
commit 457b897135
2 changed files with 3 additions and 13 deletions
--- a/6
+++ b/6
@@ -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
--- a/js/Makefile
+++ b/js/Makefile
@@ -1,10 +0,0 @@
-build:
-	./node_modules/.bin/grunt build
-
-watch:
-	./node_modules/.bin/grunt watch
-
-install:
-	npm install
-	./node_modules/.bin/bower install
-