Previously, we would delete our python version before we cleaned up the apps, so they couldn't successfully run `./build/env/bin/python setup.py clean`.
@@ -225,12 +225,13 @@ locales:
.PHONY: clean
clean:
- @rm -rf $(BLD_DIR_ENV)
@$(MAKE) -C desktop clean
@$(MAKE) -C apps clean
# <<<< DEV ONLY
@$(MAKE) -C docs clean
# END DEV ONLY >>>>
+ @rm -rf $(BLD_DIR_ENV)
+ @rm -rf $(STATIC_DIR)
#
# Note: It is important for clean targets to *ONLY* clean products of the
@@ -239,9 +240,9 @@ clean:
.PHONY: distclean
distclean: clean
@# Remove the other directories in build/
- @rm -rf $(BLD_DIR)
@$(MAKE) -C desktop distclean
@$(MAKE) -C apps distclean
+ @rm -rf $(BLD_DIR)
.PHONY: ext-clean
ext-clean:
@@ -62,6 +62,8 @@ BLD_DIR_BIN := $(BLD_DIR_ENV)/bin
THIRDPARTY_DIR := $(ROOT)/ext/thirdparty
THIRDPARTY_JS_DIR := $(THIRDPARTY_DIR)/js
+STATIC_DIR := $(BLD_DIR)/static
+
##############################
# ENV_PYTHON is the Python installed in the virtual environment. App
# installation should always use the ENV_PYTHON.