add dist/pf/net into -I path

XXX netbsd-current modified /usr/sbin/config and added a new directive
to sys/conf/files.

netbsd/sys/arch/i386/conf/Makefile.i386

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.i386,v 1.97 1999/01/28 20:04:54 christos Exp $
+#	$NetBSD: Makefile.i386,v 1.133.2.2 2004/07/15 19:26:49 he Exp $
 
 # Makefile for NetBSD
 #
@@ -12,187 +12,111 @@
 #	/sys/arch/i386/conf/Makefile.i386
 # after which config should be rerun for all machines of that type.
 #
-# N.B.: NO DEPENDENCIES ON FOLLOWING FLAGS ARE VISIBLE TO MAKEFILE
-#	IF YOU CHANGE THE DEFINITION OF ANY OF THESE RECOMPILE EVERYTHING
+# To specify debugging, add the config line: makeoptions DEBUG="-g"
+# A better way is to specify -g only for a few files.
 #
-# -DTRACE	compile in kernel tracing hooks
-# -DQUOTA	compile in file system quotas
+#	makeoptions DEBUGLIST="uvm* trap if_*"
 
+MACHINE_ARCH=	i386
+USETOOLS?=	no
+NEED_OWN_INSTALL_TARGET?=no
 .include <bsd.own.mk>
 
-# DEBUG is set to -g if debugging.
-# PROF is set to -pg if profiling.
-
-AR?=	ar
-AS?=	as
-CC?=	cc
-CPP?=	cpp
-LD?=	ld
-LORDER?=lorder
-MKDEP?=	mkdep
-NM?=	nm
-RANLIB?=ranlib
-SIZE?=	size
-STRIP?=	strip
-TSORT?=	tsort -q
-
-COPTS?=	-O2
-
-# source tree is located via $S relative to the compilation directory
-.ifndef S
-S!=	cd ../../../..; pwd
-.endif
-I386=	$S/arch/i386
-
-HAVE_GCC28!=	${CC} --version | egrep "^(2\.8|egcs)" ; echo
-INCLUDES=	-I. -I$S/arch -I$S -nostdinc
-CPPFLAGS=	${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL -Di386
-CWARNFLAGS?=	-Werror -Wall -Wmissing-prototypes -Wstrict-prototypes \
-		-Wpointer-arith
-.if (${HAVE_GCC28} != "")
-CWARNFLAGS+=	-Wno-main
-.endif
-CFLAGS=		${DEBUG} ${COPTS} ${CWARNFLAGS}
-AFLAGS=		-x assembler-with-cpp -traditional-cpp -D_LOCORE
-LINKFLAGS=	-Ttext F0100000 -e start
-.if (${OBJECT_FMT} == "ELF")
-#LINKFLAGS+=	-N
-.else
-LINKFLAGS+=	-z
-.endif
-STRIPFLAGS=	-d
-
-### find out what to use for libkern
+##
+## (1) port identification
+##
+I386=		$S/arch/i386
+GENASSYM=	${I386}/i386/genassym.cf
+
+##
+## (2) compile settings
+##
+CPPFLAGS+=	-Di386 -I$S/dist/pf
+AFLAGS+=	-x assembler-with-cpp -traditional-cpp
+
+##
+## (3) libkern and compat
+##
 KERN_AS=	obj
-.include "$S/lib/libkern/Makefile.inc"
-.ifndef PROF
-LIBKERN=	${KERNLIB}
-.else
-LIBKERN=	${KERNLIB_PROF}
-.endif
-
-### find out what to use for libcompat
-.include "$S/compat/common/Makefile.inc"
-.ifndef PROF
-LIBCOMPAT=	${COMPATLIB}
-.else
-LIBCOMPAT=	${COMPATLIB_PROF}
-.endif
 
-# compile rules: rules are named ${TYPE}_${SUFFIX} where TYPE is NORMAL or
-# HOSTED}, and SUFFIX is the file suffix, capitalized (e.g. C for a .c file).
+##
+## (4) local objects, compile rules, and dependencies
+##
+MD_OBJS=	locore.o spl.o vector.o microtime.o
+MD_CFILES=
+MD_SFILES=	${I386}/i386/locore.S ${I386}/i386/spl.S \
+		${I386}/i386/vector.S ${I386}/i386/microtime.S
 
-NORMAL_C=	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c $<
-NOPROF_C=	${CC} ${CFLAGS} ${CPPFLAGS} -c $<
-NORMAL_S=	${CC} ${AFLAGS} ${CPPFLAGS} -c $<
+locore.o: ${I386}/i386/locore.S assym.h
+	${NORMAL_S}
 
-%OBJS
+spl.o: ${I386}/i386/spl.S assym.h
+	${NORMAL_S}
 
-%CFILES
+vector.o: ${I386}/i386/vector.S assym.h
+	${NORMAL_S}
 
-%SFILES
+microtime.o: ${I386}/i386/microtime.S assym.h
+	${NORMAL_S}
 
-# load lines for config "xxx" will be emitted as:
-# xxx: ${SYSTEM_DEP} swapxxx.o
-#	${SYSTEM_LD_HEAD}
-#	${SYSTEM_LD} swapxxx.o
-#	${SYSTEM_LD_TAIL}
-SYSTEM_OBJ=	locore.o \
-		param.o ioconf.o ${OBJS} ${LIBCOMPAT} ${LIBKERN}
-SYSTEM_DEP=	Makefile ${SYSTEM_OBJ}
-SYSTEM_LD_HEAD=	rm -f $@
-SYSTEM_LD=	@echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o; \
-		${LD} ${LINKFLAGS} -o $@ ${SYSTEM_OBJ} vers.o
-SYSTEM_LD_TAIL=	@${SIZE} $@; chmod 755 $@
-
-DEBUG?=
-.if ${DEBUG} == "-g"
-LINKFLAGS+=	-X
-SYSTEM_LD_TAIL+=; \
-		echo cp $@ $@.gdb; rm -f $@.gdb; cp $@ $@.gdb; \
-		echo ${STRIP} ${STRIPFLAGS} $@; ${STRIP} ${STRIPFLAGS} $@
+##
+## (5) link settings
+##
+TEXTADDR?=	c0100000
+LINKFLAGS_NORMAL=	-X
+.if (${OBJECT_FMT} == "ELF")
+KERN_LDSCRIPT?=	kern.ldscript
+LINKFORMAT=	-T ${I386}/conf/${KERN_LDSCRIPT}
 .else
-LINKFLAGS+=	-X
+LINKFORMAT=	-z
 .endif
 
-%LOAD
-
-assym.h: $S/kern/genassym.sh ${I386}/i386/genassym.cf
-	sh $S/kern/genassym.sh ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} \
-	    < ${I386}/i386/genassym.cf > assym.h.tmp && \
-	mv -f assym.h.tmp assym.h
-
-param.c: $S/conf/param.c
-	rm -f param.c
-	cp $S/conf/param.c .
-
-param.o: param.c Makefile
-	${NORMAL_C}
-
-ioconf.o: ioconf.c
-	${NORMAL_C}
-
-newvers: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP}
-	sh $S/conf/newvers.sh
-	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c vers.c
-
-
-__CLEANKERNEL: .USE
-	@echo "${.TARGET}ing the kernel objects"
-	rm -f eddep *netbsd netbsd.gdb tags *.[io] [a-z]*.s \
-	    [Ee]rrs linterrs makelinks assym.h.tmp assym.h
-
-__CLEANDEPEND: .USE
-	rm -f .depend
-
-clean: __CLEANKERNEL
-
-cleandir distclean: __CLEANKERNEL __CLEANDEPEND
+##
+## (6) port specific target dependencies
+##
 
-lint:
-	@lint -hbxncez -Dvolatile= ${CPPFLAGS} -UKGDB \
-	    ${I386}/i386/Locore.c ${CFILES} \
-	    ioconf.c param.c | \
-	    grep -v 'static function .* unused'
+freebsd_sigcode.o ibcs2_sigcode.o linux_sigcode.o: assym.h
+svr4_sigcode.o mach_sigcode.o: assym.h
+apmcall.o in_cksum.o pnpbioscall.o bioscall.o: assym.h
+mptramp.o: assym.h
+clock.o: config_time.h
 
-tags:
-	@echo "see $S/kern/Makefile for tags"
+##
+## (7) misc settings
+##
 
-links:
-	egrep '#if' ${CFILES} | sed -f $S/conf/defines | \
-	  sed -e 's/:.*//' -e 's/\.c/.o/' | sort -u > dontlink
-	echo ${CFILES} | tr -s ' ' '\12' | sed 's/\.c/.o/' | \
-	  sort -u | comm -23 - dontlink | \
-	  sed 's,../.*/\(.*.o\),rm -f \1; ln -s ../GENERIC/\1 \1,' > makelinks
-	sh makelinks && rm -f dontlink
+##
+## (8) config(8) generated machinery
+##
+%INCLUDES
 
-SRCS=	${I386}/i386/locore.s \
-	param.c ioconf.c ${CFILES} ${SFILES}
-depend: .depend
-.depend: ${SRCS} assym.h param.c
-	${MKDEP} ${AFLAGS} ${CPPFLAGS} ${I386}/i386/locore.s
-	${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
-	${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES}
-	sh $S/kern/genassym.sh ${MKDEP} -f assym.dep ${CFLAGS} \
-	  ${CPPFLAGS} < ${I386}/i386/genassym.cf
-	@sed -e 's/.*\.o:.*\.c/assym.h:/' < assym.dep >> .depend
-	@rm -f assym.dep
-
-
-# depend on root or device configuration
-autoconf.o conf.o: Makefile
+%OBJS
 
-# depend on network or filesystem configuration
-uipc_proto.o vfs_conf.o: Makefile
+%CFILES
 
-# depend on maxusers
-machdep.o: Makefile
+%SFILES
 
-# depend on CPU configuration
-locore.o machdep.o: Makefile
+%LOAD
 
+%RULES
 
-locore.o: ${I386}/i386/locore.s assym.h
-	${NORMAL_S}
+# XXX - Ugly, but make doesn't easily handle .o.uue (assumes it's a suffix)
+# XXX - Also, config has no simple was to just add foo.o to the Makefile. 
+#       It needs a pathname of some sort for "object"        
+.if !empty(OBJS:M\/athhal-elf.o)
+OBJS:=${OBJS:C/\/athhal-elf.o/athhal-elf.o/}
+
+.PATH: $S/../contrib/sys/arch/i386/dev
+ATH_UUDEC?=	@${_MKSHMSG} "uudecode ${.CURDIR:T}/${.TARGET}"; \
+		${_MKSHECHO}\
+		${UUDECODE} -p $> \> ${.TARGET}; \
+		rm -f ${.TARGET}; \
+		${UUDECODE} -p $> > ${.TARGET}
+athhal-elf.o: athhal-elf-o.uue
+	${ATH_UUDEC}
+.endif
 
-%RULES
+##
+## (9) port independent kernel machinery
+##
+.include "$S/conf/Makefile.kern.inc"