Final fix for system libltdl (or not)

[freeradius.git] / src / modules / rlm_eap / Makefile.in

diff --git a/src/modules/rlm_eap/Makefile.in b/src/modules/rlm_eap/Makefile.in
index 93c2f2d..5ea4ad5 100644 (file)
--- a/src/modules/rlm_eap/Makefile.in
+++ b/src/modules/rlm_eap/Makefile.in
@@ -5,12 +5,12 @@
 TARGET      = @targetname@
 SRCS        = rlm_eap.c eap.c mem.c
 HEADERS     = eap.h rlm_eap.h
-RLM_CFLAGS  = $(INCLTDL) -Ilibeap
-CLIENTLIBS  = libeap/$(LIBPREFIX)freeradius-eap.la
+RLM_CFLAGS  = -Ilibeap
+CLIENTLIBS  = libeap/$(LIBPREFIX)freeradius-eap.la $(LIBRADIUS)
 RLM_LIBS    = libeap/$(LIBPREFIX)freeradius-eap.la $(LIBLTDL)
 RLM_INSTALL = install-subdirs
 RLM_SUBDIRS = libeap @eaptypes@
-RLM_UTILS   = radeapclient
+RLM_UTILS   = 
 
 #
 # Not using shared libraries, add in ALL known static modules
@@ -29,15 +29,19 @@ all: common
 
 $(LT_OBJS): $(HEADERS)
 
-radeapclient: radeapclient.lo $(CLIENTLIBS)
-       $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) $(RLM_LDFLAGS) -o radeapclient radeapclient.lo $(CLIENTLIBS) $(LIBS) $(OPENSSL_LIBS)
+## this uses the RLM_CFLAGS and RLM_LIBS and SRCS defs to make TARGET.
+# This needs to be before the radeapclient rule, as the lhs $(EXEECT)
+# expansion is done as soon as the Makefile is loaded
+include ../rules.mak
+
+radeapclient$(EXEEXT): radeapclient.lo $(CLIENTLIBS)
+       $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) $(RLM_LDFLAGS) -o radeapclient radeapclient.lo $(LIBRADIUS) $(CLIENTLIBS) $(LIBS) $(OPENSSL_LIBS)
 
 radeapclient.lo: radeapclient.c $(HEADERS)
        $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(RLM_CFLAGS) -c radeapclient.c
 
 install-subdirs:
        @$(MAKE) $(MFLAGS) WHAT_TO_MAKE=install common
-       $(LIBTOOL) --mode=install $(INSTALL) -m 755 $(INSTALLSTRIP) radeapclient$(EXEEXT) $(R)$(bindir)
 
 .PHONY: common $(RLM_SUBDIRS)
 
@@ -46,10 +50,7 @@ common: $(RLM_SUBDIRS)
 types: libeap
 
 $(RLM_SUBDIRS):
-       echo "Making $(WHAT_TO_MAKE) in $@..."
-       $(MAKE) $(MFLAGS) -C $@ $(WHAT_TO_MAKE)
+       @echo "Making $(WHAT_TO_MAKE) in $(X)rlm_eap/$@..."
+       @$(MAKE) $(MFLAGS) X=$(X)rlm_eap/ -C $@ $(WHAT_TO_MAKE)
 
 libeap/$(LIBPREFIX)freeradius-eap.la: libeap
-
-## this uses the RLM_CFLAGS and RLM_LIBS and SRCS defs to make TARGET.
-include ../rules.mak