From 14021db239b5acdf6bc77a7fb9d0c1e22dc61615 Mon Sep 17 00:00:00 2001
From: Matt Weiden <538456+mweiden@users.noreply.github.com>
Date: Thu, 9 Apr 2020 17:35:49 -0700
Subject: [PATCH] Clean up main Makefile (#1376)

* Remove unnecessary make target alias

* Remove installing from build directory

* Update documentation
---
 Makefile                         | 15 ++-------------
 dev_docs/developer_guidelines.md |  2 +-
 dev_docs/developer_scripts.md    |  8 +++-----
 3 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/Makefile b/Makefile
index a7df57a8..df2d8621 100644
--- a/Makefile
+++ b/Makefile
@@ -22,16 +22,12 @@ clean-%:
 
 # BUILDING PACKAGE
 
-.PHONY: build
-build: clean build-cli
-	@echo "done"
-
 .PHONY: build-client
 build-client:
 	cd client && $(MAKE) ci build
 
-.PHONY: build-cli
-build-cli: build-client
+.PHONY: build
+build: clean build-client
 	git ls-files server/ | grep -v 'server/test/' | cpio -pdm $(BUILDDIR)
 	cp -r client/build/  $(CLIENTBUILD)
 	$(call copy_client_assets,$(CLIENTBUILD),$(SERVERBUILD))
@@ -150,13 +146,6 @@ gen-package-lock:
 
 # INSTALL
 
-# setup.py sucks when you have your library in a separate folder, adding these in to help setup envs
-
-# install from build directory
-.PHONY: install
-install: uninstall
-	cd $(BUILDDIR) && pip install -e .
-
 # install from source tree for development
 .PHONY: install-dev
 install-dev: uninstall
diff --git a/dev_docs/developer_guidelines.md b/dev_docs/developer_guidelines.md
index becc222e..f6a9a50c 100644
--- a/dev_docs/developer_guidelines.md
+++ b/dev_docs/developer_guidelines.md
@@ -99,6 +99,6 @@ If you would like to run the client tests individually, follow the steps below i
 1. For the smoke test run `npm run smoke-test` or `make smoke-test`
 
 ### Tips
-* You can also install/launch the server side code from npm scrips (requires python3.6 with virtualenv) in `client/` directory run `npm run backend-dev`
+* You can also install/launch the server side code from npm scrips (requires python3.6 with virtualenv) with the `scripts/backend_dev` script.
 
 
diff --git a/dev_docs/developer_scripts.md b/dev_docs/developer_scripts.md
index fbb2ddd0..53496f50 100644
--- a/dev_docs/developer_scripts.md
+++ b/dev_docs/developer_scripts.md
@@ -9,10 +9,9 @@ Documentation for the `Makefile` targets in the project root directory.
 builds source code
 
 ```
-build - builds whole app client and server
-build-cli - makes build dir and moves python and client files
-build-client - runs webpack build
-build-for-server-dev - builds client and copies output directly into source tree (only for server devlopment)
+build - builds the whole app (client/ source and server/ source packaged together)
+build-client - runs the client webpack build
+build-for-server-dev - builds client and copies output directly into the server source tree (only for server devlopment)
 ```
 
 ### Clean commands
@@ -50,7 +49,6 @@ dev-env - installs requirements and requirments-dev (for building code)
 Installs cellxgene from different locations
 
 ```
-install - installs from local build directory
 install-dev - installs from local source tree
 install-release-test - installs from test pypi
 install-release - installs from pypi