Update debian changelog

[l2tpns.git] / Makefile

diff --git a/Makefile b/Makefile
index 8ac1656..fb12741 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -18,36 +18,37 @@ CC = gcc
 LD = gcc
 INCLUDES = -I.
 CPPFLAGS = $(INCLUDES) $(DEFINES)
 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
 
 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 \
 
 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

 
 PROGRAMS = l2tpns nsctl
 PLUGINS = autosnoop.so autothrottle.so garden.so sessionctl.so \
     setrxspeed.so snoopctl.so stripdomain.so throttlectl.so
 
 
 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 += -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
 
 DEFINES += -DBGP
 OBJS += bgp.o
 

-all: programs plugins tests
+all: programs plugins

 programs: $(PROGRAMS)
 plugins: $(PLUGINS)
 programs: $(PROGRAMS)
 plugins: $(PLUGINS)

-tests: $(TESTS)

 
 clean:
 
 clean:

-       rm -f *.o test/*.o $(PROGRAMS) $(PLUGINS) $(TESTS) Makefile.tmp Makefile.bak
+       rm -f *.o test/*.o $(PROGRAMS) $(PLUGINS) Makefile.tmp Makefile.bak

 
 depend:
        (sed -n 'p; /^## Dependencies: (autogenerated) ##/q' Makefile && \
 
 depend:
        (sed -n 'p; /^## Dependencies: (autogenerated) ##/q' Makefile && \


@@ -62,12 +63,6 @@ l2tpns: $(OBJS)
 nsctl: nsctl.o control.o
        $(LD) $(LDFLAGS) -o $@ $^ $(LDLIBS) $($@.LIBS)
 
 nsctl: nsctl.o control.o
        $(LD) $(LDFLAGS) -o $@ $^ $(LDLIBS) $($@.LIBS)
 

-generateload: test/generateload.o
-       $(LD) $(LDFLAGS) -o $@ $^ $(LDLIBS) $($@.LIBS)
-
-bounce: test/bounce.o
-       $(LD) $(LDFLAGS) -o $@ $^ $(LDLIBS) $($@.LIBS)
-

 %.o: %.c
        $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
 
 %.o: %.c
        $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
 


@@ -114,19 +109,24 @@ install: all
 
 ## Dependencies: (autogenerated) ##
 arp.o: arp.c l2tpns.h
 
 ## Dependencies: (autogenerated) ##
 arp.o: arp.c l2tpns.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
+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 pppoe.h bgp.h

 constants.o: constants.c constants.h
 control.o: control.c l2tpns.h control.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 \
 l2tpns.o: l2tpns.c md5.h l2tpns.h cluster.h plugin.h ll.h constants.h \

-  control.h util.h tbf.h bgp.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
 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
+ppp.o: ppp.c l2tpns.h constants.h plugin.h util.h tbf.h cluster.h \
+ l2tplac.h pppoe.h
+radius.o: radius.c md5.h constants.h l2tpns.h plugin.h util.h cluster.h \
+ l2tplac.h pppoe.h

 tbf.o: tbf.c l2tpns.h util.h tbf.h
 util.o: util.c l2tpns.h bgp.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

 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
 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