From 2aad9b6ae61337ef94b05adc377a9ad2cbaa8eb8 Mon Sep 17 00:00:00 2001
From: StevenWdV <stevenwdv@gmail.com>
Date: Wed, 9 Feb 2022 00:40:38 +0100
Subject: Add Android wrapper, remove plain Java Maven wrapper. Fix some
 overrides in Makefiles.

---
 wrappers/python/Makefile | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'wrappers/python/Makefile')

diff --git a/wrappers/python/Makefile b/wrappers/python/Makefile
index f46f06d..fd81cd9 100644
--- a/wrappers/python/Makefile
+++ b/wrappers/python/Makefile
@@ -4,17 +4,20 @@ EXPORTS_PATH ?= ../../exports
 include $(EXPORTS_PATH)/common.mk
 
 ifdef PLAT_NAME
-SETUP_ARGS += --plat-name=$(PLAT_NAME)
+override SETUP_ARGS += --plat-name=$(PLAT_NAME)
 endif
 
 # Build for current platform only
 pack:
 	./setup.py bdist_wheel $(SETUP_ARGS) --exports-lib-path="$(EXPORTS_LIB_PATH)"
 
-test: .try_build_lib
+test: .try-build-lib
 	install "$(EXPORTS_LIB_SUBFOLDER_PATH)/$(LIB_FILE)" -Dt "eduvpncommon/lib"
 	python3 -m unittest test_discovery
 	rm eduvpncommon/lib/*
 
 clean:
 	rm -rf build/ dist/ *.egg-info/ lib/*
+ifeq ($(CLEAN_ALL),1)
+	rm -rf venv/
+endif
-- 
cgit v1.2.3