X-Git-Url: http://git.sameswireless.fr/l2tpns.git/blobdiff_plain/27e17ad461cfd47b29b6d8c1ec2183302d226988..816f36c46fa2a34fa318402505ccc3989d406fe8:/Makefile diff --git a/Makefile b/Makefile index d5c9a48..8ac1656 100644 --- a/Makefile +++ b/Makefile @@ -2,55 +2,52 @@ 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 += -DSTATISTICS -DEFINES += -DSTAT_CALLS -DEFINES += -DRINGBUFFER -DEFINES += -DBGP DEFINES += -DLIBDIR='"$(libdir)"' DEFINES += -DETCDIR='"$(etcdir)"' -DEFINES += -DSTATEDIR='"$(statedir)"' -OPTIM = -g +OPTIM = +OPTIM += -g OPTIM += -O3 -OPTIM += -funroll-loops -OPTIM += -fomit-frame-pointer -OPTIM += -finline-functions -#OPTIM += -fstrength-reduce CC = gcc LD = gcc INCLUDES = -I. CPPFLAGS = $(INCLUDES) $(DEFINES) -CFLAGS = -Wall $(OPTIM) -LDFLAGS = -rdynamic -LDLIBS = -lm +CFLAGS = -Wall -Wformat-security -Wno-format-zero-length $(OPTIM) +LDFLAGS = +LDLIBS = INSTALL = install -c -D -o root -g root -OBJS = arp.o \ - bgp.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 - -PLUGINS = garden.so autothrottle.so autosnoop.so stripdomain.so -TARGETS = l2tpns nsctl generateload bounce $(PLUGINS) - -all: $(TARGETS) +l2tpns.LIBS = -lm -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 + +PROGRAMS = l2tpns nsctl +PLUGINS = autosnoop.so autothrottle.so garden.so sessionctl.so \ + setrxspeed.so snoopctl.so stripdomain.so throttlectl.so + +TESTS = generateload bounce + +DEFINES += -DSTATISTICS +DEFINES += -DSTAT_CALLS +DEFINES += -DRINGBUFFER + +DEFINES += -DBGP +OBJS += bgp.o + +all: programs plugins tests +programs: $(PROGRAMS) +plugins: $(PLUGINS) +tests: $(TESTS) clean: - rm -f *.o test/*.o $(TARGETS) Makefile.tmp Makefile.bak + rm -f *.o test/*.o $(PROGRAMS) $(PLUGINS) $(TESTS) Makefile.tmp Makefile.bak depend: (sed -n 'p; /^## Dependencies: (autogenerated) ##/q' Makefile && \ @@ -59,17 +56,17 @@ depend: mv Makefile Makefile.bak mv Makefile.tmp Makefile -l2tpns: $(OBJS) - $(LD) $(LDFLAGS) -o $@ $^ $(LDLIBS) -lcli -ldl +l2tpns: $(OBJS) + $(LD) $(LDFLAGS) -o $@ $^ $(LDLIBS) $($@.LIBS) -nsctl: nsctl.o control.o - $(LD) $(LDFLAGS) -o $@ $^ $(LDLIBS) +nsctl: nsctl.o control.o + $(LD) $(LDFLAGS) -o $@ $^ $(LDLIBS) $($@.LIBS) -generateload: test/generateload.o - $(LD) $(LDFLAGS) -o $@ $^ # -lpthread +generateload: test/generateload.o + $(LD) $(LDFLAGS) -o $@ $^ $(LDLIBS) $($@.LIBS) -bounce: test/bounce.o - $(LD) $(LDFLAGS) -o $@ $^ +bounce: test/bounce.o + $(LD) $(LDFLAGS) -o $@ $^ $(LDLIBS) $($@.LIBS) %.o: %.c $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $< @@ -77,42 +74,50 @@ bounce: test/bounce.o %.so: %.c $(CC) -fPIC -shared $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ $< -# install config files only if a startup-config does not exist yet -# this does not interfere when building rpms or debs and makes -# fast upgrading via make install possible - install: all $(INSTALL) -m 0755 l2tpns $(DESTDIR)$(bindir)/l2tpns $(INSTALL) -m 0755 nsctl $(DESTDIR)$(bindir)/nsctl - @if [ -f $(DESTDIR)$(etcdir)/startup-config ]; then \ - echo '***' Installing default config files in $(DESTDIR)$(etcdir) as .defaults; \ + + $(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; \ - else \ - echo '***' Installing default config files in $(DESTDIR)$(etcdir) - remember to adjust them; \ - suffix=; \ - fi; \ - $(INSTALL) -m 0600 etc/startup-config.default $(DESTDIR)$(etcdir)/startup-config$$suffix; \ - $(INSTALL) -m 0644 etc/ip_pool.default $(DESTDIR)$(etcdir)/ip_pool$$suffix; \ - $(INSTALL) -m 0600 etc/users.default $(DESTDIR)$(etcdir)/users$$suffix - - for plugin in $(PLUGINS); do \ + fi; \ + echo $(INSTALL) -m $$mode etc/$$config.default $(DESTDIR)$(etcdir)/$$config$$suffix; \ + $(INSTALL) -m $$mode etc/$$config.default $(DESTDIR)$(etcdir)/$$config$$suffix; \ + done + + @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 \ + @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 -.PHONY: all clean depend +.PHONY: all clean depend install ## Dependencies: (autogenerated) ## arp.o: arp.c l2tpns.h -bgp.o: bgp.c l2tpns.h bgp.h util.h cli.o: cli.c l2tpns.h util.h cluster.h tbf.h ll.h bgp.h cluster.o: cluster.c l2tpns.h cluster.h util.h tbf.h bgp.h constants.o: constants.c constants.h -control.o: control.c control.h +control.o: control.c l2tpns.h control.h icmp.o: icmp.c l2tpns.h l2tpns.o: l2tpns.c md5.h l2tpns.h cluster.h plugin.h ll.h constants.h \ control.h util.h tbf.h bgp.h @@ -122,7 +127,12 @@ ppp.o: ppp.c l2tpns.h constants.h plugin.h util.h tbf.h cluster.h radius.o: radius.c md5.h constants.h l2tpns.h plugin.h util.h tbf.o: tbf.c l2tpns.h util.h tbf.h util.o: util.c l2tpns.h bgp.h +bgp.o: bgp.c l2tpns.h bgp.h util.h +autosnoop.so: autosnoop.c l2tpns.h plugin.h +autothrottle.so: autothrottle.c l2tpns.h plugin.h garden.so: garden.c l2tpns.h plugin.h control.h -autothrottle.so: autothrottle.c l2tpns.h plugin.h control.h -autosnoop.so: autosnoop.c l2tpns.h plugin.h control.h +sessionctl.so: sessionctl.c l2tpns.h plugin.h control.h +setrxspeed.so: setrxspeed.c l2tpns.h plugin.h +snoopctl.so: snoopctl.c l2tpns.h plugin.h control.h stripdomain.so: stripdomain.c l2tpns.h plugin.h +throttlectl.so: throttlectl.c l2tpns.h plugin.h control.h