X-Git-Url: http://git.sameswireless.fr/l2tpns.git/blobdiff_plain/bf0a00f106b55399a0e335e7626a8c41c416ae0b..aa77d4f89aa291e851c9be8a64ecfdb1434e83c9:/Makefile

diff --git a/Makefile b/Makefile
index 3c203c1..673c41f 100644
--- a/Makefile
+++ b/Makefile
@@ -7,15 +7,12 @@ man8dir = /usr/share/man/man8
 statedir = /var/lib/l2tpns
 
 DEFINES =
-DEFINES += -DSTATISTICS
-DEFINES += -DSTAT_CALLS
-DEFINES += -DRINGBUFFER
-DEFINES += -DBGP
 DEFINES += -DLIBDIR='"$(libdir)"'
 DEFINES += -DETCDIR='"$(etcdir)"'
 DEFINES += -DSTATEDIR='"$(statedir)"'
 
-OPTIM = -g
+OPTIM =
+OPTIM += -g
 OPTIM += -O3
 OPTIM += -funroll-loops
 OPTIM += -fomit-frame-pointer
@@ -26,33 +23,36 @@ CC = gcc
 LD = gcc
 INCLUDES = -I.
 CPPFLAGS = $(INCLUDES) $(DEFINES)
-CFLAGS = -Wall $(OPTIM)
+CFLAGS = -Wall -Wno-format-zero-length $(OPTIM)
 LDFLAGS =
-LDLIBS = -lm
+LDLIBS =
 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
-
-PLUGINS = garden.so autothrottle.so autosnoop.so stripdomain.so setrxspeed.so
-TARGETS = l2tpns nsctl generateload bounce $(PLUGINS)
-
-all: $(TARGETS)
+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
+
+TESTS = generateload bounce 
+
+DEFINES += -DSTATISTICS
+DEFINES += -DSTAT_CALLS
+DEFINES += -DRINGBUFFER
+
+DEFINES += -DBGP
+OBJS += bgp.o
+
+all: programs plugins tests
+programs: $(PROGRAMS)
+plugins: $(PLUGINS)
+tests: $(TESTS)
 
 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 && \
@@ -62,16 +62,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 $@ $<
@@ -91,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
 
-	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; \
@@ -100,6 +100,7 @@ install: all
 		echo '***' Installing default config files in $(DESTDIR)$(etcdir) - remember to adjust them; \
 		suffix=; \
 	fi; \
+
 	$(INSTALL) -m 0600 etc/startup-config.default $(DESTDIR)$(etcdir)/startup-config$$suffix; \
 	$(INSTALL) -m 0644 etc/ip_pool.default $(DESTDIR)$(etcdir)/ip_pool$$suffix; \
 	$(INSTALL) -m 0600 etc/users.default $(DESTDIR)$(etcdir)/users$$suffix
@@ -117,7 +118,6 @@ install: all
 
 ## Dependencies: (autogenerated) ##
 arp.o: arp.c l2tpns.h
-bgp.o: bgp.c l2tpns.h bgp.h util.h
 cli.o: cli.c l2tpns.h util.h cluster.h tbf.h ll.h bgp.h
 cluster.o: cluster.c l2tpns.h cluster.h util.h tbf.h bgp.h
 constants.o: constants.c constants.h
@@ -131,8 +131,11 @@ ppp.o: ppp.c l2tpns.h constants.h plugin.h util.h tbf.h cluster.h
 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
 garden.so: garden.c l2tpns.h plugin.h control.h
+throttlectl.so: throttlectl.c l2tpns.h plugin.h control.h
 autothrottle.so: autothrottle.c l2tpns.h plugin.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
 setrxspeed.so: setrxspeed.c l2tpns.h plugin.h