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

diff --git a/src/main/Makefile.in b/src/main/Makefile.in
index 19c638a..da8ac1b 100644
--- a/src/main/Makefile.in
+++ b/src/main/Makefile.in
@@ -6,7 +6,7 @@ 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 stats.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
 
@@ -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 radmin
+BINARIES	= radiusd radwho radclient radmin radconf2xml
 
 #
 #  The RADIUS sniffer
@@ -58,6 +58,7 @@ 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)
@@ -99,17 +100,28 @@ 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: dhcpd.c command.c
+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
 
-radclient: radclient.lo $(LIBRADIUS)
-	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) $(LINK_MODE) -o radclient radclient.lo $(LIBRADIUS) $(LIBS)
+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/
+
+../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
@@ -123,8 +135,18 @@ radwho.lo: radwho.c $(INCLUDES)
 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 $(LIBREADLINE) $(LIBRADIUS) util.lo log.lo conffile.lo
-	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) $(LINK_MODE) -o $@ $^
+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
@@ -136,6 +158,7 @@ install:
 	$(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
@@ -143,3 +166,5 @@ endif
 	$(INSTALL) -m 755    radlast			$(R)$(bindir)
 	$(INSTALL) -m 755    radtest 			$(R)$(bindir)
 	$(INSTALL) -m 755    radzap			$(R)$(bindir)
+
+reconfig: