From: Alan T. DeKok Date: Thu, 29 Dec 2011 21:49:05 +0000 (-0500) Subject: Add EXEEXT to binaries X-Git-Tag: release_2_2_0~219 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2561c375bc;p=thirdparty%2Ffreeradius-server.git Add EXEEXT to binaries Closes bug #188 --- diff --git a/install-sh b/install-sh index e9de23842dc..59bcde425aa 100755 --- a/install-sh +++ b/install-sh @@ -221,7 +221,7 @@ else # Make a temp file name in the proper directory. - dsttmp=$dstdir/#inst.$$# + dsttmp=$dstdir/_inst.$$_ # Move or copy the file name to the temp name diff --git a/src/Makefile b/src/Makefile index f1a528395f0..b04e7b8cca6 100644 --- a/src/Makefile +++ b/src/Makefile @@ -40,4 +40,4 @@ $(SUBDIRS): $(MAKE) $(MFLAGS) -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 da8ac1ba2ac..e763d909532 100644 --- a/src/main/Makefile.in +++ b/src/main/Makefile.in @@ -24,14 +24,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 +BINARIES = radiusd$(EXEEXT) radwho$(EXEEXT) radclient$(EXEEXT) radmin$(EXEEXT) radconf2xml$(EXEEXT) # # The RADIUS sniffer # PCAP_LIBS = @PCAP_LIBS@ ifneq ($(PCAP_LIBS),) -BINARIES += radsniff +BINARIES += radsniff$(EXEEXT) endif # @@ -63,7 +63,7 @@ all: $(BINARIES) $(SERVER_OBJS): $(INCLUDES) -radiusd: $(SERVER_OBJS) $(MODULE_OBJS) $(LIBRADIUS) +radiusd$(EXEEXT): $(SERVER_OBJS) $(MODULE_OBJS) $(LIBRADIUS) $(LIBTOOL) --mode=link $(CC) -export-dynamic -dlopen self \ $(LDFLAGS) $(LINK_MODE) -o $@ $(SERVER_OBJS) \ $(MODULE_LIBS) $(LIBRADIUS) $(LIBS) $(SNMP_LIBS) \ @@ -112,7 +112,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) $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) $(LINK_MODE) -o radclient radclient.lo $(MSCHAP_OBJS) $(LIBRADIUS) $(LIBS) # These two rules need to be specific in order to supercede the generic @@ -126,26 +126,26 @@ radclient: radclient.lo $(MSCHAP_OBJS) $(LIBRADIUS) radsniff.lo: radsniff.c $(INCLUDES) ../include/radsniff.h $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c radsniff.c -radsniff: radsniff.lo $(LIBRADIUS) +radsniff$(EXEEXT): radsniff.lo $(LIBRADIUS) $(LIBTOOL) --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) 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 5576294c0d4..4d3e9920fde 100644 --- a/src/modules/rlm_eap/Makefile.in +++ b/src/modules/rlm_eap/Makefile.in @@ -29,8 +29,13 @@ all: common $(LT_OBJS): $(HEADERS) -radeapclient: radeapclient.lo $(CLIENTLIBS) - $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) $(RLM_LDFLAGS) -o radeapclient radeapclient.lo $(LIBRADIUS) $(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$(EXEEXT) radeapclient.lo $(LIBRADIUS) $(CLIENTLIBS) $(LIBS) $(OPENSSL_LIBS) radeapclient.lo: radeapclient.c $(HEADERS) $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(RLM_CFLAGS) -c radeapclient.c @@ -50,6 +55,3 @@ $(RLM_SUBDIRS): @$(MAKE) $(MFLAGS) -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 22f7d14d11d..7088e58b433 100644 --- 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 d2d5813bee5..9d1a55a7bbc 100644 --- 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 = smbencrypt-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) $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) $(RLM_LDFLAGS) \ -o $@ $^ $(RLM_LIBS) $(LIBS)