typo

[l2tpns.git] / Makefile

diff --git a/Makefile b/Makefile
index 5d61124..8bbbc42 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -7,15 +7,12 @@ man8dir = /usr/share/man/man8
 statedir = /var/lib/l2tpns
 
 DEFINES =
 statedir = /var/lib/l2tpns
 
 DEFINES =

-DEFINES += -DSTATISTICS
-DEFINES += -DSTAT_CALLS
-DEFINES += -DRINGBUFFER
-DEFINES += -DBGP

 DEFINES += -DLIBDIR='"$(libdir)"'
 DEFINES += -DETCDIR='"$(etcdir)"'
 DEFINES += -DSTATEDIR='"$(statedir)"'
 
 DEFINES += -DLIBDIR='"$(libdir)"'
 DEFINES += -DETCDIR='"$(etcdir)"'
 DEFINES += -DSTATEDIR='"$(statedir)"'
 

-OPTIM = -g
+OPTIM =
+OPTIM += -g

 OPTIM += -O3
 OPTIM += -funroll-loops
 OPTIM += -fomit-frame-pointer
 OPTIM += -O3
 OPTIM += -funroll-loops
 OPTIM += -fomit-frame-pointer


@@ -28,21 +25,34 @@ 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
 

-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.LIBS = -lm -lcli -ldl
+
+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

 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 
+
+DEFINES += -DSTATISTICS
+DEFINES += -DSTAT_CALLS
+DEFINES += -DRINGBUFFER
+
+DEFINES += -DBGP
+OBJS += bgp.o

 
 

-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 $(PROGRAMS) $(PLUGINS) $(TESTS) Makefile.tmp Makefile.bak

 
 depend:
        (sed -n 'p; /^## Dependencies: (autogenerated) ##/q' Makefile && \
 
 depend:
        (sed -n 'p; /^## Dependencies: (autogenerated) ##/q' Makefile && \


@@ -52,16 +62,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 $@ $<


@@ -81,7 +91,7 @@ install: all
        $(INSTALL) -m 0644 Docs/l2tpns.8 $(DESTDIR)$(man8dir)/l2tpns.8
        $(INSTALL) -m 0644 Docs/nsctl.8 $(DESTDIR)$(man8dir)/nsctl.8
 
        $(INSTALL) -m 0644 Docs/l2tpns.8 $(DESTDIR)$(man8dir)/l2tpns.8
        $(INSTALL) -m 0644 Docs/nsctl.8 $(DESTDIR)$(man8dir)/nsctl.8
 

-       gzip $(DESTDIR)$(man5dir)/*.5 $(DESTDIR)$(man8dir)/*.8
+       gzip --best $(DESTDIR)$(man5dir)/*.5 $(DESTDIR)$(man8dir)/*.8

 
        @if [ -f $(DESTDIR)$(etcdir)/startup-config ]; then \
                echo '***' Installing default config files in $(DESTDIR)$(etcdir) as .defaults; \
 
        @if [ -f $(DESTDIR)$(etcdir)/startup-config ]; then \
                echo '***' Installing default config files in $(DESTDIR)$(etcdir) as .defaults; \