X-Git-Url: http://git.sameswireless.fr/l2tpns.git/blobdiff_plain/6069adbcfc3a285b26344e610446c92f70eebf3a..38e422ebb66c5de3811adce8b675ba5415d598b9:/Makefile?ds=sidebyside

diff --git a/Makefile b/Makefile
index e3b7855..b9007fa 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
 
@@ -47,12 +41,25 @@ depend:
 	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
-	$(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
+	@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)/l2tpns.ip_pool;     \
+		$(INSTALL) -D -o root -g root -m 0600 etc/users.default $(etcdir)/l2tpns.users; \
+	fi
+
 	for plugin in $(PLUGINS); do \
 		$(INSTALL) -D -o root -g root -m 0755 $$plugin $(libdir)/$$plugin; \
 	done
@@ -61,11 +68,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