fix for -v from Juergen Kammer

[l2tpns.git] / Makefile

diff --git a/Makefile b/Makefile
index 8af2656..6cdd6fe 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,14 +1,14 @@
-PREFIX=
-bindir = $(PREFIX)/usr/sbin
-etcdir = $(PREFIX)/etc/l2tpns
-libdir = $(PREFIX)/usr/lib/l2tpns
+DESTDIR =
+bindir = $(DESTDIR)/usr/sbin
+etcdir = $(DESTDIR)/etc/l2tpns
+libdir = $(DESTDIR)/usr/lib/l2tpns
 
 CC = gcc
-DEFINES= -DBGP -DRINGBUFFER -DSTAT_CALLS -DSTATISTICS
-OPTIM=-g -O3 -funroll-loops -fomit-frame-pointer -finline-functions
-CFLAGS=-Wall $(OPTIM) $(DEFINES)
-LDFLAGS = 
-LIBS = -lm -ldl -lcli
+DEFINES = -DBGP -DRINGBUFFER -DSTAT_CALLS -DSTATISTICS
+OPTIM = -g -O3 -funroll-loops -fomit-frame-pointer -finline-functions
+CFLAGS = -Wall $(OPTIM) $(DEFINES)
+LDFLAGS = -rdynamic
+LIBS = -lm
 INSTALL = /usr/bin/install -c
 
 OBJS=  md5.o \
@@ -31,12 +31,6 @@ PLUGINS=garden.so autothrottle.so autosnoop.so
 
 all:   l2tpns nsctl $(PLUGINS)
 
-l2tpns:        $(OBJS)
-       $(CC) $(CFLAGS) -o $@ $^ $(LIBS) $(DEFS)
-
-nsctl: nsctl.o control.o
-       $(CC) $(CFLAGS) -o $@ $^ $(DEFS)
-
 clean:
        /bin/rm -f *.o *.so l2tpns nsctl
 
@@ -50,22 +44,28 @@ depend:
 install: all
        $(INSTALL) -D -o root -g root -m 0755 l2tpns $(bindir)/l2tpns
        $(INSTALL) -D -o root -g root -m 0755 nsctl $(bindir)/nsctl
-       $(INSTALL) -D -o root -g root -m 0600 etc/l2tpns.cfg.default $(etcdir)/l2tpns.cfg
+       $(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)/l2tpns.ip_pool
        $(INSTALL) -D -o root -g root -m 0600 etc/users.default $(etcdir)/l2tpns.users
-       for PLUGIN in $(PLUGINS); do \
-               $(INSTALL) -D -o root -g root -m 0755 $(PLUGIN) $(libdir)/$(PLUGIN); \
+       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
+
+nsctl: nsctl.o control.o
+       $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS)
+
 %.o: %.c
        $(CC) -c $(CFLAGS) -o $@ $<
 
 %.so: %.c
-       $(CC) -fPIC -shared $(CFLAGS) -o $@ $< $(LDFLAGS) $(LIBS) $(LIBPATH)
+       $(CC) -fPIC -shared $(CFLAGS) -o $@ $< $(LDFLAGS) $(LIBS)
 
 .PHONY: all clean depend