$(call) seems to break expaniion on older (3.79) versions of make

[l2tpns.git] / Makefile

diff --git a/Makefile b/Makefile
index fd33fc0..8ac1656 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -29,8 +29,8 @@ 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
 
 PROGRAMS = l2tpns nsctl
     ll.o md5.o ppp.o radius.o tbf.o util.o
 
 PROGRAMS = l2tpns nsctl

-PLUGINS = garden.so throttlectl.so autothrottle.so snoopctl.so \
-    autosnoop.so stripdomain.so setrxspeed.so
+PLUGINS = autosnoop.so autothrottle.so garden.so sessionctl.so \
+    setrxspeed.so snoopctl.so stripdomain.so throttlectl.so

 
 TESTS = generateload bounce 
 
 
 TESTS = generateload bounce 
 


@@ -41,8 +41,6 @@ DEFINES += -DRINGBUFFER
 DEFINES += -DBGP
 OBJS += bgp.o
 
 DEFINES += -DBGP
 OBJS += bgp.o
 

-doit = echo $(1); $(1)
-

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


@@ -95,18 +93,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


@@ -127,10 +128,11 @@ 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
 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
+autosnoop.so: autosnoop.c l2tpns.h plugin.h

 autothrottle.so: autothrottle.c l2tpns.h plugin.h
 autothrottle.so: autothrottle.c l2tpns.h plugin.h

+garden.so: garden.c l2tpns.h plugin.h control.h
+sessionctl.so: sessionctl.c l2tpns.h plugin.h control.h
+setrxspeed.so: setrxspeed.c l2tpns.h plugin.h

 snoopctl.so: snoopctl.c l2tpns.h plugin.h control.h
 snoopctl.so: snoopctl.c l2tpns.h plugin.h control.h

-autosnoop.so: autosnoop.c l2tpns.h plugin.h

 stripdomain.so: stripdomain.c l2tpns.h plugin.h
 stripdomain.so: stripdomain.c l2tpns.h plugin.h

-setrxspeed.so: setrxspeed.c l2tpns.h plugin.h
+throttlectl.so: throttlectl.c l2tpns.h plugin.h control.h