remove old compatability code

[l2tpns.git] / Makefile

diff --git a/Makefile b/Makefile
index 8515c86..156ff39 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -32,24 +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
 

+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
 

-doit = echo $(1); $(1)
-
-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 && \


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


@@ -95,18 +88,21 @@ install: all
                cmp -s etc/$$config.default $(DESTDIR)$(etcdir)/$$config && continue; \
                suffix=.default; \
            fi; \
                cmp -s etc/$$config.default $(DESTDIR)$(etcdir)/$$config && continue; \
                suffix=.default; \
            fi; \

-           $(call doit,$(INSTALL) -m $$mode etc/$$config.default $(DESTDIR)$(etcdir)/$$config$$suffix); \
+           echo $(INSTALL) -m $$mode etc/$$config.default $(DESTDIR)$(etcdir)/$$config$$suffix; \
+           $(INSTALL) -m $$mode etc/$$config.default $(DESTDIR)$(etcdir)/$$config$$suffix; \

        done
 
        @for plugin in $(PLUGINS); \
        do \
        done
 
        @for plugin in $(PLUGINS); \
        do \

-               $(call doit,$(INSTALL) -m 0755 $$plugin $(DESTDIR)$(libdir)/$$plugin); \
+               echo $(INSTALL) -m 0755 $$plugin $(DESTDIR)$(libdir)/$$plugin; \
+               $(INSTALL) -m 0755 $$plugin $(DESTDIR)$(libdir)/$$plugin; \

        done
 
        @if [ -z $(DESTDIR) ] && [ ! -e /dev/net/tun ]; \
        then \
                mkdir /dev/net; \
        done
 
        @if [ -z $(DESTDIR) ] && [ ! -e /dev/net/tun ]; \
        then \
                mkdir /dev/net; \

-               $(call doit,mknod /dev/net/tun c 10 200); \
+               echo mknod /dev/net/tun c 10 200; \
+               mknod /dev/net/tun c 10 200; \

        fi
 
 .PHONY: all clean depend install
        fi
 
 .PHONY: all clean depend install