include ../../Make.inc
-SERVER_OBJS = radiusd.o files.o util.o acct.o nas.o log.o valuepair.o \
- version.o proxy.o exec.o auth.o timestr.o conffile.o \
- modules.o modcall.o session.o xlat.o threads.o smux.o \
- radius_snmp.o client.o request_list.o mainconfig.o
-INCLUDES = ../include/radiusd.h ../include/radius.h ../include/libradius.h ../include/conf.h ../include/autoconf.h
+SERVER_SRCS = acct.c auth.c client.c conffile.c crypt.c exec.c files.c \
+ listen.c log.c mainconfig.c modules.c modcall.c \
+ radiusd.c stats.c soh.c \
+ session.c threads.c util.c valuepair.c version.c \
+ xlat.c event.c realms.c evaluate.c vmps.c detail.c
-CFLAGS += -I../include
+SERVER_OBJS += $(SERVER_SRCS:.c=.lo)
+
+INCLUDES = ../include/autoconf.h ../include/conf.h \
+ ../include/libradius.h ../include/radius.h \
+ ../include/radiusd.h ../include/ident.h ../include/stats.h
+
+CFLAGS += -I$(top_builddir)/src
CFLAGS += -DHOSTINFO=\"${HOSTINFO}\"
-CFLAGS += -DRADIUSD_VERSION=\"${RADIUSD_VERSION}\"
-CFLAGS += $(SNMP_INCLUDE)
-LDFLAGS += -L../lib
-MODULE_LIBS = $(STATIC_MODULES)
-MODULE_OBJS =
+CFLAGS += -DRADIUSD_VERSION=\"${RADIUSD_VERSION}\"
+CFLAGS += $(SNMP_INCLUDE)
+CFLAGS += $(OPENSSL_INCLUDE)
VFLAGS = -DRADIUSD_MAJOR_VERSION=$(RADIUSD_MAJOR_VERSION)
VFLAGS += -DRADIUSD_MINOR_VERSION=$(RADIUSD_MINOR_VERSION)
-BINARIES = radiusd radwho radzap radclient radrelay
-LT_BIN_FLAGS =
+MODULE_LIBS = $(STATIC_MODULES)
+BINARIES = radiusd radwho radclient radmin radconf2xml
+
+#
+# The RADIUS sniffer
+#
+PCAP_LIBS = @PCAP_LIBS@
+ifneq ($(PCAP_LIBS),)
+BINARIES += radsniff
+endif
#
# Not using shared libraries, add in ALL known static modules
-# at build time.
+# at build time.
#
ifneq ($(USE_SHARED_LIBS),yes)
#
# For static linking...
#
-LT_BIN_FLAGS = -static -all-static
+LINK_MODE = -static -all-static
SUB_MODULES += rlm_eap_md5 rlm_eap_leap rlm_eap_tls rlm_eap_ttls rlm_eap_sim
-SUB_MODULES += rlm_eap_peap rlm_eap_mschapv2 rlm_eap_gtc
-SUB_MODULES += rlm_sql_db2 rlm_sql_freetds rlm_sql_iodbc rlm_sql_mysql
+SUB_MODULES += rlm_eap_peap rlm_eap_mschapv2 rlm_eap_gtc rlm_eap_ikev2
+SUB_MODULES += rlm_sql_db2 rlm_sql_iodbc rlm_sql_mysql
SUB_MODULES += rlm_sql_oracle rlm_sql_postgresql rlm_sql_sybase rlm_sql_unixodbc
-LIBS += $(shell -f ../modules/rlm_eap/libeap/libeap.a && echo -L../modules/rlm_eap/libeap -leap)
+LIBS += $(shell test -f ../modules/rlm_eap/libeap/$(LIBPREFIX)freeradius-eap.la && echo ../modules/rlm_eap/libeap/$(LIBPREFIX)freeradius-eap.la)
-#
MODULE_LIBS += $(shell for x in $(MODULES);do test -f ../modules/$$x/$$x.la && echo -dlpreopen ../modules/$$x/$$x.la;done)
MODULE_LIBS += $(shell for x in $(SUB_MODULES);do test -f ../modules/*/types/$$x/$$x.la && echo -dlpreopen ../modules/*/types/$$x/$$x.la;done)
MODULE_LIBS += $(shell for x in $(SUB_MODULES);do test -f ../modules/*/drivers/$$x/$$x.la && echo -dlpreopen ../modules/*/drivers/$$x/$$x.la;done)
-MODULE_OBJS += $(shell for x in $(MODULES);do test -f ../modules/$$x/$$x.la && echo ../modules/$$x/$$x.la;done)
-MODULE_OBJS += $(shell for x in $(SUB_MODULES);do test -f ../modules/*/types/$$x/$$x.la && echo ../modules/*/types/$$x/$$x.la;done)
-MODULE_OBJS += $(shell for x in $(SUB_MODULES);do test -f ../modules/*/drivers/$$x/$$x.la && echo ../modules/*/drivers/$$x/$$x.la;done)
+MODULE_OBJS += $(shell for x in $(MODULES);do test -f ../modules/$$x/$$x.la && echo ../modules/$$x/$$x.la;done)
+MODULE_OBJS += $(shell for x in $(SUB_MODULES);do test -f ../modules/*/types/$$x/$$x.la && echo ../modules/*/types/$$x/$$x.la;done)
+MODULE_OBJS += $(shell for x in $(SUB_MODULES);do test -f ../modules/*/drivers/$$x/$$x.la && echo ../modules/*/drivers/$$x/$$x.la;done)
endif
-LIBS += -lradius $(SNMP_LIBS)
-
+.PHONY: all clean install reconfig
+all: $(BINARIES)
-all: $(BINARIES)
+$(SERVER_OBJS): $(INCLUDES)
-radiusd: $(SERVER_OBJS) ../lib/libradius.la $(MODULE_OBJS)
+radiusd: $(SERVER_OBJS) $(MODULE_OBJS) $(LIBRADIUS)
$(LIBTOOL) --mode=link $(CC) -export-dynamic -dlopen self \
- $(LT_BIN_FLAGS) $(CFLAGS) $(LDFLAGS) -o $@ \
- $(SERVER_OBJS) $(LCRYPT) $(MODULE_LIBS) $(LIBS) \
- $(PTHREADLIB) $(LIBLTDL) $(LCRYPT) $(OPENSSL_LIBS)
+ $(LDFLAGS) $(LINK_MODE) -o $@ $(SERVER_OBJS) \
+ $(MODULE_LIBS) $(LIBRADIUS) $(LIBS) $(SNMP_LIBS) \
+ $(LCRYPT) $(PTHREADLIB) $(LIBLTDL) $(OPENSSL_LIBS)
-radiusd.o: radiusd.c $(INCLUDES) ../include/request_list.h ../include/modules.h ../include/modcall.h ../include/modpriv.h
+radiusd.lo: radiusd.c ../include/modules.h ../include/modcall.h ../include/modpriv.h
$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c radiusd.c
-acct.o: acct.c $(INCLUDES) ../include/modules.h
- $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c acct.c
-
-files.o: files.c $(INCLUDES)
- $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c files.c
+%.lo: %.c
+ $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c $<
-util.o: util.c $(INCLUDES)
- $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c util.c
+acct.lo: acct.c ../include/modules.h
+ $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c acct.c
-nas.o: nas.c $(INCLUDES)
- $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c nas.c
+auth.lo: auth.c ../include/modules.h
+ $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c auth.c
-log.o: log.c $(INCLUDES)
- $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c log.c
+client.lo: client.c ../include/conffile.h
+ $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c client.c
-conffile.o: conffile.c $(INCLUDES) ../include/modules.h
+conffile.lo: conffile.c ../include/conffile.h ../include/modules.h
$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c conffile.c
-mainconfig.o: mainconfig.c $(INCLUDES) ../include/modules.h
+mainconfig.lo: mainconfig.c ../include/modules.h
$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c mainconfig.c
-timestr.o: timestr.c $(INCLUDES)
- $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c timestr.c
+modcall.lo: modcall.c
+ $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(INCLTDL) -c modcall.c
-modules.o: modules.c $(INCLUDES)
+modules.lo: modules.c ../include/modules.h
$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(VFLAGS) $(INCLTDL) -c modules.c
-modcall.o: modcall.c $(INCLUDES)
- $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(INCLTDL) -c modcall.c
-
-session.o: session.c $(INCLUDES) ../include/modules.h
+session.lo: session.c ../include/modules.h
$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c session.c
-request_list.o: request_list.c $(INCLUDES)
- $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c request_list.c
-
-proxy.o: proxy.c $(INCLUDES)
- $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c proxy.c
-
-exec.o: exec.c $(INCLUDES)
- $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c exec.c
+# It's #include'd for simplicity. This should be fixed...
+listen.lo: listen.c dhcpd.c command.c
+ $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(INCLTDL) -c listen.c
-auth.o: auth.c $(INCLUDES) ../include/modules.h
- $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c auth.c
-
-valuepair.o: valuepair.c $(INCLUDES)
- $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c valuepair.c
+#
+# Helper programs
+#
-version.o: version.c $(INCLUDES)
- $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -o version.o -c version.c
+radclient.lo: radclient.c $(INCLUDES)
+ $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -I ../modules/rlm_mschap -c radclient.c
-xlat.o: xlat.c $(INCLUDES)
- $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -o xlat.o -c xlat.c
+MSCHAP_OBJS := ../modules/rlm_mschap/smbdes.lo ../modules/rlm_mschap/mschap.lo
-threads.o: threads.c $(INCLUDES)
- $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -o threads.o -c threads.c
+radclient: radclient.lo $(MSCHAP_OBJS) $(LIBRADIUS)
+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) $(LINK_MODE) -o radclient radclient.lo $(MSCHAP_OBJS) $(LIBRADIUS) $(LIBS)
-smux.o: smux.c $(INCLUDES)
- $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -o smux.o -c smux.c
+# These two rules need to be specific in order to supercede the generic
+# "compile C file" rules.
+../modules/rlm_mschap/smbdes.lo: ../modules/rlm_mschap/smbdes.c
+ ${MAKE} -C ../modules/rlm_mschap/
-radius_snmp.o: radius_snmp.c $(INCLUDES)
- $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -o radius_snmp.o -c radius_snmp.c
+../modules/rlm_mschap/mschap.lo: ../modules/rlm_mschap/mschap.c
+ ${MAKE} -C ../modules/rlm_mschap/
-radclient: radclient.o ../lib/libradius.la
- $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o radclient radclient.o ../lib/libradius.la $(LIBS)
+radsniff.lo: radsniff.c $(INCLUDES) ../include/radsniff.h
+ $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c radsniff.c
-radclient.o: radclient.c $(INCLUDES)
- $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c radclient.c
+radsniff: radsniff.lo $(LIBRADIUS)
+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) $(LINK_MODE) -o radsniff radsniff.lo $(LIBRADIUS) $(LIBS) $(PCAP_LIBS)
-radrelay: radrelay.o mainconfig.o util.o nas.o client.o log.o conffile.o files.o xlat.o ../lib/libradius.la
- $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o radrelay radrelay.o mainconfig.o util.o nas.o client.o log.o conffile.o files.o xlat.o -static ../lib/libradius.la -shared $(LIBS)
+radwho.lo: radwho.c $(INCLUDES)
+ $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c radwho.c
-radrelay.o: radrelay.c $(INCLUDES)
- $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c radrelay.c
+radwho: 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)
-radwho.o: radwho.c $(INCLUDES)
- $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c radwho.c
+radmin: radmin.lo $(LIBRADIUS) util.lo log.lo conffile.lo
+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) $(LINK_MODE) -o $@ $^ $(LIBREADLINE) $(LIBS)
-radwho: radwho.o mainconfig.o util.o nas.o client.o log.o conffile.o files.o xlat.o ../lib/libradius.la
- $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o radwho radwho.o mainconfig.o util.o nas.o client.o log.o conffile.o files.o xlat.o ../lib/libradius.la $(LIBS)
+radconf2xml: radconf2xml.lo $(LIBRADIUS) util.lo log.lo conffile.lo
+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) $(LINK_MODE) -o $@ $^ $(LIBS)
-radzap.o: radzap.c $(INCLUDES)
- $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c radzap.c
+dhclient.lo: dhclient.c $(INCLUDES)
+ $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c dhclient.c
-radzap: radzap.o mainconfig.o util.o nas.o log.o client.o conffile.o files.o xlat.o ../lib/libradius.la
- $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o radzap radzap.o mainconfig.o util.o nas.o log.o client.o conffile.o files.o xlat.o ../lib/libradius.la $(LIBS)
+# Don't install this for now.
+dhclient: dhclient.lo $(LIBRADIUS)
+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) $(LINK_MODE) -o dhclient dhclient.lo $(LIBRADIUS) $(LIBS)
clean:
- rm -rf *.o *.so *~ $(BINARIES) .libs
+ rm -rf *.o *.so *.lo *~ $(BINARIES) .libs
install:
+ $(INSTALL) -d -m 755 $(R)$(sbindir)
+ $(INSTALL) -d -m 755 $(R)$(bindir)
$(LIBTOOL) --mode=install $(INSTALL) -m 755 $(INSTALLSTRIP) radiusd$(EXEEXT) $(R)$(sbindir)
- $(INSTALL) -m 755 $(INSTALLSTRIP) radwho$(EXEEXT) $(R)$(bindir)
- $(INSTALL) -m 755 $(INSTALLSTRIP) radzap$(EXEEXT) $(R)$(bindir)
+ $(LIBTOOL) --mode=install $(INSTALL) -m 755 $(INSTALLSTRIP) radmin$(EXEEXT) $(R)$(sbindir)
+ $(LIBTOOL) --mode=install $(INSTALL) -m 755 $(INSTALLSTRIP) radclient$(EXEEXT) $(R)$(bindir)
+ $(LIBTOOL) --mode=install $(INSTALL) -m 755 $(INSTALLSTRIP) radwho$(EXEEXT) $(R)$(bindir)
+ $(LIBTOOL) --mode=install $(INSTALL) -m 755 $(INSTALLSTRIP) radconf2xml$(EXEEXT) $(R)$(bindir)
+ifneq ($(PCAP_LIBS),)
+ $(LIBTOOL) --mode=install $(INSTALL) -m 755 $(INSTALLSTRIP) radsniff$(EXEEXT) $(R)$(bindir)
+endif
+ $(INSTALL) -m 755 checkrad.pl $(R)$(sbindir)/checkrad
$(INSTALL) -m 755 radlast $(R)$(bindir)
- $(INSTALL) -m 755 radclient$(EXEEXT) $(R)$(bindir)
- $(INSTALL) -m 755 radrelay$(EXEEXT) $(R)$(bindir)
$(INSTALL) -m 755 radtest $(R)$(bindir)
- $(INSTALL) -m 755 checkrad.pl $(R)$(sbindir)/checkrad
+ $(INSTALL) -m 755 radzap $(R)$(bindir)
+
+reconfig: