Manual pull of 2561c375bc

Add EXEEXT to places so that it builds on systems which require it.

diff --git a/src/Makefile b/src/Makefile
index a79ce07..badca55 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -45,4 +45,4 @@ $(SUBDIRS):
        @$(MAKE) $(MFLAGS) X=$(X)src/ -C $@ $(WHAT_TO_MAKE)
 
 freeradius-devel:
-       ln -s include freeradius-devel
+       ln -sf include freeradius-devel

diff --git a/src/main/Makefile.in b/src/main/Makefile.in
index 62e7bb6..5ee926d 100644 (file)
--- a/src/main/Makefile.in
+++ b/src/main/Makefile.in
@@ -27,14 +27,14 @@ CFLAGS              += $(OPENSSL_INCLUDE)
 VFLAGS         = -DRADIUSD_MAJOR_VERSION=$(RADIUSD_MAJOR_VERSION)
 VFLAGS         += -DRADIUSD_MINOR_VERSION=$(RADIUSD_MINOR_VERSION)
 MODULE_LIBS    = $(STATIC_MODULES)
-BINARIES       = radiusd radwho radclient radmin radconf2xml radattr
+BINARIES       = radiusd$(EXEEXT) radwho$(EXEEXT) radclient$(EXEEXT) radmin$(EXEEXT) radconf2xml$(EXEEXT) radattr$(EXEEXT)
 
 #
 #  The RADIUS sniffer
 #
 PCAP_LIBS      = @PCAP_LIBS@
 ifneq ($(PCAP_LIBS),)
-BINARIES       += radsniff
+BINARIES       += radsniff$(EXEEXT)
 endif
 
 #
@@ -66,7 +66,7 @@ all: $(BINARIES)
 
 $(SERVER_OBJS): $(INCLUDES)
 
-radiusd: $(SERVER_OBJS) $(MODULE_OBJS) $(LIBRADIUS)
+radiusd$(EXEEXT): $(SERVER_OBJS) $(MODULE_OBJS) $(LIBRADIUS)
        $(LIBTOOL) --quiet --mode=link $(CC) -export-dynamic -dlopen self \
                $(LDFLAGS) $(LINK_MODE) -o $@ $(SERVER_OBJS)      \
                $(MODULE_LIBS) $(LIBRADIUS) $(LIBS) $(SNMP_LIBS) \
@@ -109,7 +109,7 @@ radclient.lo: radclient.c $(INCLUDES)
 
 MSCHAP_OBJS := ../modules/rlm_mschap/smbdes.lo ../modules/rlm_mschap/mschap.lo 
 
-radclient: radclient.lo $(MSCHAP_OBJS) $(LIBRADIUS)
+radclient$(EXEEXT): radclient.lo $(MSCHAP_OBJS) $(LIBRADIUS)
        @echo LINK $< ...
        @$(LIBTOOL) --quiet --mode=link $(CC) $(LDFLAGS) $(LINK_MODE) -o radclient radclient.lo $(MSCHAP_OBJS) $(LIBRADIUS) $(LIBS)
 
@@ -123,30 +123,30 @@ radclient: radclient.lo $(MSCHAP_OBJS) $(LIBRADIUS)
 
 radsniff.lo: radsniff.c $(INCLUDES) ../include/radsniff.h
 
-radsniff: radsniff.lo $(LIBRADIUS)
+radsniff$(EXEEXT): radsniff.lo $(LIBRADIUS)
        @echo LINK $@ $<
        @$(LIBTOOL) --quiet --mode=link $(CC) $(LDFLAGS) $(LINK_MODE) -o radsniff radsniff.lo $(LIBRADIUS) $(LIBS) $(PCAP_LIBS)
 
 radwho.lo: radwho.c $(INCLUDES)
        $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c radwho.c
 
-radwho: radwho.lo util.lo log.lo conffile.lo $(LIBRADIUS)
+radwho$(EXEEXT): radwho.lo util.lo log.lo conffile.lo $(LIBRADIUS)
        $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) $(LINK_MODE) -o radwho radwho.lo util.lo log.lo conffile.lo $(LIBRADIUS) $(LIBS)
 
-radmin: radmin.lo $(LIBRADIUS) util.lo log.lo conffile.lo
+radmin$(EXEEXT): radmin.lo $(LIBRADIUS) util.lo log.lo conffile.lo
        $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) $(LINK_MODE) -o $@ $^ $(LIBREADLINE) $(LIBS)
 
-radconf2xml: radconf2xml.lo $(LIBRADIUS) util.lo log.lo conffile.lo
+radconf2xml$(EXEEXT): radconf2xml.lo $(LIBRADIUS) util.lo log.lo conffile.lo
        $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) $(LINK_MODE) -o $@ $^ $(LIBS)
 
-radattr: radattr.lo $(LIBRADIUS)
+radattr$(EXEEXT): radattr.lo $(LIBRADIUS)
        $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) $(LINK_MODE) -o radattr radattr.lo $(LIBRADIUS) $(LIBS)
 
 dhclient.lo: dhclient.c $(INCLUDES)
        $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c dhclient.c
 
 # Don't install this for now.
-dhclient: dhclient.lo $(LIBRADIUS)
+dhclient$(EXEEXT): dhclient.lo $(LIBRADIUS)
        $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) $(LINK_MODE) -o dhclient dhclient.lo $(LIBRADIUS) $(LIBS)
 
 clean:

diff --git a/src/modules/rlm_eap/Makefile.in b/src/modules/rlm_eap/Makefile.in
index 7475ec8..199cff2 100644 (file)
--- a/src/modules/rlm_eap/Makefile.in
+++ b/src/modules/rlm_eap/Makefile.in
@@ -29,7 +29,12 @@ all: common
 
 $(LT_OBJS): $(HEADERS)
 
-radeapclient: radeapclient.lo $(CLIENTLIBS)
+## 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)
@@ -49,6 +54,3 @@ $(RLM_SUBDIRS):
        @$(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

diff --git a/src/modules/rlm_ippool/Makefile.in b/src/modules/rlm_ippool/Makefile.in
index 358edc4..f8790d4 100644 (file)
--- a/src/modules/rlm_ippool/Makefile.in
+++ b/src/modules/rlm_ippool/Makefile.in
@@ -14,7 +14,7 @@ include ../rules.mak
 
 $(LT_OBJS): $(HEADERS)
 
-rlm_ippool_tool: rlm_ippool_tool.lo $(LIBRADIUS)
+rlm_ippool_tool$(EXEEXT): rlm_ippool_tool.lo $(LIBRADIUS)
        $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) $(RLM_LDFLAGS) \
                -o $@ $^ $(RLM_LIBS) $(LIBS)
 

diff --git a/src/modules/rlm_mschap/Makefile b/src/modules/rlm_mschap/Makefile
index 5be6fd8..05ad940 100644 (file)
--- a/src/modules/rlm_mschap/Makefile
+++ b/src/modules/rlm_mschap/Makefile
@@ -10,7 +10,7 @@ HEADERS               = mschap.h smbdes.h
 RLM_CFLAGS     =
 RLM_LDFLAGS    =
 RLM_LIBS       =
-RLM_UTILS      = smbencrypt
+RLM_UTILS      = smbencrypt$(EXEEXT)
 RLM_INSTALL = 
 
 # over-ride the previous assignment if we're not building anything
@@ -18,7 +18,7 @@ include ../rules.mak
 
 $(LT_OBJS): $(HEADERS)
 
-smbencrypt: smbencrypt.lo smbdes.lo $(LIBRADIUS)
+smbencrypt$(EXEEXT): smbencrypt.lo smbdes.lo $(LIBRADIUS)
        @echo LINK $@ $^
        @$(LIBTOOL) --quiet --mode=link $(CC) $(LDFLAGS) $(RLM_LDFLAGS) \
                -o $@ $^ $(RLM_LIBS) $(LIBS)