*** empty log message ***

diff --git a/Makefile b/Makefile
index 5d61124..e34031d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -28,18 +28,24 @@ INCLUDES = -I.
 CPPFLAGS = $(INCLUDES) $(DEFINES)
 CFLAGS = -Wall $(OPTIM)
 LDFLAGS =
 CPPFLAGS = $(INCLUDES) $(DEFINES)
 CFLAGS = -Wall $(OPTIM)
 LDFLAGS =

-LDLIBS = -lm
+LDLIBS =

 INSTALL = install -c -D -o root -g root
 
 INSTALL = install -c -D -o root -g root
 

+l2tpns.LIBS = -lm -lcli -ldl
+

 OBJS = arp.o bgp.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
 
 OBJS = arp.o bgp.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

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

-TARGETS = l2tpns nsctl generateload bounce $(PLUGINS)
+TESTS = generateload bounce 

 
 

-all: $(TARGETS)
+all: programs plugins tests
+programs: $(PROGRAMS)
+plugins: $(PLUGINS)
+tests: $(TESTS)

 
 clean:
        rm -f *.o test/*.o $(TARGETS) Makefile.tmp Makefile.bak
 
 clean:
        rm -f *.o test/*.o $(TARGETS) Makefile.tmp Makefile.bak


@@ -52,16 +58,16 @@ depend:
        mv Makefile.tmp Makefile
 
 l2tpns:        $(OBJS)
        mv Makefile.tmp Makefile
 
 l2tpns:        $(OBJS)

-       $(LD) $(LDFLAGS) -o $@ $^ $(LDLIBS) -lcli -ldl
+       $(LD) $(LDFLAGS) -o $@ $^ $(LDLIBS) $($@.LIBS)

 
 nsctl: nsctl.o control.o
 
 nsctl: nsctl.o control.o

-       $(LD) $(LDFLAGS) -o $@ $^ $(LDLIBS)
+       $(LD) $(LDFLAGS) -o $@ $^ $(LDLIBS) $($@.LIBS)

 
 generateload:  test/generateload.o
 
 generateload:  test/generateload.o

-       $(LD) $(LDFLAGS) -o $@ $^ # -lpthread
+       $(LD) $(LDFLAGS) -o $@ $^ $(LDLIBS) $($@.LIBS)

 
 bounce:        test/bounce.o
 
 bounce:        test/bounce.o

-       $(LD) $(LDFLAGS) -o $@ $^
+       $(LD) $(LDFLAGS) -o $@ $^ $(LDLIBS) $($@.LIBS)

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

diff --git a/test/generateload.c b/test/generateload.c
index c3a40b6..5119920 100644 (file)
--- a/test/generateload.c
+++ b/test/generateload.c
@@ -231,8 +231,6 @@ void sigint(int signal);
 void clean_shutdown();
 void print_report();
 
 void clean_shutdown();
 void print_report();
 

-pthread_t pthread_reader;
-

 int ns = 0, nr = 0;
 int udpfd;
 int t = 0;
 int ns = 0, nr = 0;
 int udpfd;
 int t = 0;