use cli_error() for error messages and help

[l2tpns.git] / Makefile

diff --git a/Makefile b/Makefile
index e34031d..1235b0e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -7,34 +7,26 @@ man8dir = /usr/share/man/man8
 statedir = /var/lib/l2tpns
 
 DEFINES =
 statedir = /var/lib/l2tpns
 
 DEFINES =

-DEFINES += -DSTATISTICS
-DEFINES += -DSTAT_CALLS
-DEFINES += -DRINGBUFFER
-DEFINES += -DBGP

 DEFINES += -DLIBDIR='"$(libdir)"'
 DEFINES += -DETCDIR='"$(etcdir)"'
 DEFINES += -DLIBDIR='"$(libdir)"'
 DEFINES += -DETCDIR='"$(etcdir)"'

-DEFINES += -DSTATEDIR='"$(statedir)"'

 
 

-OPTIM = -g
+OPTIM =
+OPTIM += -g

 OPTIM += -O3
 OPTIM += -O3

-OPTIM += -funroll-loops
-OPTIM += -fomit-frame-pointer
-OPTIM += -finline-functions
-#OPTIM += -fstrength-reduce

 
 CC = gcc
 LD = gcc
 INCLUDES = -I.
 CPPFLAGS = $(INCLUDES) $(DEFINES)
 
 CC = gcc
 LD = gcc
 INCLUDES = -I.
 CPPFLAGS = $(INCLUDES) $(DEFINES)

-CFLAGS = -Wall $(OPTIM)
+CFLAGS = -Wall -Wformat-security -Wno-format-zero-length $(OPTIM)

 LDFLAGS =
 LDLIBS =
 INSTALL = install -c -D -o root -g root
 
 l2tpns.LIBS = -lm -lcli -ldl
 
 LDFLAGS =
 LDLIBS =
 INSTALL = install -c -D -o root -g root
 
 l2tpns.LIBS = -lm -lcli -ldl
 

-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
+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 = garden.so throttlectl.so autothrottle.so snoopctl.so \
 
 PROGRAMS = l2tpns nsctl
 PLUGINS = garden.so throttlectl.so autothrottle.so snoopctl.so \


@@ -42,13 +34,20 @@ PLUGINS = garden.so throttlectl.so autothrottle.so snoopctl.so \
 
 TESTS = generateload bounce 
 
 
 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:
 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 && \
 
 depend:
        (sed -n 'p; /^## Dependencies: (autogenerated) ##/q' Makefile && \


@@ -57,16 +56,16 @@ depend:
        mv Makefile Makefile.bak
        mv Makefile.tmp Makefile
 
        mv Makefile Makefile.bak
        mv Makefile.tmp Makefile
 

-l2tpns:        $(OBJS)
+l2tpns: $(OBJS)

        $(LD) $(LDFLAGS) -o $@ $^ $(LDLIBS) $($@.LIBS)
 
        $(LD) $(LDFLAGS) -o $@ $^ $(LDLIBS) $($@.LIBS)
 

-nsctl: nsctl.o control.o
+nsctl: nsctl.o control.o

        $(LD) $(LDFLAGS) -o $@ $^ $(LDLIBS) $($@.LIBS)
 
        $(LD) $(LDFLAGS) -o $@ $^ $(LDLIBS) $($@.LIBS)
 

-generateload:  test/generateload.o
+generateload: test/generateload.o

        $(LD) $(LDFLAGS) -o $@ $^ $(LDLIBS) $($@.LIBS)
 
        $(LD) $(LDFLAGS) -o $@ $^ $(LDLIBS) $($@.LIBS)
 

-bounce:        test/bounce.o
+bounce: test/bounce.o

        $(LD) $(LDFLAGS) -o $@ $^ $(LDLIBS) $($@.LIBS)
 
 %.o: %.c
        $(LD) $(LDFLAGS) -o $@ $^ $(LDLIBS) $($@.LIBS)
 
 %.o: %.c


@@ -87,7 +86,7 @@ install: all
        $(INSTALL) -m 0644 Docs/l2tpns.8 $(DESTDIR)$(man8dir)/l2tpns.8
        $(INSTALL) -m 0644 Docs/nsctl.8 $(DESTDIR)$(man8dir)/nsctl.8
 
        $(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 $(DESTDIR)$(man5dir)/*.5 $(DESTDIR)$(man8dir)/*.8

 
        @if [ -f $(DESTDIR)$(etcdir)/startup-config ]; then \
                echo '***' Installing default config files in $(DESTDIR)$(etcdir) as .defaults; \
 
        @if [ -f $(DESTDIR)$(etcdir)/startup-config ]; then \
                echo '***' Installing default config files in $(DESTDIR)$(etcdir) as .defaults; \


@@ -114,7 +113,6 @@ install: all
 
 ## Dependencies: (autogenerated) ##
 arp.o: arp.c l2tpns.h
 
 ## 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
 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


@@ -128,6 +126,7 @@ 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
 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

 garden.so: garden.c l2tpns.h plugin.h control.h
 throttlectl.so: throttlectl.c l2tpns.h plugin.h control.h
 autothrottle.so: autothrottle.c l2tpns.h plugin.h
 garden.so: garden.c l2tpns.h plugin.h control.h
 throttlectl.so: throttlectl.c l2tpns.h plugin.h control.h
 autothrottle.so: autothrottle.c l2tpns.h plugin.h