Cleaner way to configure
(Logical change 1.33)
diff --git a/Makefile b/Makefile
index 4e23369..fd758b9 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,10 @@
-# Path to parent kernel include files directory
DESTDIR=
SBINDIR=/usr/sbin
CONFDIR=/etc/iproute2
DOCDIR=/usr/doc/iproute2
-KERNEL_INCLUDE=/usr/include
-LIBC_INCLUDE=/usr/include
+# Path to parent kernel include files directory
+KERNEL_INCLUDE:=/usr/include
DEFINES= -DRESOLVE_HOSTNAMES
@@ -13,10 +12,6 @@
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
@@ -25,7 +20,7 @@
CC = gcc
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
@@ -33,25 +28,32 @@
LIBNETLINK=../lib/libnetlink.a ../lib/libutil.a
-all:
- for i in $(SUBDIRS); \
- do $(MAKE) -C $$i; done
+all: Config
+ @for i in $(SUBDIRS); \
+ do $(MAKE) $(MFLAGS) -C $$i; done
+
+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: