From: Brendan O'Dea <bod@optus.net>
Date: Mon, 12 Jul 2004 14:49:01 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: 2.2.1-2fdn3.1~19^2^2~1^2~435
X-Git-Url: http://git.sameswireless.fr/l2tpns.git/commitdiff_plain/54c6a93a277ebf5bc434c06fa4d25039e75dbf56?ds=inline;hp=b72e4840c1f8e935eb351d4c6bc339876a926469

*** empty log message ***
---

diff --git a/Makefile b/Makefile
index e3b7855..6cdd6fe 100644
--- a/Makefile
+++ b/Makefile
@@ -7,8 +7,8 @@ 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
+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
 
@@ -61,11 +55,17 @@ install: all
 		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