matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Cleaner way to configure 

(Logical change 1.33)
This commit is contained in:
osdl.net!shemminger 2004-06-25 21:14:22 +00:00
parent 449bf1f339
commit adff36d765
4 changed files with 41 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
Makefile
View File

@ -1,11 +1,10 @@
# Path to parent kernel include files directory
DESTDIR= DESTDIR=
SBINDIR=/usr/sbin SBINDIR=/usr/sbin
CONFDIR=/etc/iproute2 CONFDIR=/etc/iproute2
DOCDIR=/usr/doc/iproute2 DOCDIR=/usr/doc/iproute2
KERNEL_INCLUDE=/usr/include # Path to parent kernel include files directory
LIBC_INCLUDE=/usr/include KERNEL_INCLUDE:=/usr/include
DEFINES= -DRESOLVE_HOSTNAMES DEFINES= -DRESOLVE_HOSTNAMES
@ -13,10 +12,6 @@ DEFINES= -DRESOLVE_HOSTNAMES
LDLIBS=-lresolv LDLIBS=-lresolv
ADDLIB= ADDLIB=
#options if you compile with libc5, and without a bind>=4.9.4 libresolv
#LDLIBS=
#ADDLIB=inet_ntop.o inet_pton.o
#options for decnet #options for decnet
ADDLIB+=dnet_ntop.o dnet_pton.o ADDLIB+=dnet_ntop.o dnet_pton.o
@ -25,7 +20,7 @@ ADDLIB+=ipx_ntop.o ipx_pton.o
CC = gcc CC = gcc
CCOPTS = -D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall -g CCOPTS = -D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall -g
CFLAGS = $(CCOPTS) -I$(KERNEL_INCLUDE) -I../include -I/usr/include/db41 $(DEFINES) CFLAGS = $(CCOPTS) -I$(KERNEL_INCLUDE) -I../include $(DEFINES)
LDLIBS += -L../lib -lnetlink -lutil LDLIBS += -L../lib -lnetlink -lutil
@ -33,25 +28,32 @@ SUBDIRS=lib ip tc misc
LIBNETLINK=../lib/libnetlink.a ../lib/libutil.a LIBNETLINK=../lib/libnetlink.a ../lib/libutil.a
all: all: Config
for i in $(SUBDIRS); \ @for i in $(SUBDIRS); \
do $(MAKE) -C $$i; done do $(MAKE) $(MFLAGS) -C $$i; done
Config:
./configure $(KERNEL_INCLUDE)
install: all install: all
install -m 0755 -d $(DESTDIR)$(SBINDIR) install -m 0755 -d $(DESTDIR)$(SBINDIR)
install -m 0755 -d $(DESTDIR)$(CONFDIR) install -m 0755 -d $(CONFDIR)
install -m 0755 -d $(DESTDIR)$(DOCDIR)/examples install -m 0755 -d $(DESTDIR)$(DOCDIR)/examples
install -m 0755 -d $(DESTDIR)$(DOCDIR)/examples/diffserv install -m 0755 -d $(DESTDIR)$(DOCDIR)/examples/diffserv
install -m 0644 README.iproute2+tc $(shell find examples -type f -maxdepth 1) $(DESTDIR)$(DOCDIR)/examples install -m 0644 README.iproute2+tc $(shell find examples -type f -maxdepth 1) $(DESTDIR)$(DOCDIR)/examples
install -m 0644 $(shell echo examples/diffserv/*) $(DESTDIR)$(DOCDIR)/examples/diffserv install -m 0644 $(shell echo examples/diffserv/*) $(DESTDIR)$(DOCDIR)/examples/diffserv
@for i in $(SUBDIRS) doc; do $(MAKE) -C $$i install; done @for i in $(SUBDIRS) doc; do $(MAKE) -C $$i install; done
@cd etc/iproute2; for i in *; do \ @cd etc/iproute2; for i in *; do \
if [ ! -e $(DESTDIR)$(CONFDIR)/$$i ]; then \ if [ ! -e $(CONFDIR)/$$i ]; then \
echo install -m 0644 $$i $(DESTDIR)$(CONFDIR); \ echo install -m 0644 $$i $(CONFDIR); \
install -m 0644 $$i $(DESTDIR)$(CONFDIR); fi; done install -m 0644 $$i $(CONFDIR); fi; done
clean: clean:
for i in $(SUBDIRS) doc; \ @for i in $(SUBDIRS) doc; \
do $(MAKE) -C $$i clean; done do $(MAKE) $(MFLAGS) -C $$i clean; done
clobber: clean
rm -f Config
.EXPORT_ALL_VARIABLES: .EXPORT_ALL_VARIABLES:

13
misc/Makefile
View File

@ -8,6 +8,17 @@ RTSTATOBJ=rtstat.o
ALLOBJ=$(SSOBJ) $(NSTATOBJ) $(IFSTATOBJ) $(RTACCTOBJ) $(ARPDOBJ) $(RTSTATOBJ) ALLOBJ=$(SSOBJ) $(NSTATOBJ) $(IFSTATOBJ) $(RTACCTOBJ) $(ARPDOBJ) $(RTSTATOBJ)
TARGETS=ss nstat ifstat rtacct arpd rtstat TARGETS=ss nstat ifstat rtacct arpd rtstat
include ../Config
ifeq ($(SS_CONFIG_VEGAS),y)
DEFINES += -DHAVE_TCP_VEGAS
endif
ifeq ($(SS_CONFIG_DRS),y)
DEFINES += -DHAVE_TCP_DRS
endif
all: $(TARGETS) all: $(TARGETS)
ss: $(SSOBJ) $(LIBUTIL) ss: $(SSOBJ) $(LIBUTIL)
@ -22,7 +33,7 @@ rtacct: $(RTACCTOBJ)
$(CC) $(CFLAGS) $(LDFLAGS) -o rtacct $(RTACCTOBJ) $(LIBNETLINK) -lm $(CC) $(CFLAGS) $(LDFLAGS) -o rtacct $(RTACCTOBJ) $(LIBNETLINK) -lm
arpd: $(ARPDOBJ) arpd: $(ARPDOBJ)
$(CC) $(CFLAGS) $(LDFLAGS) -o arpd $(ARPDOBJ) $(LIBNETLINK) -ldb-4.1 $(CC) $(CFLAGS) -I$(DBM_INCLUDE) $(LDFLAGS) -o arpd $(ARPDOBJ) $(LIBNETLINK) -ldb
rtstat: $(RTSTATOBJ) rtstat: $(RTSTATOBJ)
$(CC) $(CFLAGS) $(LDFLAGS) -o rtstat $(RTSTATOBJ) $(CC) $(CFLAGS) $(LDFLAGS) -o rtstat $(RTSTATOBJ)

4
misc/ss.c
View File

@ -1339,12 +1339,14 @@ void tcp_show_info(struct nlmsghdr *nlh, struct tcpdiagmsg *r)
if (info->tcpi_snd_ssthresh < 0xFFFF) if (info->tcpi_snd_ssthresh < 0xFFFF)
printf(" ssthresh:%d", info->tcpi_snd_ssthresh); printf(" ssthresh:%d", info->tcpi_snd_ssthresh);
#if LINUX_VERSION_CODE >= 0x20607 #ifdef HAVE_TCP_DRS
if (info->tcpi_rcv_rtt) if (info->tcpi_rcv_rtt)
printf(" rcv_rtt:%g", (double) info->tcpi_rcv_rtt/1000); printf(" rcv_rtt:%g", (double) info->tcpi_rcv_rtt/1000);
if (info->tcpi_rcv_space) if (info->tcpi_rcv_space)
printf(" rcv_space:%d", info->tcpi_rcv_space); printf(" rcv_space:%d", info->tcpi_rcv_space);
#endif
#ifdef HAVE_TCP_VEGAS
if (tb[TCPDIAG_VEGASINFO]) { if (tb[TCPDIAG_VEGASINFO]) {
const struct tcpvegas_info *vinfo const struct tcpvegas_info *vinfo
= RTA_DATA(tb[TCPDIAG_VEGASINFO]); = RTA_DATA(tb[TCPDIAG_VEGASINFO]);

10
tc/Makefile
View File

@ -1,5 +1,7 @@
TCOBJ=tc.o tc_qdisc.o tc_class.o tc_filter.o tc_util.o m_police.o m_estimator.o TCOBJ=tc.o tc_qdisc.o tc_class.o tc_filter.o tc_util.o m_police.o m_estimator.o
include ../Config
TCMODULES := TCMODULES :=
TCMODULES += q_fifo.o TCMODULES += q_fifo.o
TCMODULES += q_sfq.o TCMODULES += q_sfq.o
@ -15,11 +17,13 @@ TCMODULES += q_dsmark.o
TCMODULES += q_gred.o TCMODULES += q_gred.o
TCMODULES += f_tcindex.o TCMODULES += f_tcindex.o
TCMODULES += q_ingress.o TCMODULES += q_ingress.o
TCMODULES += q_atm.o
LDLIBS += -latm
TCMODULES += q_delay.o ifeq ($(TC_CONFIG_ATM),y)
TCMODULES += q_atm.o
LDLIBS += -latm
endif
TCMODULES += q_netsim.o
TCMODULES += q_csz.o TCMODULES += q_csz.o
TCMODULES += q_htb.o TCMODULES += q_htb.o
TCMODULES += q_hpfq.o TCMODULES += q_hpfq.o