From 8bd468ef31406da0b1dd89309ef5c783fc88b879 Mon Sep 17 00:00:00 2001 From: heck Date: Fri, 8 Jan 2021 23:13:21 +0100 Subject: [PATCH] make clean and clean-all (kill all unversioned files) --- gen/Makefile | 11 +++++------ gen/examples/ext/synth_shed/Makefile | 9 ++++++--- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/gen/Makefile b/gen/Makefile index bfb3cda..f78e404 100644 --- a/gen/Makefile +++ b/gen/Makefile @@ -4,6 +4,8 @@ DIST_DIR = ./dist PYTHON_ARTIFACTS += ./.eggs PYTHON_ARTIFACTS += ./pEpACIDgen.egg-info PYTHON_ARTIFACTS += ./.pytest_cache +PYTHON_ARTIFACTS += ./pEpACIDgen/__pycache__ +PYTHON_ARTIFACTS += ./tests/__pycache__ .PHONY: all build dist dist-egg dist-whl install install-user install-test venv envtest test develop clean clean-all @@ -48,10 +50,6 @@ venv: python3 -m venv $(VENV_DIR) bash --rcfile $(VENV_DIR)/bin/activate -# Tests if the current environment is able to load the pEp module -envtest: - python3 -c 'import pEpACIDgen' - # Test # ==== # Use these targets only in venv created with 'make venv' @@ -62,19 +60,20 @@ install-test: test: pytest - # Development develop: pip install -e . - # Housekeeping # ============ clean-all: clean rm -rf $(VENV_DIR) clean: + make -C examples/lib/lib_synth_shed/ clean + make -C examples/lib/lib_test/ clean + make -C examples/ext/synth_shed/ clean rm -rf $(BUILD_DIR) rm -rf $(DIST_DIR) rm -rf $(PYTHON_ARTIFACTS) diff --git a/gen/examples/ext/synth_shed/Makefile b/gen/examples/ext/synth_shed/Makefile index ac0b67d..bb0bc83 100644 --- a/gen/examples/ext/synth_shed/Makefile +++ b/gen/examples/ext/synth_shed/Makefile @@ -1,7 +1,10 @@ include Makefile.conf -TARGET_MODULE_DYN=synth_shed.so -TARGET_MODULE_STATIC=synth_shed.so +TARGET=synth_shed.so + +TARGET_MODULE_DYN=$(TARGET) +TARGET_MODULE_STATIC=$(TARGET) + CXX=clang CXXFLAGS+=-std=c++11 -g @@ -37,5 +40,5 @@ $(TARGET_MODULE_STATIC) : $(OBJS) $(LIBS_STATIC) clean: $(MAKE) -C gen clean - rm -f $(TARGET_MODULE) + rm -f $(TARGET) rm -f $(OBJS)