Makefile to root folder

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

diff --git a/Makefile b/Makefile
new file mode 100644 (file)
index 0000000..7e6b37a
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,22 @@
+all: dev-setup build-js-production
+
+dev-setup: clean-dev npm-init
+
+npm-init:
+       npm install
+
+npm-update:
+       npm update
+
+build-js:
+       npm run dev
+
+build-js-production:
+       npm run build
+
+watch-js:
+       npm run watch
+
+clean-dev:
+       rm -rf node_modules
+

diff --git a/README.md b/README.md
index 1ddfd2facb748efd06018243af449a4bbcfe2221..a18323756e068bc1c28cade64b541b2841411896 100644 (file)
--- a/README.md
+++ b/README.md
@@ -61,7 +61,7 @@ Otherwise, git checkouts can be handled the same as release archives, by using t
 
 ### Building front-end code 🏗
 
-We move more and more towards using Vue.js in the frontend, starting with Settings. For building the code on changes, use these terminal commands in the `settings` subfolder:
+We move more and more towards using Vue.js in the frontend, starting with Settings. For building the code on changes, use these terminal commands in the root folder:
 
 ``` bash
 # install dependencies
@@ -75,9 +75,6 @@ make watch-js
 
 # build for production with minification
 make build-js-production
-
-# clean output files
-make clean
 ```
 
 **When making changes, also commit the compiled files!**

diff --git a/settings/Makefile b/settings/Makefile
deleted file mode 100644 (file)
index 666e99f..0000000
--- a/settings/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-all: dev-setup build-js-production
-
-dev-setup: clean clean-dev npm-init
-
-npm-init:
-       npm install
-
-npm-update:
-       npm update
-
-build-js:
-       npm run dev
-
-build-js-production:
-       npm run build
-
-watch-js:
-       npm run watch
-
-clean:
-       rm -f js/vue-*.js
-       rm -f js/vue-*.js.map
-
-clean-dev:
-       rm -rf node_modules
-