summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
authorTed Unangst <tedu@cvs.openbsd.org>2013-03-30 07:25:21 +0000
committerTed Unangst <tedu@cvs.openbsd.org>2013-03-30 07:25:21 +0000
commitae0a4df442c666eb5055ecb2bd61bf11fe88714a (patch)
tree3ebb5fbc5fe4b74ad3348c24e5df211adf7e1ce6 /sys/arch
parent70f0c8435e6508f7fb891e14aee5bf3e90bbdc76 (diff)
reorder include search directories. cuts lookups by quite a bit.
ok deraadt miod
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/alpha/conf/Makefile.alpha4
-rw-r--r--sys/arch/amd64/conf/Makefile.amd644
-rw-r--r--sys/arch/armish/conf/Makefile.armish4
-rw-r--r--sys/arch/aviion/conf/Makefile.aviion4
-rw-r--r--sys/arch/beagle/conf/Makefile.beagle4
-rw-r--r--sys/arch/hp300/conf/Makefile.hp3004
-rw-r--r--sys/arch/hppa/conf/Makefile.hppa4
-rw-r--r--sys/arch/hppa64/conf/Makefile.hppa644
-rw-r--r--sys/arch/i386/conf/Makefile.i3864
-rw-r--r--sys/arch/landisk/conf/Makefile.landisk4
-rw-r--r--sys/arch/loongson/conf/Makefile.loongson4
-rw-r--r--sys/arch/luna88k/conf/Makefile.luna88k4
-rw-r--r--sys/arch/macppc/conf/Makefile.macppc4
-rw-r--r--sys/arch/mvme68k/conf/Makefile.mvme68k4
-rw-r--r--sys/arch/mvme88k/conf/Makefile.mvme88k4
-rw-r--r--sys/arch/octeon/conf/Makefile.octeon4
-rw-r--r--sys/arch/sgi/conf/Makefile.sgi4
-rw-r--r--sys/arch/socppc/conf/Makefile.socppc4
-rw-r--r--sys/arch/solbourne/conf/Makefile.solbourne4
-rw-r--r--sys/arch/sparc/conf/Makefile.sparc4
-rw-r--r--sys/arch/sparc64/conf/Makefile.sparc644
-rw-r--r--sys/arch/vax/conf/Makefile.vax4
-rw-r--r--sys/arch/zaurus/conf/Makefile.zaurus4
23 files changed, 46 insertions, 46 deletions
diff --git a/sys/arch/alpha/conf/Makefile.alpha b/sys/arch/alpha/conf/Makefile.alpha
index aadd247ae0d..0d1c918265c 100644
--- a/sys/arch/alpha/conf/Makefile.alpha
+++ b/sys/arch/alpha/conf/Makefile.alpha
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.alpha,v 1.79 2012/08/28 21:03:32 pascal Exp $
+# $OpenBSD: Makefile.alpha,v 1.80 2013/03/30 07:25:20 tedu Exp $
# For instructions on building kernels consult the config(8) and options(4)
# manual pages.
@@ -21,7 +21,7 @@ S!= cd ../../../..; pwd
_machdir?= $S/arch/${_mach}
_archdir?= $S/arch/${_arch}
-INCLUDES= -nostdinc -I. -I$S -I$S/arch
+INCLUDES= -nostdinc -I$S -I. -I$S/arch
CPPFLAGS= ${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL -MD -MP
CWARNFLAGS= -Werror -Wall -Wstrict-prototypes -Wmissing-prototypes \
-Wno-main -Wno-uninitialized -Wno-format \
diff --git a/sys/arch/amd64/conf/Makefile.amd64 b/sys/arch/amd64/conf/Makefile.amd64
index 95802707931..c4a7daf2ca1 100644
--- a/sys/arch/amd64/conf/Makefile.amd64
+++ b/sys/arch/amd64/conf/Makefile.amd64
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.amd64,v 1.54 2013/03/21 15:50:28 deraadt Exp $
+# $OpenBSD: Makefile.amd64,v 1.55 2013/03/30 07:25:20 tedu Exp $
# For instructions on building kernels consult the config(8) and options(4)
# manual pages.
@@ -21,7 +21,7 @@ S!= cd ../../../..; pwd
_machdir?= $S/arch/${_mach}
_archdir?= $S/arch/${_arch}
-INCLUDES= -nostdinc -I. -I$S -I$S/arch
+INCLUDES= -nostdinc -I$S -I. -I$S/arch
CPPFLAGS= ${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL -MD -MP
CWARNFLAGS= -Werror -Wall -Wstrict-prototypes -Wmissing-prototypes \
-Wno-main -Wno-uninitialized -Wno-format \
diff --git a/sys/arch/armish/conf/Makefile.armish b/sys/arch/armish/conf/Makefile.armish
index d61bea83a69..1fa17987a6b 100644
--- a/sys/arch/armish/conf/Makefile.armish
+++ b/sys/arch/armish/conf/Makefile.armish
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.armish,v 1.44 2012/08/28 21:03:32 pascal Exp $
+# $OpenBSD: Makefile.armish,v 1.45 2013/03/30 07:25:20 tedu Exp $
# For instructions on building kernels consult the config(8) and options(4)
# manual pages.
@@ -21,7 +21,7 @@ S!= cd ../../../..; pwd
_machdir?= $S/arch/${_mach}
_archdir?= $S/arch/${_arch}
-INCLUDES= -nostdinc -I. -I$S -I$S/arch
+INCLUDES= -nostdinc -I$S -I. -I$S/arch
CPPFLAGS= ${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL -D__${_mach}__ -MD -MP
CWARNFLAGS= -Werror -Wall -Wstrict-prototypes -Wmissing-prototypes \
-Wno-main -Wno-uninitialized -Wno-format \
diff --git a/sys/arch/aviion/conf/Makefile.aviion b/sys/arch/aviion/conf/Makefile.aviion
index 573df226031..456039fce64 100644
--- a/sys/arch/aviion/conf/Makefile.aviion
+++ b/sys/arch/aviion/conf/Makefile.aviion
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.aviion,v 1.39 2013/01/05 11:20:55 miod Exp $
+# $OpenBSD: Makefile.aviion,v 1.40 2013/03/30 07:25:20 tedu Exp $
# For instructions on building kernels consult the config(8) and options(4)
# manual pages.
@@ -21,7 +21,7 @@ S!= cd ../../../..; pwd
_machdir?= $S/arch/${_mach}
_archdir?= $S/arch/${_arch}
-INCLUDES= -nostdinc -I. -I$S -I$S/arch
+INCLUDES= -nostdinc -I$S -I. -I$S/arch
CPPFLAGS= ${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL -D__${_mach}__ -MD -MP
CWARNFLAGS= -Werror -Wall -Wstrict-prototypes -Wmissing-prototypes \
-Wno-main -Wno-uninitialized -Wno-format \
diff --git a/sys/arch/beagle/conf/Makefile.beagle b/sys/arch/beagle/conf/Makefile.beagle
index 70f9c8179be..307f6ea6193 100644
--- a/sys/arch/beagle/conf/Makefile.beagle
+++ b/sys/arch/beagle/conf/Makefile.beagle
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.beagle,v 1.40 2012/08/28 21:03:32 pascal Exp $
+# $OpenBSD: Makefile.beagle,v 1.41 2013/03/30 07:25:20 tedu Exp $
# For instructions on building kernels consult the config(8) and options(4)
# manual pages.
@@ -21,7 +21,7 @@ S!= cd ../../../..; pwd
_machdir?= $S/arch/${_mach}
_archdir?= $S/arch/${_arch}
-INCLUDES= -nostdinc -I. -I$S -I$S/arch
+INCLUDES= -nostdinc -I$S -I. -I$S/arch
CPPFLAGS= ${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL -D__${_mach}__ -MD -MP
CWARNFLAGS= -Werror -Wall -Wstrict-prototypes -Wmissing-prototypes \
-Wno-main -Wno-uninitialized -Wno-format \
diff --git a/sys/arch/hp300/conf/Makefile.hp300 b/sys/arch/hp300/conf/Makefile.hp300
index 754d2fbc984..fb6a5ad8979 100644
--- a/sys/arch/hp300/conf/Makefile.hp300
+++ b/sys/arch/hp300/conf/Makefile.hp300
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.hp300,v 1.80 2013/02/02 13:34:29 miod Exp $
+# $OpenBSD: Makefile.hp300,v 1.81 2013/03/30 07:25:20 tedu Exp $
# For instructions on building kernels consult the config(8) and options(4)
# manual pages.
@@ -21,7 +21,7 @@ S!= cd ../../../..; pwd
_machdir?= $S/arch/${_mach}
_archdir?= $S/arch/${_arch}
-INCLUDES= -nostdinc -I. -I$S -I$S/arch
+INCLUDES= -nostdinc -I$S -I. -I$S/arch
CPPFLAGS= ${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL -D__${_mach}__ -MD -MP
CWARNFLAGS= -Werror -Wall -Wstrict-prototypes -Wmissing-prototypes \
-Wno-main -Wno-uninitialized -Wno-format \
diff --git a/sys/arch/hppa/conf/Makefile.hppa b/sys/arch/hppa/conf/Makefile.hppa
index 0c48ca3e7bb..a4e0d0045a1 100644
--- a/sys/arch/hppa/conf/Makefile.hppa
+++ b/sys/arch/hppa/conf/Makefile.hppa
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.hppa,v 1.71 2012/08/28 21:03:32 pascal Exp $
+# $OpenBSD: Makefile.hppa,v 1.72 2013/03/30 07:25:20 tedu Exp $
# For instructions on building kernels consult the config(8) and options(4)
# manual pages.
@@ -21,7 +21,7 @@ S!= cd ../../../..; pwd
_machdir?= $S/arch/${_mach}
_archdir?= $S/arch/${_arch}
-INCLUDES= -nostdinc -I. -I$S -I$S/arch
+INCLUDES= -nostdinc -I$S -I. -I$S/arch
CPPFLAGS= ${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL -MD -MP
CWARNFLAGS= -Werror -Wall -Wstrict-prototypes -Wmissing-prototypes \
-Wno-main -Wno-uninitialized -Wno-format \
diff --git a/sys/arch/hppa64/conf/Makefile.hppa64 b/sys/arch/hppa64/conf/Makefile.hppa64
index 8338c5fbca9..dcda271413a 100644
--- a/sys/arch/hppa64/conf/Makefile.hppa64
+++ b/sys/arch/hppa64/conf/Makefile.hppa64
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.hppa64,v 1.43 2012/08/28 21:03:32 pascal Exp $
+# $OpenBSD: Makefile.hppa64,v 1.44 2013/03/30 07:25:20 tedu Exp $
# For instructions on building kernels consult the config(8) and options(4)
# manual pages.
@@ -21,7 +21,7 @@ S!= cd ../../../..; pwd
_machdir?= $S/arch/${_mach}
_archdir?= $S/arch/${_arch}
-INCLUDES= -nostdinc -I. -I$S -I$S/arch
+INCLUDES= -nostdinc -I$S -I. -I$S/arch
CPPFLAGS= ${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL -MD -MP
CWARNFLAGS= -Werror -Wall -Wstrict-prototypes -Wmissing-prototypes \
-Wno-main -Wno-uninitialized -Wno-format \
diff --git a/sys/arch/i386/conf/Makefile.i386 b/sys/arch/i386/conf/Makefile.i386
index 9e71f6c0728..7220e321e55 100644
--- a/sys/arch/i386/conf/Makefile.i386
+++ b/sys/arch/i386/conf/Makefile.i386
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.i386,v 1.85 2012/08/28 21:03:32 pascal Exp $
+# $OpenBSD: Makefile.i386,v 1.86 2013/03/30 07:25:20 tedu Exp $
# For instructions on building kernels consult the config(8) and options(4)
# manual pages.
@@ -21,7 +21,7 @@ S!= cd ../../../..; pwd
_machdir?= $S/arch/${_mach}
_archdir?= $S/arch/${_arch}
-INCLUDES= -nostdinc -I. -I$S -I$S/arch
+INCLUDES= -nostdinc -I$S -I. -I$S/arch
CPPFLAGS= ${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL -MD -MP
CWARNFLAGS= -Werror -Wall -Wstrict-prototypes -Wmissing-prototypes \
-Wno-main -Wno-uninitialized -Wno-format \
diff --git a/sys/arch/landisk/conf/Makefile.landisk b/sys/arch/landisk/conf/Makefile.landisk
index d9523c8b112..e0e2a9e5e46 100644
--- a/sys/arch/landisk/conf/Makefile.landisk
+++ b/sys/arch/landisk/conf/Makefile.landisk
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.landisk,v 1.46 2012/08/28 21:03:32 pascal Exp $
+# $OpenBSD: Makefile.landisk,v 1.47 2013/03/30 07:25:20 tedu Exp $
# For instructions on building kernels consult the config(8) and options(4)
# manual pages.
@@ -21,7 +21,7 @@ S!= cd ../../../..; pwd
_machdir?= $S/arch/${_mach}
_archdir?= $S/arch/${_arch}
-INCLUDES= -nostdinc -I. -I$S -I$S/arch
+INCLUDES= -nostdinc -I$S -I. -I$S/arch
CPPFLAGS= ${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL -D__${_mach}__ -MD -MP
CWARNFLAGS= -Werror -Wall -Wstrict-prototypes -Wmissing-prototypes \
-Wno-main -Wno-uninitialized -Wno-format \
diff --git a/sys/arch/loongson/conf/Makefile.loongson b/sys/arch/loongson/conf/Makefile.loongson
index 7ac5e47e48a..0fa050deeea 100644
--- a/sys/arch/loongson/conf/Makefile.loongson
+++ b/sys/arch/loongson/conf/Makefile.loongson
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.loongson,v 1.35 2012/08/28 21:03:32 pascal Exp $
+# $OpenBSD: Makefile.loongson,v 1.36 2013/03/30 07:25:20 tedu Exp $
# For instructions on building kernels consult the config(8) and options(4)
# manual pages.
@@ -28,7 +28,7 @@ S!= cd ../../../..; pwd
_machdir?= $S/arch/${_mach}
_archdir?= $S/arch/${_arch}
-INCLUDES= -nostdinc -I. -I$S -I$S/arch
+INCLUDES= -nostdinc -I$S -I. -I$S/arch
CPPFLAGS= ${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL -D__${_mach}__ -MD -MP
CWARNFLAGS= -Werror -Wall -Wstrict-prototypes -Wmissing-prototypes \
-Wno-main -Wno-uninitialized -Wno-format \
diff --git a/sys/arch/luna88k/conf/Makefile.luna88k b/sys/arch/luna88k/conf/Makefile.luna88k
index f0f6d83778d..c0efdfbd0bc 100644
--- a/sys/arch/luna88k/conf/Makefile.luna88k
+++ b/sys/arch/luna88k/conf/Makefile.luna88k
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.luna88k,v 1.46 2013/01/07 13:05:14 aoyama Exp $
+# $OpenBSD: Makefile.luna88k,v 1.47 2013/03/30 07:25:20 tedu Exp $
# For instructions on building kernels consult the config(8) and options(4)
# manual pages.
@@ -22,7 +22,7 @@ S!= cd ../../../..; pwd
_machdir?= $S/arch/${_mach}
_archdir?= $S/arch/${_arch}
-INCLUDES= -nostdinc -I. -I$S -I$S/arch
+INCLUDES= -nostdinc -I$S -I. -I$S/arch
CPPFLAGS= ${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL -D__${_mach}__ -MD -MP
CWARNFLAGS= -Werror -Wall -Wstrict-prototypes -Wmissing-prototypes \
-Wno-main -Wno-uninitialized -Wno-format \
diff --git a/sys/arch/macppc/conf/Makefile.macppc b/sys/arch/macppc/conf/Makefile.macppc
index 2ca26a97027..fda9e6affcf 100644
--- a/sys/arch/macppc/conf/Makefile.macppc
+++ b/sys/arch/macppc/conf/Makefile.macppc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.macppc,v 1.65 2012/08/28 21:03:32 pascal Exp $
+# $OpenBSD: Makefile.macppc,v 1.66 2013/03/30 07:25:20 tedu Exp $
# For instructions on building kernels consult the config(8) and options(4)
# manual pages.
@@ -21,7 +21,7 @@ S!= cd ../../../..; pwd
_machdir?= $S/arch/${_mach}
_archdir?= $S/arch/${_arch}
-INCLUDES= -nostdinc -I. -I$S -I$S/arch
+INCLUDES= -nostdinc -I$S -I. -I$S/arch
CPPFLAGS= ${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL -D__${_mach}__ -MD -MP
CWARNFLAGS= -Werror -Wall -Wstrict-prototypes -Wmissing-prototypes \
-Wno-main -Wno-uninitialized -Wno-format \
diff --git a/sys/arch/mvme68k/conf/Makefile.mvme68k b/sys/arch/mvme68k/conf/Makefile.mvme68k
index 0a5567c395d..f7c21d57660 100644
--- a/sys/arch/mvme68k/conf/Makefile.mvme68k
+++ b/sys/arch/mvme68k/conf/Makefile.mvme68k
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.mvme68k,v 1.66 2013/02/02 13:36:05 miod Exp $
+# $OpenBSD: Makefile.mvme68k,v 1.67 2013/03/30 07:25:20 tedu Exp $
# For instructions on building kernels consult the config(8) and options(4)
# manual pages.
@@ -21,7 +21,7 @@ S!= cd ../../../..; pwd
_machdir?= $S/arch/${_mach}
_archdir?= $S/arch/${_arch}
-INCLUDES= -nostdinc -I. -I$S -I$S/arch
+INCLUDES= -nostdinc -I$S -I. -I$S/arch
CPPFLAGS= ${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL -D__${_mach}__ -MD -MP
CWARNFLAGS= -Werror -Wall -Wstrict-prototypes -Wmissing-prototypes \
-Wno-main -Wno-uninitialized -Wno-format \
diff --git a/sys/arch/mvme88k/conf/Makefile.mvme88k b/sys/arch/mvme88k/conf/Makefile.mvme88k
index aa62a2e01b5..d3204c13322 100644
--- a/sys/arch/mvme88k/conf/Makefile.mvme88k
+++ b/sys/arch/mvme88k/conf/Makefile.mvme88k
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.mvme88k,v 1.76 2013/01/05 11:20:56 miod Exp $
+# $OpenBSD: Makefile.mvme88k,v 1.77 2013/03/30 07:25:20 tedu Exp $
# For instructions on building kernels consult the config(8) and options(4)
# manual pages.
@@ -21,7 +21,7 @@ S!= cd ../../../..; pwd
_machdir?= $S/arch/${_mach}
_archdir?= $S/arch/${_arch}
-INCLUDES= -nostdinc -I. -I$S -I$S/arch
+INCLUDES= -nostdinc -I$S -I. -I$S/arch
CPPFLAGS= ${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL -D__${_mach}__ -MD -MP
CWARNFLAGS= -Werror -Wall -Wstrict-prototypes -Wmissing-prototypes \
-Wno-main -Wno-uninitialized -Wno-format \
diff --git a/sys/arch/octeon/conf/Makefile.octeon b/sys/arch/octeon/conf/Makefile.octeon
index d1e4824e07b..8b016bf1114 100644
--- a/sys/arch/octeon/conf/Makefile.octeon
+++ b/sys/arch/octeon/conf/Makefile.octeon
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.octeon,v 1.11 2012/08/28 21:03:32 pascal Exp $
+# $OpenBSD: Makefile.octeon,v 1.12 2013/03/30 07:25:20 tedu Exp $
# For instructions on building kernels consult the config(8) and options(4)
# manual pages.
@@ -28,7 +28,7 @@ S!= cd ../../../..; pwd
_machdir?= $S/arch/${_mach}
_archdir?= $S/arch/${_arch}
-INCLUDES= -nostdinc -I. -I$S -I$S/arch
+INCLUDES= -nostdinc -I$S -I. -I$S/arch
CPPFLAGS= ${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL -D__${_mach}__ -MD -MP
CWARNFLAGS= -Werror -Wall -Wstrict-prototypes -Wmissing-prototypes \
-Wno-main -Wno-uninitialized -Wno-format \
diff --git a/sys/arch/sgi/conf/Makefile.sgi b/sys/arch/sgi/conf/Makefile.sgi
index 7c707b59546..84bd80e468e 100644
--- a/sys/arch/sgi/conf/Makefile.sgi
+++ b/sys/arch/sgi/conf/Makefile.sgi
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.sgi,v 1.58 2012/08/28 21:03:32 pascal Exp $
+# $OpenBSD: Makefile.sgi,v 1.59 2013/03/30 07:25:20 tedu Exp $
# For instructions on building kernels consult the config(8) and options(4)
# manual pages.
@@ -28,7 +28,7 @@ S!= cd ../../../..; pwd
_machdir?= $S/arch/${_mach}
_archdir?= $S/arch/${_arch}
-INCLUDES= -nostdinc -I. -I$S -I$S/arch
+INCLUDES= -nostdinc -I$S -I. -I$S/arch
CPPFLAGS= ${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL -D__${_mach}__ -MD -MP
CWARNFLAGS= -Werror -Wall -Wstrict-prototypes -Wmissing-prototypes \
-Wno-main -Wno-uninitialized -Wno-format \
diff --git a/sys/arch/socppc/conf/Makefile.socppc b/sys/arch/socppc/conf/Makefile.socppc
index 5ec247d68f0..d6d05f205be 100644
--- a/sys/arch/socppc/conf/Makefile.socppc
+++ b/sys/arch/socppc/conf/Makefile.socppc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.socppc,v 1.36 2012/08/28 21:03:32 pascal Exp $
+# $OpenBSD: Makefile.socppc,v 1.37 2013/03/30 07:25:20 tedu Exp $
# For instructions on building kernels consult the config(8) and options(4)
# manual pages.
@@ -21,7 +21,7 @@ S!= cd ../../../..; pwd
_machdir?= $S/arch/${_mach}
_archdir?= $S/arch/${_arch}
-INCLUDES= -nostdinc -I. -I$S -I$S/arch
+INCLUDES= -nostdinc -I$S -I. -I$S/arch
CPPFLAGS= ${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL -D__${_mach}__ -MD -MP
CWARNFLAGS= -Werror -Wall -Wstrict-prototypes -Wmissing-prototypes \
-Wno-main -Wno-uninitialized -Wno-format \
diff --git a/sys/arch/solbourne/conf/Makefile.solbourne b/sys/arch/solbourne/conf/Makefile.solbourne
index e3c69c47da7..2e87daf73c0 100644
--- a/sys/arch/solbourne/conf/Makefile.solbourne
+++ b/sys/arch/solbourne/conf/Makefile.solbourne
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.solbourne,v 1.39 2012/08/28 21:03:32 pascal Exp $
+# $OpenBSD: Makefile.solbourne,v 1.40 2013/03/30 07:25:20 tedu Exp $
# For instructions on building kernels consult the config(8) and options(4)
# manual pages.
@@ -21,7 +21,7 @@ S!= cd ../../../..; pwd
_machdir?= $S/arch/${_mach}
_archdir?= $S/arch/${_arch}
-INCLUDES= -nostdinc -I. -I$S -I$S/arch
+INCLUDES= -nostdinc -I$S -I. -I$S/arch
CPPFLAGS= ${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL -D__${_mach}__ -MD -MP
CWARNFLAGS= -Werror -Wall -Wstrict-prototypes -Wmissing-prototypes \
-Wno-main -Wno-uninitialized -Wno-format \
diff --git a/sys/arch/sparc/conf/Makefile.sparc b/sys/arch/sparc/conf/Makefile.sparc
index ae44d541f9b..8886158937b 100644
--- a/sys/arch/sparc/conf/Makefile.sparc
+++ b/sys/arch/sparc/conf/Makefile.sparc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.sparc,v 1.75 2012/08/28 21:03:32 pascal Exp $
+# $OpenBSD: Makefile.sparc,v 1.76 2013/03/30 07:25:20 tedu Exp $
# For instructions on building kernels consult the config(8) and options(4)
# manual pages.
@@ -21,7 +21,7 @@ S!= cd ../../../..; pwd
_machdir?= $S/arch/${_mach}
_archdir?= $S/arch/${_arch}
-INCLUDES= -nostdinc -I. -I$S -I$S/arch
+INCLUDES= -nostdinc -I$S -I. -I$S/arch
CPPFLAGS= ${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL -MD -MP
CWARNFLAGS= -Werror -Wall -Wstrict-prototypes -Wmissing-prototypes \
-Wno-main -Wno-uninitialized -Wno-format \
diff --git a/sys/arch/sparc64/conf/Makefile.sparc64 b/sys/arch/sparc64/conf/Makefile.sparc64
index a45d55e3226..1687b7e59b4 100644
--- a/sys/arch/sparc64/conf/Makefile.sparc64
+++ b/sys/arch/sparc64/conf/Makefile.sparc64
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.sparc64,v 1.62 2012/08/28 21:03:32 pascal Exp $
+# $OpenBSD: Makefile.sparc64,v 1.63 2013/03/30 07:25:20 tedu Exp $
# For instructions on building kernels consult the config(8) and options(4)
# manual pages.
@@ -21,7 +21,7 @@ S!= cd ../../../..; pwd
_machdir?= $S/arch/${_mach}
_archdir?= $S/arch/${_arch}
-INCLUDES= -nostdinc -I. -I$S -I$S/arch
+INCLUDES= -nostdinc -I$S -I. -I$S/arch
CPPFLAGS= ${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL -MD -MP
CWARNFLAGS= -Werror -Wall -Wstrict-prototypes -Wmissing-prototypes \
-Wno-main -Wno-uninitialized -Wno-format \
diff --git a/sys/arch/vax/conf/Makefile.vax b/sys/arch/vax/conf/Makefile.vax
index 014f03854cf..d737e2c6180 100644
--- a/sys/arch/vax/conf/Makefile.vax
+++ b/sys/arch/vax/conf/Makefile.vax
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.vax,v 1.66 2012/08/22 16:58:26 pascal Exp $
+# $OpenBSD: Makefile.vax,v 1.67 2013/03/30 07:25:20 tedu Exp $
# For instructions on building kernels consult the config(8) and options(4)
# manual pages.
@@ -21,7 +21,7 @@ S!= cd ../../../..; pwd
_machdir?= $S/arch/${_mach}
_archdir?= $S/arch/${_arch}
-INCLUDES= -nostdinc -I. -I$S -I$S/arch
+INCLUDES= -nostdinc -I$S -I. -I$S/arch
CPPFLAGS= ${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL -MD -MP
CWARNFLAGS= -Werror -Wall -Wstrict-prototypes -Wmissing-prototypes \
-Wno-main -Wno-uninitialized -Wno-format \
diff --git a/sys/arch/zaurus/conf/Makefile.zaurus b/sys/arch/zaurus/conf/Makefile.zaurus
index 73c615a879f..1687ef70961 100644
--- a/sys/arch/zaurus/conf/Makefile.zaurus
+++ b/sys/arch/zaurus/conf/Makefile.zaurus
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.zaurus,v 1.46 2012/08/28 21:03:32 pascal Exp $
+# $OpenBSD: Makefile.zaurus,v 1.47 2013/03/30 07:25:20 tedu Exp $
# For instructions on building kernels consult the config(8) and options(4)
# manual pages.
@@ -21,7 +21,7 @@ S!= cd ../../../..; pwd
_machdir?= $S/arch/${_mach}
_archdir?= $S/arch/${_arch}
-INCLUDES= -nostdinc -I. -I$S -I$S/arch
+INCLUDES= -nostdinc -I$S -I. -I$S/arch
CPPFLAGS= ${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL -D__${_mach}__ -MD -MP
CWARNFLAGS= -Werror -Wall -Wstrict-prototypes -Wmissing-prototypes \
-Wno-main -Wno-uninitialized -Wno-format \