Fix our tree for -Wmissing-include-dirs.

diff --git a/gnu/lib/gcc44/libsupc++/Makefile.src b/gnu/lib/gcc44/libsupc++/Makefile.src
index 39797c3..b32306f 100644 (file)
--- a/gnu/lib/gcc44/libsupc++/Makefile.src
+++ b/gnu/lib/gcc44/libsupc++/Makefile.src
@@ -4,7 +4,7 @@ CFLAGS+=        -DIN_GLIBCPP_V3 -DHAVE_CONFIG_H
 CXXFLAGS+=     -fno-implicit-templates -ffunction-sections -fdata-sections
 CXXFLAGS+=     -I${GCCDIR}/libstdc++-v3/libsupc++ 
 CXXFLAGS+=     -I${GCCDIR}/libstdc++-v3/include/c_std
-CXXFLAGS+=     -I${STOPDIR}/cc_prep/c++ -I.
+CXXFLAGS+=     -I.
 
 SRCS=  \
        array_type_info.cc \

diff --git a/gnu/lib/gcc47/libssp_nonshared/Makefile b/gnu/lib/gcc47/libssp_nonshared/Makefile
index 7db59b0..a5c8938 100644 (file)
--- a/gnu/lib/gcc47/libssp_nonshared/Makefile
+++ b/gnu/lib/gcc47/libssp_nonshared/Makefile
@@ -1,4 +1,3 @@
-CFLAGS+=       -I${.CURDIR}/libssp
 .include "../Makefile.inc"
 .PATH: ${GCCDIR}/libssp
 

diff --git a/gnu/sbin/lvm/Makefile b/gnu/sbin/lvm/Makefile
index a13cbe6..5150944 100644 (file)
--- a/gnu/sbin/lvm/Makefile
+++ b/gnu/sbin/lvm/Makefile
@@ -25,7 +25,7 @@ SRCS=         dumpconfig.c formats.c lvchange.c lvconvert.c lvcreate.c \
 
 CFLAGS+=       -D_XOPEN_SOURCE=600
 CFLAGS+=       -I${LVM2_DISTDIR}/lib -I${LVM2_DISTDIR}/include \
-               -I. -I${LIBDM_INCLUDE} -I${LVM2_DISTDIR}/tools \
+               -I. -I${LVM2_DISTDIR}/tools \
                -I${LIBDM_DISTDIR}
 
 CFLAGS+=       -DLVM_SHARED_PATH=\"$(BINDIR)/lvm\"

diff --git a/gnu/usr.bin/binutils221/Makefile.inc0 b/gnu/usr.bin/binutils221/Makefile.inc0
index 5ff07b9..894dd16 100644 (file)
--- a/gnu/usr.bin/binutils221/Makefile.inc0
+++ b/gnu/usr.bin/binutils221/Makefile.inc0
@@ -18,7 +18,6 @@ CFLAGS+= -I.
 CFLAGS+= -I${.CURDIR}/${BINUTIL_ARCH}
 .endif
 CFLAGS+= -I${.CURDIR}
-CFLAGS+= -I${.CURDIR}/${RELTOP}/libbfd/${BINUTIL_ARCH}
 CFLAGS+= -I${SRCDIR}/include
 
 DPADD= ${RELTOP}/libbinutils/libbinutils.a

diff --git a/gnu/usr.bin/binutils222/Makefile.inc0 b/gnu/usr.bin/binutils222/Makefile.inc0
index 8f3c7ec..b98fcf0 100644 (file)
--- a/gnu/usr.bin/binutils222/Makefile.inc0
+++ b/gnu/usr.bin/binutils222/Makefile.inc0
@@ -18,7 +18,6 @@ CFLAGS+= -I.
 CFLAGS+= -I${.CURDIR}/${BINUTIL_ARCH}
 .endif
 CFLAGS+= -I${.CURDIR}
-CFLAGS+= -I${.CURDIR}/${RELTOP}/libbfd/${BINUTIL_ARCH}
 CFLAGS+= -I${SRCDIR}/include
 
 DPADD= ${RELTOP}/libbinutils/libbinutils.a

diff --git a/gnu/usr.bin/cc44/libbackend/Makefile b/gnu/usr.bin/cc44/libbackend/Makefile
index 74d63b9..6e76d9c 100644 (file)
--- a/gnu/usr.bin/cc44/libbackend/Makefile
+++ b/gnu/usr.bin/cc44/libbackend/Makefile
@@ -1,7 +1,7 @@
 .include "../Makefile.inc"
 .include "../Makefile.langs"
 
-CFLAGS+=       -I${.CURDIR}/../config -I.
+CFLAGS+=       -I.
 CFLAGS+=       -DTARGET_NAME=\"${target_machine}\"
 
 LIB=           backend

diff --git a/gnu/usr.bin/gdb/gdb/Makefile b/gnu/usr.bin/gdb/gdb/Makefile
index c6a8353..e0be1ed 100644 (file)
--- a/gnu/usr.bin/gdb/gdb/Makefile
+++ b/gnu/usr.bin/gdb/gdb/Makefile
@@ -2,7 +2,7 @@ PROG=   gdb
 SRCS=  gdb.c
 
 CFLAGS+= -I${.OBJDIR}/../libgdb -I${.CURDIR}/../libgdb -I${BASEDIR}/include
-CFLAGS+= -I${BASEDIR}/bfd -I${BASEDIR}/gdb -I${BASEDIR}/gdb/config
+CFLAGS+= -I${BASEDIR}/bfd -I${BASEDIR}/gdb
 CFLAGS+= -I${BASEDIR}/gdb/common -I${.CURDIR}/../libbfd
 CFLAGS+= -I${.OBJDIR}/../libbfd
 

diff --git a/gnu/usr.bin/gdb/kgdb/Makefile b/gnu/usr.bin/gdb/kgdb/Makefile
index 86a285c..0528b1d 100644 (file)
--- a/gnu/usr.bin/gdb/kgdb/Makefile
+++ b/gnu/usr.bin/gdb/kgdb/Makefile
@@ -2,7 +2,7 @@ PROG=   kgdb
 SRCS=  kgdb.c kthr.c kld.c trgt.c trgt_${MACHINE_ARCH}.c
 
 CFLAGS+= -I${.OBJDIR}/../libgdb -I${.CURDIR}/../libgdb -I${BASEDIR}/include
-CFLAGS+= -I${BASEDIR}/bfd -I${BASEDIR}/gdb -I${BASEDIR}/gdb/config -I${.CURDIR}/../libbfd
+CFLAGS+= -I${BASEDIR}/bfd -I${BASEDIR}/gdb -I${.CURDIR}/../libbfd
 CFLAGS+= -I${.OBJDIR}/../libbfd -I${BASEDIR}/gdb/common
 CFLAGS+= -D_KERNEL_STRUCTURES
 

diff --git a/gnu/usr.bin/gdb/libgdb/Makefile b/gnu/usr.bin/gdb/libgdb/Makefile
index bea9d93..0b584c7 100644 (file)
--- a/gnu/usr.bin/gdb/libgdb/Makefile
+++ b/gnu/usr.bin/gdb/libgdb/Makefile
@@ -13,7 +13,7 @@ CONTRIBDIR=   ${BASEDIR}/gdb
 VERSION!= cat ${CONTRIBDIR}/version.in
 
 CFLAGS+= -I${.OBJDIR} -I${.CURDIR} -I${BASEDIR}/include -I${BASEDIR}/bfd
-CFLAGS+= -I${CONTRIBDIR} -I${CONTRIBDIR}/config -I${CONTRIBDIR}/common
+CFLAGS+= -I${CONTRIBDIR} -I${CONTRIBDIR}/common
 CFLAGS+= -I${BASEDIR}/libdecnumber
 CFLAGS+= -I${.CURDIR}/../libbfd -I${.OBJDIR}/../libbfd
 CFLAGS+= -I${BASEDIR} 

diff --git a/lib/libprop/Makefile b/lib/libprop/Makefile
index c4c40b5..705b67c 100644 (file)
--- a/lib/libprop/Makefile
+++ b/lib/libprop/Makefile
@@ -6,7 +6,7 @@ PROPLIBDIR=${.CURDIR}/../../sys/libprop
 .PATH: ${PROPLIBDIR}
 
 CFLAGS+=-D_LIBPROP
-CFLAGS+=-D_REENTRANT -I${.CURDIR}/../../sys -I${.CURDIR}/../../../lib/libc/include
+CFLAGS+=-D_REENTRANT -I${.CURDIR}/../../sys
 #LDADD+=-lpthread
 #DPADD+=${LIBPTHREAD}
 

diff --git a/sys/boot/dloader/Makefile b/sys/boot/dloader/Makefile
index de1fb22..e1d38a1 100644 (file)
--- a/sys/boot/dloader/Makefile
+++ b/sys/boot/dloader/Makefile
@@ -36,7 +36,6 @@ CFLAGS+=      -m32 -I.
 .endif
 
 CFLAGS+=       -I${.CURDIR}
-CFLAGS+=       -I${.CURDIR}/${MACHINE_ARCH}
 CFLAGS+=       -I${.CURDIR}/../common
 
 .if defined(REALLY_X86_64)

diff --git a/sys/boot/pc32/loader/Makefile b/sys/boot/pc32/loader/Makefile
index 8e33e6a..b575aef 100644 (file)
--- a/sys/boot/pc32/loader/Makefile
+++ b/sys/boot/pc32/loader/Makefile
@@ -26,7 +26,7 @@ HAVE_PNP=     yes
 HAVE_ISABUS=   yes
 
 BOOT_DLOADER=  yes
-CFLAGS+=       -I${.CURDIR}/../../dloader -I${.CURDIR}/../../dloader/i386
+CFLAGS+=       -I${.CURDIR}/../../dloader
 .if exists(${.OBJDIR}/../../dloader/libdloader.a)
 LIBDLOADER=    ${.OBJDIR}/../../dloader/libdloader.a
 .else

diff --git a/sys/boot/pc32/loader_tftp/Makefile b/sys/boot/pc32/loader_tftp/Makefile
index 0784dc6..b6c30a3 100644 (file)
--- a/sys/boot/pc32/loader_tftp/Makefile
+++ b/sys/boot/pc32/loader_tftp/Makefile
@@ -26,7 +26,7 @@ HAVE_PNP=     yes
 HAVE_ISABUS=   yes
 
 BOOT_DLOADER=  yes
-CFLAGS+=       -I${.CURDIR}/../../dloader -I${.CURDIR}/../../dloader/i386
+CFLAGS+=       -I${.CURDIR}/../../dloader
 .if exists(${.OBJDIR}/../../dloader/libdloader.a)
 LIBDLOADER=    ${.OBJDIR}/../../dloader/libdloader.a
 .else

diff --git a/usr.sbin/802_11/wpa_supplicant/Makefile b/usr.sbin/802_11/wpa_supplicant/Makefile
index 389d42b..df47797 100644 (file)
--- a/usr.sbin/802_11/wpa_supplicant/Makefile
+++ b/usr.sbin/802_11/wpa_supplicant/Makefile
@@ -25,7 +25,6 @@ MAN=  wpa_supplicant.8 wpa_supplicant.conf.5
 #FILES=        wpa_supplicant.conf
 #.endif
 
-CFLAGS+=-I${WPA_SUPPLICANT_DISTDIR}
 CFLAGS+=-I${WPA_DISTDIR}/src/drivers
 CFLAGS+=-I${WPA_DISTDIR}/src/rsn_supp
 

diff --git a/usr.sbin/setkey/Makefile b/usr.sbin/setkey/Makefile
index 6ff22fd..d594024 100644 (file)
--- a/usr.sbin/setkey/Makefile
+++ b/usr.sbin/setkey/Makefile
@@ -39,7 +39,6 @@ WARNS?=       2
 # ipsec_strerror.c is for avoiding shlib reference to non-exported function.
 .PATH: ${.CURDIR}/../../lib/libipsec ${.CURDIR}/../../sys/netproto/key
 SRCS+= pfkey.c pfkey_dump.c key_debug.c ipsec_strerror.c
-CFLAGS+=-I${.CURDIR}/../../lib/libipsec -I${.CURDIR}/../../sys/netkey
 
 SRCS+=y.tab.h
 y.tab.h: parse.y