*** empty log message ***

This commit is contained in:
bodea 2004-11-18 05:45:14 +00:00
parent 63be8dcf02
commit 1a0455f453
2 changed files with 13 additions and 9 deletions

View file

@ -28,18 +28,24 @@ INCLUDES = -I.
CPPFLAGS = $(INCLUDES) $(DEFINES) CPPFLAGS = $(INCLUDES) $(DEFINES)
CFLAGS = -Wall $(OPTIM) CFLAGS = -Wall $(OPTIM)
LDFLAGS = 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 \ 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 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 \ PLUGINS = garden.so throttlectl.so autothrottle.so snoopctl.so \
autosnoop.so stripdomain.so setrxspeed.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: clean:
rm -f *.o test/*.o $(TARGETS) Makefile.tmp Makefile.bak rm -f *.o test/*.o $(TARGETS) Makefile.tmp Makefile.bak
@ -52,16 +58,16 @@ depend:
mv Makefile.tmp Makefile mv Makefile.tmp Makefile
l2tpns: $(OBJS) 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 %.o: %.c
$(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $< $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<

View file

@ -231,8 +231,6 @@ void sigint(int signal);
void clean_shutdown(); void clean_shutdown();
void print_report(); void print_report();
pthread_t pthread_reader;
int ns = 0, nr = 0; int ns = 0, nr = 0;
int udpfd; int udpfd;
int t = 0; int t = 0;