- Makefiles now respect external CFLAGS and LDFLAGS. Closes ticket #2

This commit is contained in:
Paul Bakker 2011-01-30 17:10:13 +00:00
parent cdf07e9979
commit 46eb13828e
3 changed files with 7 additions and 7 deletions

View File

@ -1,7 +1,7 @@
# Also see "include/polarssl/config.h" # Also see "include/polarssl/config.h"
CFLAGS = -I../include -D_FILE_OFFSET_BITS=64 -Wall -W -Wdeclaration-after-statement CFLAGS += -I../include -D_FILE_OFFSET_BITS=64 -Wall -W -Wdeclaration-after-statement
OFLAGS = -O OFLAGS = -O
# MicroBlaze specific options: # MicroBlaze specific options:
@ -46,11 +46,11 @@ libpolarssl.a: $(OBJS)
libpolarssl.so: libpolarssl.a libpolarssl.so: libpolarssl.a
echo " LD $@" echo " LD $@"
$(CC) -shared -Wl,-soname,$@ -o $@ $(OBJS) $(CC) ${LDFLAGS} -shared -Wl,-soname,$@ -o $@ $(OBJS)
libpolarssl.dylib: libpolarssl.a libpolarssl.dylib: libpolarssl.a
echo " LD $@" echo " LD $@"
$(CC) -dynamiclib -o $@ $(OBJS) $(CC) ${LDFLAGS} -dynamiclib -o $@ $(OBJS)
.c.o: .c.o:
echo " CC $<" echo " CC $<"

View File

@ -3,9 +3,9 @@
# To compile on MinGW: add "-lws2_32" to LDFLAGS # To compile on MinGW: add "-lws2_32" to LDFLAGS
# To compile with PKCS11: add "-lpkcs11-helper" to LDFLAGS # To compile with PKCS11: add "-lpkcs11-helper" to LDFLAGS
CFLAGS = -I../include -D_FILE_OFFSET_BITS=64 -Wall -W -Wdeclaration-after-statement CFLAGS += -I../include -D_FILE_OFFSET_BITS=64 -Wall -W -Wdeclaration-after-statement
OFLAGS = -O OFLAGS = -O
LDFLAGS = -L../library -lpolarssl LDFLAGS += -L../library -lpolarssl
APPS = aes/aescrypt2 aes/crypt_and_hash \ APPS = aes/aescrypt2 aes/crypt_and_hash \
hash/hello hash/generic_sum \ hash/hello hash/generic_sum \

View File

@ -3,11 +3,11 @@
# To compile on MinGW: add "-lws2_32" to LDFLAGS # To compile on MinGW: add "-lws2_32" to LDFLAGS
# To compile with PKCS11: add "-lpkcs11-helper" to LDFLAGS # To compile with PKCS11: add "-lpkcs11-helper" to LDFLAGS
CFLAGS = -I../include -D_FILE_OFFSET_BITS=64 -Wall -W -Wdeclaration-after-statement \ CFLAGS += -I../include -D_FILE_OFFSET_BITS=64 -Wall -W -Wdeclaration-after-statement \
-Wno-unused-function -Wno-unused-value -Wno-unused-function -Wno-unused-value
OFLAGS = -O OFLAGS = -O
LDFLAGS = -L../library -lpolarssl LDFLAGS += -L../library -lpolarssl
APPS = test_suite_aes test_suite_arc4 \ APPS = test_suite_aes test_suite_arc4 \
test_suite_base64 test_suite_camellia \ test_suite_base64 test_suite_camellia \