From e20845184a0ae33307d74b5e78bb7692c05f37b1 Mon Sep 17 00:00:00 2001
From: Jouni Malinen <j@w1.fi>
Date: Thu, 24 Dec 2009 12:05:51 +0200
Subject: [PATCH] Build radius_example using src/*/lib*.a

---
 radius_example/Makefile | 36 ++++++++++++++++--------------------
 1 file changed, 16 insertions(+), 20 deletions(-)

diff --git a/radius_example/Makefile b/radius_example/Makefile
index bf7b1ff5d..2649d263c 100644
--- a/radius_example/Makefile
+++ b/radius_example/Makefile
@@ -6,42 +6,38 @@ ifndef CC
 CC=gcc
 endif
 
+ifndef LDO
+LDO=$(CC)
+endif
+
 ifndef CFLAGS
 CFLAGS = -MMD -O2 -Wall -g
 endif
 
 CFLAGS += -I.
 CFLAGS += -I../src
-CFLAGS += -I../src/crypto
 CFLAGS += -I../src/utils
 
-OBJS += ../src/utils/common.o
-OBJS += ../src/utils/os_unix.o
-OBJS += ../src/utils/wpa_debug.o
-OBJS += ../src/utils/wpabuf.o
-OBJS += ../src/utils/eloop.o
-OBJS += ../src/utils/ip_addr.o
-OBJS += ../src/crypto/md5.o ../src/crypto/md5-internal.o
+LIBS = ../src/radius/libradius.a
+LIBS += ../src/crypto/libcrypto.a
+LIBS += ../src/utils/libutils.a
 
-OBJS += ../src/radius/radius.o
-OBJS += ../src/radius/radius_client.o
+../src/utils/libutils.a:
+	$(MAKE) -C ../src/utils
 
-ifndef LDO
-LDO=$(CC)
-endif
+../src/crypto/libcrypto.a:
+	$(MAKE) -C ../src/crypto
 
+../src/radius/libradius.a:
+	$(MAKE) -C ../src/radius
 
 OBJS_ex = radius_example.o
 
-libradius.a: $(OBJS)
-	ar rc libradius.a $(OBJS)
-	ranlib libradius.a
-
-radius_example: $(OBJS_ex) libradius.a
-	$(LDO) $(LDFLAGS) -o radius_example $(OBJS_ex) -L. -lradius $(LIBS)
+radius_example: $(OBJS_ex) $(LIBS)
+	$(LDO) $(LDFLAGS) -o radius_example $(OBJS_ex) $(LIBS)
 
 clean:
 	$(MAKE) -C ../src clean
-	rm -f core *~ *.o *.d libradius.a $(ALL)
+	rm -f core *~ *.o *.d $(ALL)
 
 -include $(OBJS:%.o=%.d)