Cleaned up libeap/Makefile, so it uses the module rules.mak,

	and not it's own stuff.

	Defined magic variable RLM_EAP_LINK_MODE, which should be set
	to -static.  The server then links, runs, and installs!

diff --git a/src/modules/rlm_eap/libeap/Makefile b/src/modules/rlm_eap/libeap/Makefile
index 9aaed3c..200dec0 100644 (file)
--- a/src/modules/rlm_eap/libeap/Makefile
+++ b/src/modules/rlm_eap/libeap/Makefile
@@ -1,43 +1,8 @@
-include ../../../../Make.inc
-
+TARGET         = $(LIBPREFIX)eap
 SRCS           = fips186prf.c eapcrypto.c eapcommon.c eapsimlib.c
-
 INCLUDES       = 
+RLM_CFLAGS     = -DEAPLIB -I../../../include 
+LINK_MODE      = $(RLM_EAP_LINK_MODE)
 
-CFLAGS         += -DEAPLIB -I../../../include 
-
-TARGET=$(LIBPREFIX)eap
-
-all:   dynamic
-
-dynamic: $(TARGET).la
-
-STATIC_OBJS    = $(SRCS:.c=.o)
-DYNAMIC_OBJS   = $(SRCS:.c=.lo)
-
-$(STATIC_OBJS):  $(INCLUDES)
-$(DYNAMIC_OBJS): $(INCLUDES)
-
-#######################################################################
-#
-# define new rules
-#
-#######################################################################
-%.o : %.c
-       $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c $< -o $@
-
-%.lo : %.c
-       $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c $<
-
-$(TARGET).la: $(DYNAMIC_OBJS)
-       $(LIBTOOL) --mode=link $(CC) -release $(RADIUSD_VERSION) \
-       $(CFLAGS) -o $@ -rpath $(libdir) $^ ../../../lib/libradius.la
-clean:
-       rm -f *.o *.lo $(TARGET).a $(TARGET).la
-       rm -rf .libs
-
-install: $(TARGET).la
-       $(LIBTOOL) --mode=install $(INSTALL) -c \
-               $(TARGET).la $(R)$(libdir)/$(TARGET).la;
-       rm -f $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION).la;
-       ln -s $(TARGET).la $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION).la
+RLM_DIR                = ../
+include ../../rules.mak

diff --git a/src/modules/rlm_eap/types/rlm_eap_peap/Makefile.in b/src/modules/rlm_eap/types/rlm_eap_peap/Makefile.in
index 7bc2bbd..3689597 100644 (file)
--- a/src/modules/rlm_eap/types/rlm_eap_peap/Makefile.in
+++ b/src/modules/rlm_eap/types/rlm_eap_peap/Makefile.in
@@ -4,6 +4,7 @@ RLM_CFLAGS  = $(INCLTDL) -I../.. @eap_peap_cflags@ $(OPENSSL_INCLUDE) -I../rlm_e
 HEADERS     = ../rlm_eap_tls/rlm_eap_tls.h eap_peap.h ../../eap.h ../../rlm_eap.h
 RLM_INSTALL = 
 RLM_LIBS    = ../rlm_eap_tls/rlm_eap_tls.la -L@srcdir@/../../libeap -leap @eap_peap_ldflags@ $(OPENSSL_LIBS)
+LINK_MODE   = $(RLM_EAP_LINK_MODE)
 
 $(STATIC_OBJS): $(HEADERS)
 

diff --git a/src/modules/rlm_eap/types/rlm_eap_tls/Makefile.in b/src/modules/rlm_eap/types/rlm_eap_tls/Makefile.in
index 541b49b..8a9a350 100644 (file)
--- a/src/modules/rlm_eap/types/rlm_eap_tls/Makefile.in
+++ b/src/modules/rlm_eap/types/rlm_eap_tls/Makefile.in
@@ -4,10 +4,12 @@ RLM_CFLAGS  = $(INCLTDL) -I@srcdir@/../.. $(OPENSSL_INCLUDE) -I@srcdir@/../../li
 HEADERS     = rlm_eap_tls.h eap_tls.h ../../eap.h ../../rlm_eap.h
 RLM_INSTALL = 
 RLM_LIBS    += @eap_tls_ldflags@ $(OPENSSL_LIBS)
+LINK_MODE   = $(RLM_EAP_LINK_MODE)
 
 $(STATIC_OBJS): $(HEADERS)
 
 $(DYNAMIC_OBJS): $(HEADERS)
 
+
 RLM_DIR=../../
 include ${RLM_DIR}../rules.mak

diff --git a/src/modules/rlm_eap/types/rlm_eap_ttls/Makefile.in b/src/modules/rlm_eap/types/rlm_eap_ttls/Makefile.in
index a07d958..f68ff82 100644 (file)
--- a/src/modules/rlm_eap/types/rlm_eap_ttls/Makefile.in
+++ b/src/modules/rlm_eap/types/rlm_eap_ttls/Makefile.in
@@ -4,6 +4,7 @@ RLM_CFLAGS  = $(INCLTDL) -I@srcdir@/../.. $(OPENSSL_INCLUDE) -I@srcdir@/../../li
 HEADERS     = ../rlm_eap_tls/rlm_eap_tls.h eap_ttls.h ../../eap.h ../../rlm_eap.h
 RLM_INSTALL = 
 RLM_LIBS    = ../rlm_eap_tls/rlm_eap_tls.la -L@srcdir@/../../libeap -leap @eap_ttls_ldflags@ $(OPENSSL_LIBS)
+LINK_MODE   = $(RLM_EAP_LINK_MODE)
 
 $(STATIC_OBJS): $(HEADERS)