finish incorporating ipv6 patches

[l2tpns.git] / Makefile

diff --git a/Makefile b/Makefile
index 8bbbc42..1a44ddd 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -14,16 +14,12 @@ DEFINES += -DSTATEDIR='"$(statedir)"'
 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 =
 INSTALL = install -c -D -o root -g root
@@ -61,16 +57,16 @@ depend:
        mv Makefile Makefile.bak
        mv Makefile.tmp Makefile
 
-l2tpns:        $(OBJS)
+l2tpns: $(OBJS)
        $(LD) $(LDFLAGS) -o $@ $^ $(LDLIBS) $($@.LIBS)
 
-nsctl: nsctl.o control.o
+nsctl: nsctl.o control.o
        $(LD) $(LDFLAGS) -o $@ $^ $(LDLIBS) $($@.LIBS)
 
-generateload:  test/generateload.o
+generateload: test/generateload.o
        $(LD) $(LDFLAGS) -o $@ $^ $(LDLIBS) $($@.LIBS)
 
-bounce:        test/bounce.o
+bounce: test/bounce.o
        $(LD) $(LDFLAGS) -o $@ $^ $(LDLIBS) $($@.LIBS)
 
 %.o: %.c
@@ -118,7 +114,6 @@ 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
 cluster.o: cluster.c l2tpns.h cluster.h util.h tbf.h bgp.h
 constants.o: constants.c constants.h
@@ -132,6 +127,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
+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