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