yuzu-emu/mbedtls
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Makefiles: move the dependencies block to be after DLEXT definition

Browse source 
Having it before them resulted in incomplete dependency names, always ending
with a period.
This commit is contained in:
Andrzej Kurek 2019-10-07 09:24:22 -04:00
parent 8af3923815
commit df2cd9e14f
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
programs/Makefile
View file

@ -23,12 +23,6 @@ include ../crypto/3rdparty/Makefile.inc
LOCAL_CFLAGS += $(patsubst -I../3rdparty/%, -I../crypto/3rdparty/%, $(THIRDPARTY_INCLUDES)) LOCAL_CFLAGS += $(patsubst -I../3rdparty/%, -I../crypto/3rdparty/%, $(THIRDPARTY_INCLUDES))
LOCAL_CFLAGS += $(patsubst -I../3rdparty/%, -I../crypto/3rdparty/%, $(THIRDPARTY_INCLUDES)) LOCAL_CFLAGS += $(patsubst -I../3rdparty/%, -I../crypto/3rdparty/%, $(THIRDPARTY_INCLUDES))
ifndef SHARED
DEP=../crypto/library/libmbedcrypto.a ../library/libmbedx509.a ../library/libmbedtls.a
else
DEP=../crypto/library/libmbedcrypto.$(DLEXT) ../library/libmbedx509.$(DLEXT) ../library/libmbedtls.$(DLEXT)
endif
ifdef DEBUG ifdef DEBUG
LOCAL_CFLAGS += -g3 LOCAL_CFLAGS += -g3
endif endif
@ -51,6 +45,12 @@ EXEXT=
SHARED_SUFFIX= SHARED_SUFFIX=
endif endif
ifndef SHARED
DEP=../crypto/library/libmbedcrypto.a ../library/libmbedx509.a ../library/libmbedtls.a
else
DEP=../crypto/library/libmbedcrypto.$(DLEXT) ../library/libmbedx509.$(DLEXT) ../library/libmbedtls.$(DLEXT)
endif
# Zlib shared library extensions: # Zlib shared library extensions:
ifdef ZLIB ifdef ZLIB
LOCAL_LDFLAGS += -lz LOCAL_LDFLAGS += -lz

12
tests/Makefile
View file

@ -25,12 +25,6 @@ LOCAL_CFLAGS += $(patsubst -I../3rdparty/%, -I../crypto/3rdparty/%, $(THIRDPARTY
# on non-POSIX platforms. # on non-POSIX platforms.
LOCAL_CFLAGS += -D_POSIX_C_SOURCE=200809L LOCAL_CFLAGS += -D_POSIX_C_SOURCE=200809L
ifndef SHARED
DEP=$(CRYPTO)libmbedcrypto.a ../library/libmbedx509.a ../library/libmbedtls.a
else
DEP=$(CRYPTO)libmbedcrypto.$(DLEXT) ../library/libmbedx509.$(DLEXT) ../library/libmbedtls.$(DLEXT)
endif
ifdef DEBUG ifdef DEBUG
LOCAL_CFLAGS += -g3 LOCAL_CFLAGS += -g3
endif endif
@ -56,6 +50,12 @@ SHARED_SUFFIX=
PYTHON ?= python2 PYTHON ?= python2
endif endif
ifndef SHARED
DEP=$(CRYPTO)libmbedcrypto.a ../library/libmbedx509.a ../library/libmbedtls.a
else
DEP=$(CRYPTO)libmbedcrypto.$(DLEXT) ../library/libmbedx509.$(DLEXT) ../library/libmbedtls.$(DLEXT)
endif
# Zlib shared library extensions: # Zlib shared library extensions:
ifdef ZLIB ifdef ZLIB
LOCAL_LDFLAGS += -lz LOCAL_LDFLAGS += -lz