X-Git-Url: http://git.sameswireless.fr/l2tpns.git/blobdiff_plain/f5071c422df06800e59bb1be0218c0f6ec2ba831..refs/heads/use-netlink:/Makefile?ds=sidebyside diff --git a/Makefile b/Makefile index 5d61124..ea7e8df 100644 --- a/Makefile +++ b/Makefile @@ -7,42 +7,48 @@ 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) +CFLAGS = -Wall -Wformat-security -Wno-format-zero-length $(OPTIM) LDFLAGS = -LDLIBS = -lm +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 +l2tpns.LIBS = -lm -lcli -ldl -PLUGINS = garden.so throttlectl.so autothrottle.so snoopctl.so \ - autosnoop.so stripdomain.so setrxspeed.so +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 -TARGETS = l2tpns nsctl generateload bounce $(PLUGINS) +PROGRAMS = l2tpns nsctl +PLUGINS = autosnoop.so autothrottle.so garden.so sessionctl.so \ + setrxspeed.so snoopctl.so stripdomain.so throttlectl.so -all: $(TARGETS) +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: - rm -f *.o test/*.o $(TARGETS) Makefile.tmp Makefile.bak + rm -f *.o test/*.o $(PROGRAMS) $(PLUGINS) Makefile.tmp Makefile.bak depend: (sed -n 'p; /^## Dependencies: (autogenerated) ##/q' Makefile && \ @@ -51,17 +57,11 @@ depend: mv Makefile Makefile.bak mv Makefile.tmp Makefile -l2tpns: $(OBJS) - $(LD) $(LDFLAGS) -o $@ $^ $(LDLIBS) -lcli -ldl - -nsctl: nsctl.o control.o - $(LD) $(LDFLAGS) -o $@ $^ $(LDLIBS) - -generateload: test/generateload.o - $(LD) $(LDFLAGS) -o $@ $^ # -lpthread +l2tpns: $(OBJS) + $(LD) $(LDFLAGS) -o $@ $^ $(LDLIBS) $($@.LIBS) -bounce: test/bounce.o - $(LD) $(LDFLAGS) -o $@ $^ +nsctl: nsctl.o control.o + $(LD) $(LDFLAGS) -o $@ $^ $(LDLIBS) $($@.LIBS) %.o: %.c $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $< @@ -69,10 +69,6 @@ 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 @@ -81,26 +77,31 @@ install: all $(INSTALL) -m 0644 Docs/l2tpns.8 $(DESTDIR)$(man8dir)/l2tpns.8 $(INSTALL) -m 0644 Docs/nsctl.8 $(DESTDIR)$(man8dir)/nsctl.8 - gzip $(DESTDIR)$(man5dir)/*.5 $(DESTDIR)$(man8dir)/*.8 + gzip --best --force $(DESTDIR)$(man5dir)/*.5 $(DESTDIR)$(man8dir)/*.8 - @if [ -f $(DESTDIR)$(etcdir)/startup-config ]; then \ - echo '***' Installing default config files in $(DESTDIR)$(etcdir) as .defaults; \ + @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 + 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 \ + @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 @@ -108,8 +109,7 @@ install: all ## 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 +cli.o: cli.c l2tpns.h constants.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 l2tpns.h control.h @@ -119,13 +119,15 @@ l2tpns.o: l2tpns.c md5.h l2tpns.h cluster.h plugin.h ll.h constants.h \ ll.o: ll.c ll.h md5.o: md5.c md5.h 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 +radius.o: radius.c md5.h constants.h l2tpns.h plugin.h util.h cluster.h tbf.o: tbf.c l2tpns.h util.h tbf.h util.o: util.c l2tpns.h bgp.h -garden.so: garden.c l2tpns.h plugin.h control.h -throttlectl.so: throttlectl.c l2tpns.h plugin.h control.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 +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 -autosnoop.so: autosnoop.c l2tpns.h plugin.h stripdomain.so: stripdomain.c l2tpns.h plugin.h -setrxspeed.so: setrxspeed.c l2tpns.h plugin.h +throttlectl.so: throttlectl.c l2tpns.h plugin.h control.h