From: bodea <bodea>
Date: Thu, 18 Nov 2004 05:45:14 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: release_2_0_8~11
X-Git-Url: http://git.sameswireless.fr/l2tpns.git/commitdiff_plain/1a0455f45367060bb6974e9c5d85478a687484fe?ds=sidebyside;hp=63be8dcf02ed17fd18b44cb63cfd5796691d44f7

*** empty log message ***
---

diff --git a/Makefile b/Makefile
index 5d61124..e34031d 100644
--- a/Makefile
+++ b/Makefile
@@ -28,18 +28,24 @@ INCLUDES = -I.
 CPPFLAGS = $(INCLUDES) $(DEFINES)
 CFLAGS = -Wall $(OPTIM)
 LDFLAGS =
-LDLIBS = -lm
+LDLIBS =
 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
 
+PROGRAMS = l2tpns nsctl
 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
@@ -52,16 +58,16 @@ depend:
 	mv Makefile.tmp Makefile
 
 l2tpns:	$(OBJS)
-	$(LD) $(LDFLAGS) -o $@ $^ $(LDLIBS) -lcli -ldl
+	$(LD) $(LDFLAGS) -o $@ $^ $(LDLIBS) $($@.LIBS)
 
 nsctl:	nsctl.o control.o
-	$(LD) $(LDFLAGS) -o $@ $^ $(LDLIBS)
+	$(LD) $(LDFLAGS) -o $@ $^ $(LDLIBS) $($@.LIBS)
 
 generateload:	test/generateload.o
-	$(LD) $(LDFLAGS) -o $@ $^ # -lpthread
+	$(LD) $(LDFLAGS) -o $@ $^ $(LDLIBS) $($@.LIBS)
 
 bounce:	test/bounce.o
-	$(LD) $(LDFLAGS) -o $@ $^
+	$(LD) $(LDFLAGS) -o $@ $^ $(LDLIBS) $($@.LIBS)
 
 %.o: %.c
 	$(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
diff --git a/test/generateload.c b/test/generateload.c
index c3a40b6..5119920 100644
--- a/test/generateload.c
+++ b/test/generateload.c
@@ -231,8 +231,6 @@ void sigint(int signal);
 void clean_shutdown();
 void print_report();
 
-pthread_t pthread_reader;
-
 int ns = 0, nr = 0;
 int udpfd;
 int t = 0;