Update Makefiles and revert changes to config.pl

-Add comments to Makefiles about test env auto-detection
-Fix indentation
-Remove parent folder from include dirs
-Do not use environment variable for defining config file because
 env variable usage is not fully implemented
-Revert changes to config.pl
This commit is contained in:
Arto Kinnunen 2019-09-26 10:33:56 +03:00
parent 5e639ed026
commit c0d2fa7f0b
6 changed files with 29 additions and 42 deletions

View file

@ -15,13 +15,11 @@ ifneq "$(wildcard $(DIR_FOR_MBED_TLS_ENV) )" ""
INCLUDE_DIR=-I../include
else
LIBRARY_DIR=../src
INCLUDE_DIR=-I.. -I../inc
INCLUDE_DIR=-I../inc
CFLAGS += "-DMBEDTLS_CONFIG_FILE=\"mbedtls/test_config.h\""
endif
LOCAL_CFLAGS = $(WARNING_CFLAGS) $(INCLUDE_DIR) -D_FILE_OFFSET_BITS=64
ifdef MBEDTLS_CONFIG_FILE
LOCAL_CFLAGS += "-DMBEDTLS_CONFIG_FILE=\"${MBEDTLS_CONFIG_FILE}\""
endif
LOCAL_CXXFLAGS = $(WARNING_CXXFLAGS) $(INCLUDE_DIR) -D_FILE_OFFSET_BITS=64
LOCAL_LDFLAGS = -L$(LIBRARY_DIR) \