Merge from master

[l2tpns.git] / Makefile

diff --git a/Makefile b/Makefile
index 36ba2e1..7280139 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -18,15 +18,15 @@ CC = gcc
 LD = gcc
 INCLUDES = -I.
 CPPFLAGS = $(INCLUDES) $(DEFINES)
-CFLAGS = -Wall -Wformat-security -Wno-format-zero-length $(OPTIM)
+CFLAGS = -Wall -Wformat-security $(OPTIM)
 LDFLAGS =
 LDLIBS =
 INSTALL = install -c -D -o root -g root
 
-l2tpns.LIBS = -lm -lcli -ldl
+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
+    ll.o md5.o ppp.o radius.o tbf.o util.o pppoe.o l2tplac.o grpsess.o
 
 PROGRAMS = l2tpns nsctl
 PLUGINS = autosnoop.so autothrottle.so garden.so sessionctl.so \
@@ -43,9 +43,6 @@ endif
 DEFINES += -DBGP
 OBJS += bgp.o
 
-DEFINES += -DLAC
-OBJS += l2tplac.o
-
 all: programs plugins
 programs: $(PROGRAMS)
 plugins: $(PLUGINS)
@@ -114,22 +111,24 @@ install: all
 arp.o: arp.c l2tpns.h
 cli.o: cli.c l2tpns.h constants.h util.h cluster.h tbf.h ll.h bgp.h \
  l2tplac.h
-cluster.o: cluster.c l2tpns.h cluster.h util.h tbf.h bgp.h
+cluster.o: cluster.c l2tpns.h cluster.h util.h tbf.h pppoe.h bgp.h
 constants.o: constants.c constants.h
 control.o: control.c l2tpns.h control.h
-icmp.o: icmp.c l2tpns.h
+icmp.o: icmp.c l2tpns.h pppoe.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 l2tplac.h
+ control.h util.h tbf.h bgp.h l2tplac.h pppoe.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 \
- l2tplac.h
+ l2tplac.h pppoe.h
 radius.o: radius.c md5.h constants.h l2tpns.h plugin.h util.h cluster.h \
- l2tplac.h
+ l2tplac.h pppoe.h
 tbf.o: tbf.c l2tpns.h util.h tbf.h
 util.o: util.c l2tpns.h bgp.h
+pppoe.o: pppoe.c l2tpns.h cluster.h constants.h md5.h util.h
+l2tplac.o: l2tplac.c md5.h l2tpns.h util.h cluster.h l2tplac.h pppoe.h
+grpsess.o: grpsess.c l2tpns.h util.h cluster.h bgp.h
 bgp.o: bgp.c l2tpns.h bgp.h util.h
-l2tplac.o: l2tplac.c md5.h l2tpns.h util.h l2tplac.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