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.

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

(limited to 'exports/Makefile')

diff --git a/exports/Makefile b/exports/Makefile
index cfb9604..3dcf2f0 100644
--- a/exports/Makefile
+++ b/exports/Makefile
@@ -1,14 +1,17 @@
-.PHONY: build copy-to clean
+.PHONY: build clean
 
 include common.mk
 
 ifeq ($(LIB_SUFFIX),.so)
 # Add SONAME as cgo does not currently do this. Mostly for Android, see https://stackoverflow.com/a/48291044
-export CGO_LDFLAGS := $(CGO_LDFLAGS) -Wl,-soname,$(LIB_FILE)
+export override CGO_LDFLAGS += -Wl,-soname,$(LIB_FILE)
 endif
 
 # Creates targets like 'lib/linux/amd64/libeduvpn_common.so'
 build: lib/$(GOOS)/$(GOARCH)/$(LIB_FILE)
+ifdef COPY_LIB_TO
+	install $< -Dt $(COPY_LIB_TO)
+endif
 
 # Build shared library and remove lib prefix (if any) from header name
 # GOOS and GOARCH envvars are set by common.mk
-- 
cgit v1.2.3