Merge branch 'moonshot' of ssh://moonshot.suchdamage.org:822/srv/git/libeap into...

[libeap.git] / eap_example / Makefile

diff --git a/eap_example/Makefile b/eap_example/Makefile
index 398c4cb..4edfee1 100644 (file)
--- a/eap_example/Makefile
+++ b/eap_example/Makefile
@@ -2,55 +2,27 @@ ALL=eap_example
 
 all: $(ALL)
 
-ifndef CC
-CC=gcc
+
+CC=gcc -fPIC
+
+
+ifndef RANLIB
+RANLIB=ranlib
 endif
 
 ifndef CFLAGS
-CFLAGS = -MMD -O2 -Wall -g
+CFLAGS = -MMD -O2 -Wall -g -fPIC 
 endif
 
-CONFIG_TLS=openssl
-#CONFIG_TLS=internal
-#CONFIG_INTERNAL_LIBTOMMATH=y
-#CONFIG_TLS=gnutls
-
 
 CFLAGS += -I.
 CFLAGS += -I../src
 CFLAGS += -I../src/utils
 
-# 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/rc4.o
-OBJS_both += ../src/crypto/md4-internal.o
-OBJS_both += ../src/crypto/sha1.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
-
-ifeq ($(CONFIG_TLS), internal)
-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
-SHA256OBJS = ../src/crypto/sha256.o
 
-MD5OBJS = ../src/crypto/md5.o
+OBJS_both += ../src/utils/libutils.a
+OBJS_both += ../src/crypto/libcrypto.a
+OBJS_both += ../src/tls/libtls.a
 
 OBJS_both += ../src/eap_common/eap_peap_common.o
 OBJS_both += ../src/eap_common/eap_psk_common.o
@@ -104,70 +76,22 @@ CFLAGS += -DEAP_SERVER_GPSK -DEAP_SERVER_GPSK_SHA256
 
 CFLAGS += -DIEEE8021X_EAPOL
 
-ifeq ($(CONFIG_TLS), openssl)
-OBJS_both += ../src/crypto/tls_openssl.o
-OBJS_both += ../src/crypto/crypto_openssl.o
-LIBS += -lssl -lcrypto
-CONFIG_INTERNAL_SHA256=y
-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)
-OBJS_both += ../src/crypto/tls_internal.o
-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_peer += ../src/tls/tlsv1_client.o
-OBJS_peer += ../src/tls/tlsv1_client_write.o ../src/tls/tlsv1_client_read.o
-CFLAGS += -DCONFIG_TLS_INTERNAL_CLIENT
-
-OBJS_server += ../src/tls/tlsv1_server.o
-OBJS_server += ../src/tls/tlsv1_server_write.o ../src/tls/tlsv1_server_read.o
-CFLAGS += -DCONFIG_TLS_INTERNAL_SERVER
-
-CFLAGS += -DCONFIG_TLS_INTERNAL
-CFLAGS += -DCONFIG_CRYPTO_INTERNAL
-CFLAGS += -DCONFIG_INTERNAL_X509
-CONFIG_INTERNAL_SHA256=y
-MD5OBJS += ../src/crypto/md5-internal.o
-ifdef CONFIG_INTERNAL_LIBTOMMATH
-CFLAGS += -DCONFIG_INTERNAL_LIBTOMMATH
-else
-LIBS += -ltommath
-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
-OBJS_server += ../src/eap_server/eap_peap.o
-OBJS_server += ../src/eap_server/eap_ttls.o
-OBJS_server += ../src/eap_server/eap_md5.o
-OBJS_server += ../src/eap_server/eap_mschapv2.o
-OBJS_server += ../src/eap_server/eap_gtc.o
-OBJS_server += ../src/eap_server/eap_psk.o
-OBJS_server += ../src/eap_server/eap_pax.o
-OBJS_server += ../src/eap_server/eap_sake.o
-OBJS_server += ../src/eap_server/eap_gpsk.o
-OBJS_server += ../src/eap_server/eap.o
-OBJS_server += ../src/eap_server/eap_identity.o
-OBJS_server += ../src/eap_server/eap_methods.o
-OBJS_server += ../src/eap_server/eap_tls_common.o
+OBJS_server += ../src/eap_server/eap_server_tls.o
+OBJS_server += ../src/eap_server/eap_server_peap.o
+OBJS_server += ../src/eap_server/eap_server_ttls.o
+OBJS_server += ../src/eap_server/eap_server_md5.o
+OBJS_server += ../src/eap_server/eap_server_mschapv2.o
+OBJS_server += ../src/eap_server/eap_server_gtc.o
+OBJS_server += ../src/eap_server/eap_server_psk.o
+OBJS_server += ../src/eap_server/eap_server_pax.o
+OBJS_server += ../src/eap_server/eap_server_sake.o
+OBJS_server += ../src/eap_server/eap_server_gpsk.o
+OBJS_server += ../src/eap_server/eap_server.o
+OBJS_server += ../src/eap_server/eap_server_identity.o
+OBJS_server += ../src/eap_server/eap_server_methods.o
+OBJS_server += ../src/eap_server/eap_server_tls_common.o
 CFLAGS += -DEAP_SERVER
 
 
@@ -191,11 +115,22 @@ 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
+
+../src/crypto/libcrypto.a:
+       $(MAKE) -C ../src/crypto
+
+../src/tls/libtls.a:
+       $(MAKE) -C ../src/tls
+
+
 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