missing newline on backtrace log

[l2tpns.git] / Makefile

diff --git a/Makefile b/Makefile
index 9cd6ff5..156ff39 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -32,23 +32,23 @@ PROGRAMS = l2tpns nsctl
 PLUGINS = autosnoop.so autothrottle.so garden.so sessionctl.so \
     setrxspeed.so snoopctl.so stripdomain.so throttlectl.so
 
 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

-DEFINES += -DHAVE_EPOLL
+
+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 && \


@@ -63,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 $@ $<