diff options
| author | Roeland Jago Douma <roeland@famdouma.nl> | 2019-02-24 20:20:12 +0100 |
|---|---|---|
| committer | Roeland Jago Douma <roeland@famdouma.nl> | 2019-02-24 20:20:12 +0100 |
| commit | be542d3f5378239741950bf0bc90c4a42d030f14 (patch) | |
| tree | 717f178730bc8ac74050ba180003922dd162bd9b | |
| parent | bc120bc5d7b8026240bda1a518af6533d97c2eb2 (diff) | |
| download | nextcloud-server-be542d3f5378239741950bf0bc90c4a42d030f14.tar.gz nextcloud-server-be542d3f5378239741950bf0bc90c4a42d030f14.zip | |
Makefile to root folder
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| -rw-r--r-- | Makefile (renamed from settings/Makefile) | 6 | ||||
| -rw-r--r-- | README.md | 5 |
2 files changed, 2 insertions, 9 deletions
diff --git a/settings/Makefile b/Makefile index 666e99f1e06..7e6b37af669 100644 --- a/settings/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ all: dev-setup build-js-production -dev-setup: clean clean-dev npm-init +dev-setup: clean-dev npm-init npm-init: npm install @@ -17,10 +17,6 @@ build-js-production: watch-js: npm run watch -clean: - rm -f js/vue-*.js - rm -f js/vue-*.js.map - clean-dev: rm -rf node_modules diff --git a/README.md b/README.md index 1ddfd2facb7..a18323756e0 100644 --- 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!** |