From: Brendan O'Dea <bod@optus.net>
Date: Fri, 29 Oct 2004 04:02:24 +0000 (+0000)
Subject: clean up paths
X-Git-Tag: 2.2.1-2fdn3.1~19^2^2~1^2~391
X-Git-Url: http://git.sameswireless.fr/l2tpns.git/commitdiff_plain/a475f25c8ae25b7905f6e0abfef722530fcfce02

clean up paths
---

diff --git a/Makefile b/Makefile
index 8f64ef2..cfd6e16 100644
--- a/Makefile
+++ b/Makefile
@@ -1,112 +1,128 @@
 DESTDIR =
-bindir = $(DESTDIR)/usr/sbin
-etcdir = $(DESTDIR)/etc/l2tpns
-libdir = $(DESTDIR)/usr/lib/l2tpns
+bindir = /usr/sbin
+etcdir = /etc/l2tpns
+libdir = /usr/lib/l2tpns
+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 += -O3
+OPTIM += -funroll-loops
+OPTIM += -fomit-frame-pointer
+OPTIM += -finline-functions
+#OPTIM += -fstrength-reduce
 
 CC = gcc
-DEFINES = -DBGP -DRINGBUFFER -DSTAT_CALLS -DSTATISTICS
-OPTIM = -g -O3 -funroll-loops -fomit-frame-pointer -finline-functions
-CFLAGS = -Wall $(OPTIM) $(DEFINES)
+LD = gcc
+INCLUDES = -I.
+CPPFLAGS = $(INCLUDES) $(DEFINES)
+CFLAGS = -Wall $(OPTIM)
 LDFLAGS = -rdynamic
-LIBS = -lm
-INSTALL = /usr/bin/install -c
+LDLIBS = -lm
+INSTALL = install -c -D -o root -g root
 
-OBJS=	md5.o \
-	icmp.o \
+OBJS =	arp.o \
+	bgp.o \
 	cli.o \
-	l2tpns.o \
-	ppp.o \
-	radius.o \
-	ll.o \
 	cluster.o \
-	arp.o \
 	constants.o \
-	ll.o \
 	control.o \
-	util.o \
+	icmp.o \
+	l2tpns.o \
+	ll.o \
+	md5.o \
+	ppp.o \
+	radius.o \
 	tbf.o \
-	bgp.o \
+	util.o
 
-PLUGINS=garden.so autothrottle.so autosnoop.so stripdomain.so
-TARGETS=l2tpns nsctl generateload bounce $(PLUGINS)
+PLUGINS = garden.so autothrottle.so autosnoop.so stripdomain.so
+TARGETS = l2tpns nsctl generateload bounce $(PLUGINS)
 
-all:	$(TARGETS)
+all: $(TARGETS)
 
 clean:
-	/bin/rm -f *.o *.so $(TARGETS)
+	rm -f *.o $(TARGETS) Makefile.tmp Makefile.bak
 
 depend:
 	(sed -n 'p; /^## Dependencies: (autogenerated) ##/q' Makefile && \
-	    gcc -MM $(DEFINES) $(OBJS:.o=.c) && \
-	    gcc -MM $(DEFINES) $(PLUGINS:.so=.c) | sed 's/\.o/.so/') >Makefile.tmp
+	    gcc -MM $(CPPFLAGS) $(OBJS:.o=.c) && \
+	    gcc -MM $(CPPFLAGS) $(PLUGINS:.so=.c) | sed 's/\.o/.so/') >Makefile.tmp
 	mv Makefile Makefile.bak
 	mv Makefile.tmp Makefile
 
-# install config files only if a startup-config does not exist yet JK 20040713
-#  this does not interfere when building rpms or debs and makes
-#  fast upgrading via make install possible
-
-install: all
-	$(INSTALL) -D -o root -g root -m 0755 l2tpns $(bindir)/l2tpns
-	$(INSTALL) -D -o root -g root -m 0755 nsctl $(bindir)/nsctl
-	@if [ -f $(etcdir)/startup-config ]; then \
-		echo '***' Installing default config files in $(etcdir) as .defaults; \
-		$(INSTALL) -D -o root -g root -m 0600 etc/startup-config.default $(etcdir)/startup-config.default; \
-		$(INSTALL) -D -o root -g root -m 0644 etc/ip_pool.default $(etcdir)/ip_pool.default; \
-		$(INSTALL) -D -o root -g root -m 0600 etc/users.default $(etcdir)/users.default; \
-	else    \
-		echo '***' Installing default config files in $(etcdir) - remember to adjust them; \
-		$(INSTALL) -D -o root -g root -m 0600 etc/startup-config.default $(etcdir)/startup-config;      \
-		$(INSTALL) -D -o root -g root -m 0644 etc/ip_pool.default $(etcdir)/ip_pool;     \
-		$(INSTALL) -D -o root -g root -m 0600 etc/users.default $(etcdir)/users; \
-	fi
-
-	for plugin in $(PLUGINS); do \
-		$(INSTALL) -D -o root -g root -m 0755 $$plugin $(libdir)/$$plugin; \
-	done
-	if [ ! -e /dev/net/tun ]; then \
-		mkdir /dev/net; \
-		mknod /dev/net/tun c 10 200; \
-	fi
-
 l2tpns:	$(OBJS)
-	$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS) -lcli -ldl
+	$(LD) $(LDFLAGS) -o $@ $^ $(LDLIBS) -lcli -ldl
 
 nsctl:	nsctl.o control.o
-	$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS)
+	$(LD) $(LDFLAGS) -o $@ $^ $(LDLIBS)
 
 generateload:	test/generateload.o
-	$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS)
+	$(LD) $(LDFLAGS) -o $@ $^ # -lpthread
 
 bounce:	test/bounce.o
-	$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS)
+	$(LD) $(LDFLAGS) -o $@ $^
 
 %.o: %.c
-	$(CC) -c $(CFLAGS) -o $@ $<
+	$(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
 
 %.so: %.c
-	$(CC) -fPIC -shared $(CFLAGS) -o $@ $< $(LDFLAGS) $(LIBS)
+	$(CC) -fPIC -shared $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ $<
+
+# install config files only if a startup-config does not exist yet
+# this does not interfere when building rpms or debs and makes
+# fast upgrading via make install possible
+
+install: all
+	$(INSTALL) -m 0755 l2tpns $(DESTDIR)$(bindir)/l2tpns
+	$(INSTALL) -m 0755 nsctl $(DESTDIR)$(bindir)/nsctl
+	@if [ -f $(DESTDIR)$(etcdir)/startup-config ]; then \
+		echo '***' Installing default config files in $(DESTDIR)$(etcdir) as .defaults; \
+		suffix=.default; \
+	else \
+		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
+
+	for plugin in $(PLUGINS); do \
+		$(INSTALL) -m 0755 $$plugin $(DESTDIR)$(libdir)/$$plugin; \
+	done
+
+	if [ -z $(DESTDIR) ] && [ ! -e /dev/net/tun ]; then \
+		mkdir /dev/net; \
+		mknod /dev/net/tun c 10 200; \
+	fi
 
 .PHONY: all clean depend
 
 ## Dependencies: (autogenerated) ##
-md5.o: md5.c md5.h
-icmp.o: icmp.c l2tpns.h config.h
-cli.o: cli.c l2tpns.h config.h util.h cluster.h tbf.h ll.h bgp.h
-l2tpns.o: l2tpns.c md5.h l2tpns.h config.h cluster.h plugin.h ll.h \
-  constants.h control.h util.h tbf.h bgp.h
-ppp.o: ppp.c l2tpns.h config.h constants.h plugin.h util.h tbf.h \
-  cluster.h
-radius.o: radius.c md5.h constants.h l2tpns.h config.h plugin.h util.h
-ll.o: ll.c ll.h
-cluster.o: cluster.c l2tpns.h config.h cluster.h util.h tbf.h bgp.h
-arp.o: arp.c l2tpns.h config.h
+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
-ll.o: ll.c ll.h
 control.o: control.c control.h
-util.o: util.c l2tpns.h config.h
-tbf.o: tbf.c l2tpns.h config.h util.h tbf.h
-bgp.o: bgp.c l2tpns.h config.h bgp.h util.h
-garden.so: garden.c l2tpns.h config.h plugin.h control.h
-autothrottle.so: autothrottle.c l2tpns.h config.h plugin.h control.h
-autosnoop.so: autosnoop.c l2tpns.h config.h plugin.h control.h
+icmp.o: icmp.c l2tpns.h
+l2tpns.o: l2tpns.c md5.h l2tpns.h cluster.h plugin.h ll.h constants.h \
+  control.h util.h tbf.h bgp.h
+ll.o: ll.c ll.h
+md5.o: md5.c md5.h
+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
+garden.so: garden.c l2tpns.h plugin.h control.h
+autothrottle.so: autothrottle.c l2tpns.h plugin.h control.h
+autosnoop.so: autosnoop.c l2tpns.h plugin.h control.h
+stripdomain.so: stripdomain.c l2tpns.h plugin.h
diff --git a/config.h b/config.h
deleted file mode 100644
index bd17966..0000000
--- a/config.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#define LIBDIR "/usr/lib/l2tpns"
-#define ETCDIR "/etc/l2tpns"
-#define BINDIR "/usr/sbin"
-#define DATADIR "/tmp"