diff options
| author | StevenWdV <stevenwdv@gmail.com> | 2022-02-09 00:40:38 +0100 |
|---|---|---|
| committer | StevenWdV <stevenwdv@gmail.com> | 2022-02-09 00:40:38 +0100 |
| commit | 2aad9b6ae61337ef94b05adc377a9ad2cbaa8eb8 (patch) | |
| tree | 022c006cfac7a60fd0ab8896fac3991cf34b8fce /exports/common.mk | |
| parent | b60ecf2fe5ddfe506e02093286b3931873187e91 (diff) | |
Add Android wrapper, remove plain Java Maven wrapper.
Fix some overrides in Makefiles.
Diffstat (limited to 'exports/common.mk')
| -rw-r--r-- | exports/common.mk | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/exports/common.mk b/exports/common.mk index f2757c2..bc5a3d6 100644 --- a/exports/common.mk +++ b/exports/common.mk @@ -23,7 +23,7 @@ LIB_NAME ?= eduvpn_common # Library file name LIB_FILE ?= $(LIB_PREFIX)$(LIB_NAME)$(LIB_SUFFIX) -# Get exports/ directory when included from a wrapper +# Get relative exports/ directory when included from a wrapper EXPORTS_PATH = $(dir $(lastword $(MAKEFILE_LIST))) # Remove trailing slash EXPORTS_PATH := $(EXPORTS_PATH:/=) @@ -38,7 +38,9 @@ else export LD_LIBRARY_PATH := $(abspath $(EXPORTS_LIB_SUBFOLDER_PATH)):$(LD_LIBRARY_PATH) endif -.try_build_lib: +.try-build-lib: ifneq ($(wildcard $(EXPORTS_PATH)/Makefile),) $(MAKE) -C $(EXPORTS_PATH) +else +$(info Skipping building library as exports/Makefile was not found) endif |