From 4a18b132193f83b1bc3685ba6e5c0f3bb996ff5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?=
 <skjnldsv@protonmail.com>
Date: Fri, 10 Jul 2020 17:58:48 +0200
Subject: [PATCH] Fix makefile
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
---
 .gitignore |  3 ++-
 Makefile   | 11 ++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1e844fd7..167684d4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,4 +19,5 @@ build/
 coverage*
 vendor/
 
-/.php_cs.cache
+.php_cs.cache
+composer.phar
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 1bb15ca4..40c19329 100644
--- a/Makefile
+++ b/Makefile
@@ -9,13 +9,10 @@ source_package_name=$(source_build_directory)/$(app_name)
 appstore_build_directory=$(CURDIR)/build/artifacts/appstore
 appstore_package_name=$(appstore_build_directory)/$(app_name)
 
-all: dev-setup lint build-js-production test-php
+all: dev-setup lint build-js-production install-composer-deps-dev test-php
 
 # Dev env management
-dev-setup: clean clean-dev npm-init
-
-npm-init:
-	npm ci
+dev-setup: clean clean-dev install-npm-deps-dev
 
 npm-update:
 	npm update
@@ -25,6 +22,9 @@ composer.phar:
 
 install-deps: install-composer-deps-dev install-npm-deps-dev
 
+install-npm-deps-dev:
+	npm ci
+
 install-composer-deps: composer.phar
 	php composer.phar install --no-dev -o
 
@@ -79,6 +79,7 @@ clean:
 
 clean-dev:
 	rm -rf node_modules
+	rm -rf vendor
 
 # Builds the source package for the app store, ignores php and js tests
 appstore: