X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=src%2Fmain%2FMakefile.in;h=da8ac1ba2ac985efa93662df5001bc58ebbbc7fc;hb=df38586ae7d06ffc50a7b6d115b95797f61fca16;hp=84669919633a2e5f329a30afb7581fb73fc6f871;hpb=64d9d74ebc62e423d84717b4df5b0b87a5fa7647;p=freeradius.git

diff --git a/src/main/Makefile.in b/src/main/Makefile.in
index 8466991..da8ac1b 100644
--- a/src/main/Makefile.in
+++ b/src/main/Makefile.in
@@ -6,15 +6,15 @@ include ../../Make.inc
 
 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 radius_snmp.c \
-		  session.c smux.c threads.c util.c valuepair.c version.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
 
 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/radiusd.h ../include/ident.h ../include/stats.h
 
 CFLAGS		+= -I$(top_builddir)/src
 CFLAGS		+= -DHOSTINFO=\"${HOSTINFO}\"
@@ -24,7 +24,7 @@ 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
+BINARIES	= radiusd radwho radclient radmin radconf2xml
 
 #
 #  The RADIUS sniffer
@@ -45,8 +45,8 @@ ifneq ($(USE_SHARED_LIBS),yes)
 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 test -f ../modules/rlm_eap/libeap/$(LIBPREFIX)freeradius-eap.la && echo ../modules/rlm_eap/libeap/$(LIBPREFIX)freeradius-eap.la)
 
@@ -58,14 +58,15 @@ MODULE_OBJS     += $(shell for x in $(SUB_MODULES);do test -f ../modules/*/types
 MODULE_OBJS     += $(shell for x in $(SUB_MODULES);do test -f ../modules/*/drivers/$$x/$$x.la && echo ../modules/*/drivers/$$x/$$x.la;done)
 endif
 
+.PHONY: all clean install reconfig
 all: $(BINARIES)
 
 $(SERVER_OBJS): $(INCLUDES)
 
-radiusd: $(SERVER_OBJS) $(MODULE_OBJS) ../lib/libradius.la
+radiusd: $(SERVER_OBJS) $(MODULE_OBJS) $(LIBRADIUS)
 	$(LIBTOOL) --mode=link $(CC) -export-dynamic -dlopen self \
 		$(LDFLAGS) $(LINK_MODE) -o $@ $(SERVER_OBJS)      \
-		$(MODULE_LIBS) ../lib/libradius.la $(LIBS) $(SNMP_LIBS) \
+		$(MODULE_LIBS) $(LIBRADIUS) $(LIBS) $(SNMP_LIBS) \
 		$(LCRYPT) $(PTHREADLIB) $(LIBLTDL) $(OPENSSL_LIBS)
 
 radiusd.lo: radiusd.c  ../include/modules.h ../include/modcall.h ../include/modpriv.h
@@ -98,36 +99,66 @@ modules.lo: modules.c ../include/modules.h
 session.lo: session.c ../include/modules.h
 	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c session.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
+
 #
 # Helper programs
 #
 
 radclient.lo: radclient.c $(INCLUDES)
-	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c radclient.c
+	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -I ../modules/rlm_mschap -c radclient.c
+
+MSCHAP_OBJS := ../modules/rlm_mschap/smbdes.lo ../modules/rlm_mschap/mschap.lo 
+
+radclient: 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
+# "compile C file" rules.
+../modules/rlm_mschap/smbdes.lo: ../modules/rlm_mschap/smbdes.c
+	${MAKE} -C ../modules/rlm_mschap/
 
-radclient: radclient.lo ../lib/libradius.la
-	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) $(LINK_MODE) -o radclient radclient.lo ../lib/libradius.la $(LIBS)
+../modules/rlm_mschap/mschap.lo: ../modules/rlm_mschap/mschap.c
+	${MAKE} -C ../modules/rlm_mschap/
 
 radsniff.lo: radsniff.c $(INCLUDES) ../include/radsniff.h
 	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c radsniff.c
 
-radsniff: radsniff.lo ../lib/libradius.la
-	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) $(LINK_MODE) -o radsniff radsniff.lo ../lib/libradius.la $(LIBS) $(PCAP_LIBS)
+radsniff: 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 ../lib/libradius.la
-	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) $(LINK_MODE) -o radwho radwho.lo util.lo log.lo conffile.lo ../lib/libradius.la $(LIBS)
+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)
 
+radmin: 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
+	$(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)
+	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) $(LINK_MODE) -o dhclient dhclient.lo $(LIBRADIUS) $(LIBS)
 
 clean:
 	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)
+	$(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
@@ -135,3 +166,5 @@ endif
 	$(INSTALL) -m 755    radlast			$(R)$(bindir)
 	$(INSTALL) -m 755    radtest 			$(R)$(bindir)
 	$(INSTALL) -m 755    radzap			$(R)$(bindir)
+
+reconfig: