Use thin archives to allow libraries to be merged

[libeap.git] / eap_example / Makefile

diff --git a/eap_example/Makefile b/eap_example/Makefile
index c3e3256..ec26bc8 100644 (file)
--- a/eap_example/Makefile
+++ b/eap_example/Makefile
@@ -6,6 +6,10 @@ ifndef CC
 CC=gcc
 endif
 
+ifndef RANLIB
+RANLIB=ranlib
+endif
+
 ifndef CFLAGS
 CFLAGS = -MMD -O2 -Wall -g
 endif
@@ -13,34 +17,39 @@ endif
 CONFIG_TLS=openssl
 #CONFIG_TLS=internal
 #CONFIG_INTERNAL_LIBTOMMATH=y
+#CONFIG_TLS=gnutls
 
 
 CFLAGS += -I.
 CFLAGS += -I../src
-CFLAGS += -I../src/crypto
 CFLAGS += -I../src/utils
-CFLAGS += -I../src/common
-
-# at least for now, need to include config_ssid.h and config_blob.h from
-# wpa_supplicant directory
-CFLAGS += -I../wpa_supplicant
 
 
-OBJS_both += ../src/utils/common.o
-OBJS_both += ../src/utils/os_unix.o
-OBJS_both += ../src/utils/wpa_debug.o
-OBJS_both += ../src/utils/base64.o
-OBJS_both += ../src/utils/wpabuf.o
-OBJS_both += ../src/crypto/md5.o
-OBJS_both += ../src/crypto/rc4.o
-OBJS_both += ../src/crypto/md4.o
+OBJS_both += ../src/utils/libutils.a
 OBJS_both += ../src/crypto/sha1.o
-OBJS_both += ../src/crypto/des.o
-OBJS_both += ../src/crypto/aes_wrap.o
-OBJS_both += ../src/crypto/aes.o
+OBJS_both += ../src/crypto/sha1-tlsprf.o
+OBJS_both += ../src/crypto/aes-cbc.o
+OBJS_both += ../src/crypto/aes-ctr.o
+OBJS_both += ../src/crypto/aes-eax.o
+OBJS_both += ../src/crypto/aes-encblock.o
+OBJS_both += ../src/crypto/aes-omac1.o
+OBJS_both += ../src/crypto/aes-unwrap.o
+OBJS_both += ../src/crypto/aes-wrap.o
 OBJS_both += ../src/crypto/ms_funcs.o
-OBJS_both += ../src/crypto/sha256.o
 
+ifeq ($(CONFIG_TLS), internal)
+OBJS_both += ../src/crypto/rc4.o
+OBJS_both += ../src/crypto/md4-internal.o
+OBJS_both += ../src/crypto/sha1-internal.o
+OBJS_both += ../src/crypto/des-internal.o
+OBJS_both += ../src/crypto/aes-internal.o ../src/crypto/aes-internal-dec.o ../src/crypto/aes-internal-enc.o
+endif
+ifeq ($(CONFIG_TLS), gnutls)
+OBJS_both += ../src/crypto/rc4.o
+endif
+SHA256OBJS = ../src/crypto/sha256.o
+
+MD5OBJS = ../src/crypto/md5.o
 
 OBJS_both += ../src/eap_common/eap_peap_common.o
 OBJS_both += ../src/eap_common/eap_psk_common.o
@@ -79,8 +88,8 @@ CFLAGS += -DEAP_PSK
 CFLAGS += -DEAP_PAX
 CFLAGS += -DEAP_SAKE
 CFLAGS += -DEAP_GPSK -DEAP_GPSK_SHA256
-CFLAGS += -DEAP_TLS_FUNCS
 
+CFLAGS += -DEAP_SERVER_IDENTITY
 CFLAGS += -DEAP_SERVER_TLS
 CFLAGS += -DEAP_SERVER_PEAP
 CFLAGS += -DEAP_SERVER_TTLS
@@ -95,11 +104,16 @@ CFLAGS += -DEAP_SERVER_GPSK -DEAP_SERVER_GPSK_SHA256
 CFLAGS += -DIEEE8021X_EAPOL
 
 ifeq ($(CONFIG_TLS), openssl)
-CFLAGS += -DEAP_TLS_OPENSSL
 OBJS_both += ../src/crypto/tls_openssl.o
 OBJS_both += ../src/crypto/crypto_openssl.o
 LIBS += -lssl -lcrypto
-CFLAGS += -DINTERNAL_SHA256
+endif
+
+ifeq ($(CONFIG_TLS), gnutls)
+OBJS_both += ../src/crypto/tls_gnutls.o
+OBJS_both += ../src/crypto/crypto_gnutls.o
+LIBS += -lgnutls -lgcrypt
+CONFIG_INTERNAL_SHA256=y
 endif
 
 ifeq ($(CONFIG_TLS), internal)
@@ -108,6 +122,9 @@ OBJS_both += ../src/tls/tlsv1_common.o ../src/tls/tlsv1_record.o
 OBJS_both += ../src/tls/tlsv1_cred.o
 OBJS_both += ../src/tls/asn1.o ../src/tls/x509v3.o
 OBJS_both += ../src/crypto/crypto_internal.o ../src/tls/rsa.o ../src/tls/bignum.o
+OBJS_both += ../src/tls/pkcs1.o
+OBJS_both += ../src/tls/pkcs5.o
+OBJS_both += ../src/tls/pkcs8.o
 
 OBJS_peer += ../src/tls/tlsv1_client.o
 OBJS_peer += ../src/tls/tlsv1_client_write.o ../src/tls/tlsv1_client_read.o
@@ -120,12 +137,8 @@ CFLAGS += -DCONFIG_TLS_INTERNAL_SERVER
 CFLAGS += -DCONFIG_TLS_INTERNAL
 CFLAGS += -DCONFIG_CRYPTO_INTERNAL
 CFLAGS += -DCONFIG_INTERNAL_X509
-CFLAGS += -DINTERNAL_AES
-CFLAGS += -DINTERNAL_SHA1
-CFLAGS += -DINTERNAL_SHA256
-CFLAGS += -DINTERNAL_MD5
-CFLAGS += -DINTERNAL_MD4
-CFLAGS += -DINTERNAL_DES
+CONFIG_INTERNAL_SHA256=y
+MD5OBJS += ../src/crypto/md5-internal.o
 ifdef CONFIG_INTERNAL_LIBTOMMATH
 CFLAGS += -DCONFIG_INTERNAL_LIBTOMMATH
 else
@@ -134,6 +147,12 @@ endif
 endif
 
 
+ifdef CONFIG_INTERNAL_SHA256
+SHA256OBJS += ../src/crypto/sha256-internal.o
+endif
+
+OBJS_both += $(SHA256OBJS) $(MD5OBJS)
+
 
 # Optional components to add EAP server support
 OBJS_server += ../src/eap_server/eap_tls.o
@@ -157,16 +176,32 @@ ifndef LDO
 LDO=$(CC)
 endif
 
+Q=@
+E=echo
+ifeq ($(V), 1)
+Q=
+E=true
+endif
+
+%.o: %.c
+       $(Q)$(CC) -c -o $@ $(CFLAGS) $<
+       @$(E) "  CC " $<
+
 
 OBJS_lib=$(OBJS_both) $(OBJS_peer) $(OBJS_server)
 
 OBJS_ex = eap_example.o eap_example_peer.o eap_example_server.o
 
+
+../src/utils/libutils.a:
+       $(MAKE) -C ../src/utils
+
+
 ifneq ($(CONFIG_SOLIB), yes)
 LIBEAP = libeap.a
 libeap.a: $(OBJS_lib)
-       ar rc libeap.a $(OBJS_lib)
-       ranlib libeap.a
+       $(AR) crT libeap.a $(OBJS_lib)
+       $(RANLIB) libeap.a
 
 else
 CFLAGS  += -fPIC -DPIC