Cleaner way to configure

[mirror_iproute2.git] / Makefile

diff --git a/Makefile b/Makefile
index 05063e775462c495012498b1b8322254eb61dffc..fd758b92e4434af6b1cd5cb91db8ae4f0c658178 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,10 @@
-# Path to parent kernel include files directory
 DESTDIR=
-SBINDIR=/sbin
+SBINDIR=/usr/sbin
 CONFDIR=/etc/iproute2
 DOCDIR=/usr/doc/iproute2
 
-KERNEL_INCLUDE=/usr/src/linux/include
-LIBC_INCLUDE=/usr/include
+# Path to parent kernel include files directory
+KERNEL_INCLUDE:=/usr/include
 
 DEFINES= -DRESOLVE_HOSTNAMES
 
@@ -13,29 +12,15 @@ DEFINES= -DRESOLVE_HOSTNAMES
 LDLIBS=-lresolv
 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
 ADDLIB+=dnet_ntop.o dnet_pton.o
 
 #options for ipx
 ADDLIB+=ipx_ntop.o ipx_pton.o
 
-ifeq ($(LIBC_INCLUDE)/socketbits.h,$(wildcard $(LIBC_INCLUDE)/socketbits.h))
-  ifeq ($(LIBC_INCLUDE)/net/if_packet.h,$(wildcard $(LIBC_INCLUDE)/net/if_packet.h))
-    GLIBCFIX=-I../include-glibc -include ../include-glibc/glibc-bugs.h
-  endif
-endif
-ifeq ($(LIBC_INCLUDE)/bits/socket.h,$(wildcard $(LIBC_INCLUDE)/bits/socket.h))
-  GLIBCFIX=-I../include-glibc -I/usr/include/db3 -include ../include-glibc/glibc-bugs.h
-endif
-
-
 CC = gcc
 CCOPTS = -D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall -g
-CFLAGS = $(CCOPTS) $(GLIBCFIX) -I$(KERNEL_INCLUDE) -I../include $(DEFINES)
+CFLAGS = $(CCOPTS) -I$(KERNEL_INCLUDE) -I../include $(DEFINES)
 
 LDLIBS += -L../lib -lnetlink -lutil
 
@@ -43,35 +28,32 @@ SUBDIRS=lib ip tc misc
 
 LIBNETLINK=../lib/libnetlink.a ../lib/libutil.a
 
-all: check-kernel
-       @set -e; \
-       for i in $(SUBDIRS); \
-       do $(MAKE) -C $$i; done
+all: Config
+       @for i in $(SUBDIRS); \
+       do $(MAKE) $(MFLAGS) -C $$i; done
 
-check-kernel:
-ifeq ($(KERNEL_INCLUDE),)
-       @echo "Please, set correct KERNEL_INCLUDE"; false
-else
-       @set -e; \
-       if [ ! -r $(KERNEL_INCLUDE)/linux/autoconf.h ]; then \
-               echo "Please, compile the kernel first"; false; fi
-endif
+Config:
+       ./configure $(KERNEL_INCLUDE)
 
 install: all
        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/diffserv
        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
        @for i in $(SUBDIRS) doc; do $(MAKE) -C $$i install; done
        @cd etc/iproute2; for i in *; do \
-               if [ ! -e $(DESTDIR)$(CONFDIR)/$$i ]; then \
-                       echo install -m 0644 $$i $(DESTDIR)$(CONFDIR); \
-                       install -m 0644 $$i $(DESTDIR)$(CONFDIR); fi; done
+               if [ ! -e $(CONFDIR)/$$i ]; then \
+                       echo install -m 0644 $$i $(CONFDIR); \
+                       install -m 0644 $$i $(CONFDIR); fi; done
 
 clean:
-       for i in $(SUBDIRS) doc; \
-       do $(MAKE) -C $$i clean; done
+       @for i in $(SUBDIRS) doc; \
+       do $(MAKE) $(MFLAGS) -C $$i clean; done
+
+clobber: clean
+       rm -f Config
+
 
 .EXPORT_ALL_VARIABLES: