projects / packages / iproute2.git / blame
| Commit | Line | Data |
|---|---|---|
| e42218cf PS |
1 | --- iproute2/Makefile.orig 2002-01-16 00:30:32.000000000 +0100 |
| 2 | +++ iproute2/Makefile 2004-04-04 22:19:16.964825648 +0200 | |
| 3 | @@ -4,13 +4,11 @@ | |
| 4 | CONFDIR=/etc/iproute2 | |
| 5 | DOCDIR=/usr/doc/iproute2 | |
| 6 | ||
| 7 | -KERNEL_INCLUDE=/usr/src/linux/include | |
| 8 | -LIBC_INCLUDE=/usr/include | |
| 9 | ||
| 10 | DEFINES= -DRESOLVE_HOSTNAMES | |
| 11 | ||
| 12 | #options if you have a bind>=4.9.4 libresolv (or, maybe, glibc) | |
| 13 | -LDLIBS=-lresolv | |
| 14 | +LDLIBS= | |
| 15 | ADDLIB= | |
| 16 | ||
| 17 | #options if you compile with libc5, and without a bind>=4.9.4 libresolv | |
| 18 | @@ -23,19 +21,9 @@ | |
| 19 | #options for ipx | |
| 20 | ADDLIB+=ipx_ntop.o ipx_pton.o | |
| 21 | ||
| 22 | -ifeq ($(LIBC_INCLUDE)/socketbits.h,$(wildcard $(LIBC_INCLUDE)/socketbits.h)) | |
| 23 | - ifeq ($(LIBC_INCLUDE)/net/if_packet.h,$(wildcard $(LIBC_INCLUDE)/net/if_packet.h)) | |
| 24 | - GLIBCFIX=-I../include-glibc -include ../include-glibc/glibc-bugs.h | |
| 25 | - endif | |
| 26 | -endif | |
| 27 | -ifeq ($(LIBC_INCLUDE)/bits/socket.h,$(wildcard $(LIBC_INCLUDE)/bits/socket.h)) | |
| 28 | - GLIBCFIX=-I../include-glibc -I/usr/include/db3 -include ../include-glibc/glibc-bugs.h | |
| 29 | -endif | |
| 30 | - | |
| 31 | - | |
| 32 | CC = gcc | |
| 33 | -CCOPTS = -D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall -g | |
| 34 | -CFLAGS = $(CCOPTS) $(GLIBCFIX) -I$(KERNEL_INCLUDE) -I../include $(DEFINES) | |
| 35 | +CCOPTS = -D_GNU_SOURCE $(OPT) -Wstrict-prototypes -Wall -g | |
| 36 | +CFLAGS = $(CCOPTS) -I../include $(DEFINES) | |
| 37 | ||
| 38 | LDLIBS += -L../lib -lnetlink -lutil | |
| 39 | ||
| 40 | @@ -43,20 +31,10 @@ | |
| 41 | ||
| 42 | LIBNETLINK=../lib/libnetlink.a ../lib/libutil.a | |
| 43 | ||
| 44 | -all: check-kernel | |
| 45 | - @set -e; \ | |
| 46 | +all: | |
| 47 | for i in $(SUBDIRS); \ | |
| 48 | do $(MAKE) -C $$i; done | |
| 49 | ||
| 50 | -check-kernel: | |
| 51 | -ifeq ($(KERNEL_INCLUDE),) | |
| 52 | - @echo "Please, set correct KERNEL_INCLUDE"; false | |
| 53 | -else | |
| 54 | - @set -e; \ | |
| 55 | - if [ ! -r $(KERNEL_INCLUDE)/linux/autoconf.h ]; then \ | |
| 56 | - echo "Please, compile the kernel first"; false; fi | |
| 57 | -endif | |
| 58 | - | |
| 59 | install: all | |
| 60 | install -m 0755 -d $(DESTDIR)$(SBINDIR) | |
| 61 | install -m 0755 -d $(DESTDIR)$(CONFDIR) | |
| 62 | --- iproute2/misc/Makefile.orig 2002-01-16 00:30:32.000000000 +0100 | |
| 63 | +++ iproute2/misc/Makefile 2004-04-04 22:23:44.718120960 +0200 | |
| 64 | @@ -6,7 +6,7 @@ | |
| 65 | RTSTATOBJ=rtstat.o | |
| 66 | ||
| 67 | ALLOBJ=$(SSOBJ) $(NSTATOBJ) $(IFSTATOBJ) $(RTACCTOBJ) $(ARPDOBJ) $(RTSTATOBJ) | |
| 68 | -TARGETS=ss nstat ifstat rtacct arpd rtstat | |
| 69 | +TARGETS=ss nstat ifstat rtacct rtstat | |
| 70 | ||
| 71 | all: $(TARGETS) | |
| 72 |