From: bodea <bodea>
Date: Thu, 9 Dec 2004 00:52:35 +0000 (+0000)
Subject: use gzip --best for man pages
X-Git-Tag: release_2_0_13~18
X-Git-Url: http://git.sameswireless.fr/l2tpns.git/commitdiff_plain/42d19d01a233d5f16300563478e121c804d1c41b

use gzip --best for man pages
re-order DEFINES to better allow for optional features which add to $(OBJS)
---

diff --git a/Makefile b/Makefile
index 940a505..8bbbc42 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
@@ -33,8 +30,8 @@ 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 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 \
@@ -42,6 +39,13 @@ PLUGINS = garden.so throttlectl.so autothrottle.so snoopctl.so \
 
 TESTS = generateload bounce 
 
+DEFINES += -DSTATISTICS
+DEFINES += -DSTAT_CALLS
+DEFINES += -DRINGBUFFER
+
+DEFINES += -DBGP
+OBJS += bgp.o
+
 all: programs plugins tests
 programs: $(PROGRAMS)
 plugins: $(PLUGINS)
@@ -87,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; \