X-Git-Url: http://git.sameswireless.fr/l2tpns.git/blobdiff_plain/7aa420ce9f2c55049b061c7df836ccc990303ebf..refs/heads/infinite-loop-protection:/Makefile

diff --git a/Makefile b/Makefile
index 8af2656..36789e3 100644
--- a/Makefile
+++ b/Makefile
@@ -1,92 +1,142 @@
-PREFIX=
-bindir = $(PREFIX)/usr/sbin
-etcdir = $(PREFIX)/etc/l2tpns
-libdir = $(PREFIX)/usr/lib/l2tpns
+DESTDIR =
+bindir = /usr/sbin
+etcdir = /etc/l2tpns
+libdir = /usr/lib/l2tpns
+man5dir = /usr/share/man/man5
+man8dir = /usr/share/man/man8
+statedir = /var/lib/l2tpns
+
+DEFINES =
+DEFINES += -DLIBDIR='"$(libdir)"'
+DEFINES += -DETCDIR='"$(etcdir)"'
+
+OPTIM =
+OPTIM += -g
+OPTIM += -O3
 
 CC = gcc
-DEFINES= -DBGP -DRINGBUFFER -DSTAT_CALLS -DSTATISTICS
-OPTIM=-g -O3 -funroll-loops -fomit-frame-pointer -finline-functions
-CFLAGS=-Wall $(OPTIM) $(DEFINES)
-LDFLAGS = 
-LIBS = -lm -ldl -lcli
-INSTALL = /usr/bin/install -c
-
-OBJS=	md5.o \
-	icmp.o \
-	cli.o \
-	l2tpns.o \
-	ppp.o \
-	radius.o \
-	ll.o \
-	cluster.o \
-	arp.o \
-	constants.o \
-	ll.o \
-	control.o \
-	util.o \
-	tbf.o \
-	bgp.o \
-
-PLUGINS=garden.so autothrottle.so autosnoop.so
-
-all:	l2tpns nsctl $(PLUGINS)
-
-l2tpns:	$(OBJS)
-	$(CC) $(CFLAGS) -o $@ $^ $(LIBS) $(DEFS)
-
-nsctl:	nsctl.o control.o
-	$(CC) $(CFLAGS) -o $@ $^ $(DEFS)
+LD = gcc
+INCLUDES = -I.
+CPPFLAGS = $(INCLUDES) $(DEFINES)
+CFLAGS = -Wall -Wformat-security $(OPTIM)
+LDFLAGS =
+LDLIBS =
+INSTALL = install -c -D -o root -g root
+
+l2tpns.LIBS = -lcli -ldl
+
+OBJS = arp.o cli.o cluster.o constants.o control.o icmp.o l2tpns.o \
+    ll.o md5.o ppp.o radius.o tbf.o util.o pppoe.o l2tplac.o dhcp6.o ipv6_u.o
+
+PROGRAMS = l2tpns nsctl
+PLUGINS = autosnoop.so autothrottle.so garden.so sessionctl.so \
+    setrxspeed.so snoopctl.so stripdomain.so throttlectl.so
+
+DEFINES += -DSTATISTICS
+DEFINES += -DSTAT_CALLS
+DEFINES += -DRINGBUFFER
+
+ifneq (2.4, $(shell uname -r | perl -pe 's/^(\d+\.\d+).*/$$1/'))
+ DEFINES += -DHAVE_EPOLL
+endif
+
+DEFINES += -DBGP
+OBJS += bgp.o
+
+all: programs plugins
+programs: $(PROGRAMS)
+plugins: $(PLUGINS)
 
 clean:
-	/bin/rm -f *.o *.so l2tpns nsctl
+	rm -f *.o test/*.o $(PROGRAMS) $(PLUGINS) Makefile.tmp Makefile.bak
 
 depend:
 	(sed -n 'p; /^## Dependencies: (autogenerated) ##/q' Makefile && \
-	    gcc -MM $(DEFINES) $(OBJS:.o=.c) && \
-	    gcc -MM $(DEFINES) $(PLUGINS:.so=.c) | sed 's/\.o/.so/') >Makefile.tmp
+	    gcc -MM $(CPPFLAGS) $(OBJS:.o=.c) && \
+	    gcc -MM $(CPPFLAGS) $(PLUGINS:.so=.c) | sed 's/\.o/.so/') >Makefile.tmp
 	mv Makefile Makefile.bak
 	mv Makefile.tmp Makefile
 
+l2tpns: $(OBJS)
+	$(LD) $(LDFLAGS) -o $@ $^ $(LDLIBS) $($@.LIBS)
+
+nsctl: nsctl.o control.o
+	$(LD) $(LDFLAGS) -o $@ $^ $(LDLIBS) $($@.LIBS)
+
+%.o: %.c
+	$(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
+
+%.so: %.c
+	$(CC) -fPIC -shared $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ $<
+
 install: all
-	$(INSTALL) -D -o root -g root -m 0755 l2tpns $(bindir)/l2tpns
-	$(INSTALL) -D -o root -g root -m 0755 nsctl $(bindir)/nsctl
-	$(INSTALL) -D -o root -g root -m 0600 etc/l2tpns.cfg.default $(etcdir)/l2tpns.cfg
-	$(INSTALL) -D -o root -g root -m 0644 etc/ip_pool.default $(etcdir)/l2tpns.ip_pool
-	$(INSTALL) -D -o root -g root -m 0600 etc/users.default $(etcdir)/l2tpns.users
-	for PLUGIN in $(PLUGINS); do \
-		$(INSTALL) -D -o root -g root -m 0755 $(PLUGIN) $(libdir)/$(PLUGIN); \
+	$(INSTALL) -m 0755 l2tpns $(DESTDIR)$(bindir)/l2tpns
+	$(INSTALL) -m 0755 nsctl $(DESTDIR)$(bindir)/nsctl
+
+	$(INSTALL) -m 0644 Docs/startup-config.5 $(DESTDIR)$(man5dir)/startup-config.5
+	$(INSTALL) -m 0644 Docs/l2tpns.8 $(DESTDIR)$(man8dir)/l2tpns.8
+	$(INSTALL) -m 0644 Docs/nsctl.8 $(DESTDIR)$(man8dir)/nsctl.8
+
+	gzip --best --force $(DESTDIR)$(man5dir)/*.5 $(DESTDIR)$(man8dir)/*.8
+
+	@for config in startup-config users ip_pool; \
+	do \
+	    suffix=; \
+	    mode=0600; [ $$config = ip_pool ] && mode=0644; \
+	    if [ -f $(DESTDIR)$(etcdir)/$$config ]; \
+	    then \
+	    	cmp -s etc/$$config.default $(DESTDIR)$(etcdir)/$$config && continue; \
+		suffix=.default; \
+	    fi; \
+	    echo $(INSTALL) -m $$mode etc/$$config.default $(DESTDIR)$(etcdir)/$$config$$suffix; \
+	    $(INSTALL) -m $$mode etc/$$config.default $(DESTDIR)$(etcdir)/$$config$$suffix; \
 	done
-	if [ ! -e /dev/net/tun ]; then \
+
+	@for plugin in $(PLUGINS); \
+	do \
+		echo $(INSTALL) -m 0755 $$plugin $(DESTDIR)$(libdir)/$$plugin; \
+		$(INSTALL) -m 0755 $$plugin $(DESTDIR)$(libdir)/$$plugin; \
+	done
+
+	@if [ -z $(DESTDIR) ] && [ ! -e /dev/net/tun ]; \
+	then \
 		mkdir /dev/net; \
+		echo mknod /dev/net/tun c 10 200; \
 		mknod /dev/net/tun c 10 200; \
 	fi
 
-%.o: %.c
-	$(CC) -c $(CFLAGS) -o $@ $<
-
-%.so: %.c
-	$(CC) -fPIC -shared $(CFLAGS) -o $@ $< $(LDFLAGS) $(LIBS) $(LIBPATH)
-
-.PHONY: all clean depend
+.PHONY: all clean depend install
 
 ## Dependencies: (autogenerated) ##
-md5.o: md5.c md5.h
-icmp.o: icmp.c l2tpns.h config.h
-cli.o: cli.c l2tpns.h config.h util.h cluster.h tbf.h ll.h bgp.h
-l2tpns.o: l2tpns.c md5.h l2tpns.h config.h cluster.h plugin.h ll.h \
-  constants.h control.h util.h tbf.h bgp.h
-ppp.o: ppp.c l2tpns.h config.h constants.h plugin.h util.h tbf.h \
-  cluster.h
-radius.o: radius.c md5.h constants.h l2tpns.h config.h plugin.h util.h
-ll.o: ll.c ll.h
-cluster.o: cluster.c l2tpns.h config.h cluster.h util.h tbf.h bgp.h
-arp.o: arp.c l2tpns.h config.h
+arp.o: arp.c dhcp6.h l2tpns.h
+cli.o: cli.c dhcp6.h l2tpns.h constants.h util.h cluster.h tbf.h ll.h \
+ bgp.h l2tplac.h
+cluster.o: cluster.c dhcp6.h l2tpns.h cluster.h util.h tbf.h pppoe.h \
+ bgp.h
 constants.o: constants.c constants.h
+control.o: control.c dhcp6.h l2tpns.h control.h
+icmp.o: icmp.c dhcp6.h l2tpns.h ipv6_u.h
+l2tpns.o: l2tpns.c md5.h dhcp6.h l2tpns.h cluster.h plugin.h ll.h \
+ constants.h control.h util.h tbf.h bgp.h l2tplac.h pppoe.h
 ll.o: ll.c ll.h
-control.o: control.c control.h
-util.o: util.c l2tpns.h config.h
-tbf.o: tbf.c l2tpns.h config.h util.h tbf.h
-bgp.o: bgp.c l2tpns.h config.h bgp.h util.h
-garden.so: garden.c l2tpns.h config.h plugin.h control.h
-autothrottle.so: autothrottle.c l2tpns.h config.h plugin.h control.h
-autosnoop.so: autosnoop.c l2tpns.h config.h plugin.h control.h
+md5.o: md5.c md5.h
+ppp.o: ppp.c dhcp6.h l2tpns.h constants.h plugin.h util.h tbf.h cluster.h \
+ l2tplac.h pppoe.h
+radius.o: radius.c md5.h constants.h dhcp6.h l2tpns.h plugin.h util.h \
+ cluster.h l2tplac.h pppoe.h
+tbf.o: tbf.c dhcp6.h l2tpns.h util.h tbf.h
+util.o: util.c dhcp6.h l2tpns.h bgp.h
+pppoe.o: pppoe.c dhcp6.h l2tpns.h cluster.h constants.h md5.h util.h
+l2tplac.o: l2tplac.c md5.h dhcp6.h l2tpns.h util.h cluster.h l2tplac.h \
+ pppoe.h
+dhcp6.o: dhcp6.c dhcp6.h l2tpns.h ipv6_u.h
+ipv6_u.o: ipv6_u.c ipv6_u.h
+bgp.o: bgp.c dhcp6.h l2tpns.h bgp.h util.h
+autosnoop.so: autosnoop.c dhcp6.h l2tpns.h plugin.h
+autothrottle.so: autothrottle.c dhcp6.h l2tpns.h plugin.h
+garden.so: garden.c dhcp6.h l2tpns.h plugin.h control.h
+sessionctl.so: sessionctl.c dhcp6.h l2tpns.h plugin.h control.h
+setrxspeed.so: setrxspeed.c dhcp6.h l2tpns.h plugin.h
+snoopctl.so: snoopctl.c dhcp6.h l2tpns.h plugin.h control.h
+stripdomain.so: stripdomain.c dhcp6.h l2tpns.h plugin.h
+throttlectl.so: throttlectl.c dhcp6.h l2tpns.h plugin.h control.h