Index: head/lkm/atapi/Makefile
===================================================================
--- head/lkm/atapi/Makefile	(revision 32986)
+++ head/lkm/atapi/Makefile	(revision 32987)
@@ -1,36 +1,30 @@
-#	$Id: Makefile,v 1.8 1997/02/22 12:47:39 peter Exp $
+#	$Id: Makefile,v 1.9 1997/08/07 13:23:31 bde Exp $
 
 .PATH:          ${.CURDIR}/../../sys/i386/isa
 KMOD            = atapi_mod
 SRCS            = atapi.c wdc.h opt_atapi.h #wcd.h 
 NOMAN           =
-CFLAGS         += -nostdinc -I. -DATAPI_MODULE
-CLEANFILES     += $(KMOD) machine wdc.h wcd.h opt_atapi.h *.b
-LN              = ln -f -s
+CFLAGS         += -DATAPI_MODULE
+CLEANFILES     += $(KMOD) wdc.h wcd.h opt_atapi.h *.b
 EXPORT_SYMS	= _atapi_mod _atapi_debug_ptr _atapi_intr_ptr \
 		  _atapi_request_callback_ptr _atapi_request_immediate_ptr \
 		  _atapi_request_wait_ptr _atapi_start_ptr
 
 load:           ${PROG}
 		${MODLOAD} -u -e atapi_mod $(PROG)
 
 unload:         ${PROG}
 		${MODUNLOAD} -n atapi
 
 wdc.h:
 		echo "#define NWDC 2" > wdc.h
 
 #		echo "#define NWD 4" >> wdc.h
 
 wcd.h:
 		echo "#define NWCD 1" > wcd.h
 
 opt_atapi.h:
 		echo "#define ATAPI 1"> opt_atapi.h
-
-.c.o:
-		-@$(LN) ${.CURDIR}/../../sys/i386/include machine
-		$(CC) $(CFLAGS) -c $<
-		-@rm -f machine
 
 .include <bsd.kmod.mk>
Index: head/lkm/linux/Makefile
===================================================================
--- head/lkm/linux/Makefile	(revision 32986)
+++ head/lkm/linux/Makefile	(revision 32987)
@@ -1,42 +1,37 @@
-#	$Id: Makefile,v 1.11 1997/02/22 12:48:23 peter Exp $
+#	$Id: Makefile,v 1.12 1997/12/16 18:45:50 eivind Exp $
 
 .PATH:	${.CURDIR}/../../sys/i386/linux
 KMOD=	linux_mod
 SRCS=	linux.c linux_file.c linux_ioctl.c linux_misc.c linux_signal.c \
 	linux_ipc.c linux_socket.c linux_stats.c \
 	linux_dummy.c linux_sysent.c linux_sysvec.c linux_util.c \
 	imgact_linux.c opt_compat.h vnode_if.h
 OBJS=	linux_locore.o
 MAN8=	linux.8
 
-CFLAGS+= -DLKM -I. -DCOMPAT_LINUX #-DDEBUG
+CFLAGS+= -DLKM -DCOMPAT_LINUX #-DDEBUG
 EXPORT_SYMS=_linux_mod
-CLEANFILES+= vnode_if.h vnode_if.c linux_genassym.o linux_genassym machine \
+CLEANFILES+= vnode_if.h vnode_if.c linux_genassym.o linux_genassym \
 	linux_assym.h opt_compat.h
 
 linux_assym.h:	linux_genassym
 	./linux_genassym > linux_assym.h
 
 linux_locore.o:	linux_locore.s linux_assym.h
 	${CC} -c -x assembler-with-cpp -DLOCORE -DKERNEL ${CFLAGS} \
 		${.IMPSRC} -o ${.TARGET}
 
 linux_genassym.o:	linux_genassym.c linux.h
 	${CC} -c ${CFLAGS} -UKERNEL ${.IMPSRC}
 
 linux_genassym:	linux_genassym.o
 	${CC} ${CFLAGS} ${.ALLSRC} -o ${.TARGET}
 
-machine:
-	ln -fs ${.CURDIR}/../../sys/i386/include machine
-
 opt_compat.h:
 	echo "#define COMPAT_43 1" > opt_compat.h
-
-vnode_if.h:	machine
 
 afterinstall:
 	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
 		${.CURDIR}/linux ${DESTDIR}/usr/bin
 
 .include <bsd.kmod.mk>
Index: head/lkm/wcd/Makefile
===================================================================
--- head/lkm/wcd/Makefile	(revision 32986)
+++ head/lkm/wcd/Makefile	(revision 32987)
@@ -1,35 +1,29 @@
-#	$Id: Makefile,v 1.8 1997/08/07 13:23:37 bde Exp $
+#	$Id: Makefile,v 1.9 1998/01/24 02:21:53 eivind Exp $
 
 .PATH:          ${.CURDIR}/../../sys/i386/isa
 KMOD            = wcd_mod
 SRCS            = wcd.c wdc.h wcd.h opt_atapi.h opt_devfs.h
 NOMAN           =
-CFLAGS         += -nostdinc -I. -DWCD_MODULE
+CFLAGS         += -DWCD_MODULE
 CLEANFILES     += $(KMOD) machine wdc.h wcd.h opt_atapi.h opt_devfs.h *.b
-LN              = ln -f -s
 
 load:           ${PROG}
 		${MODLOAD} -u -e wcd $(PROG)
 
 unload:         ${PROG}
 		${MODUNLOAD} -n wcd
 
 wdc.h:
 		echo "#define NWDC 2" > wdc.h
 		echo "#define NWD 4" >> wdc.h
 
 wcd.h:
 		echo "#define NWCD 1" > wcd.h
 
 opt_atapi.h:
 		echo "#define ATAPI 1"> opt_atapi.h
 
 opt_devfs.h:
 		touch opt_devfs.h
-
-.c.o:
-		-@$(LN) ${.CURDIR}/../../sys/i386/include machine
-		$(CC) $(CFLAGS) -c $<
-		-@rm -f machine
 
 .include <bsd.kmod.mk>
Index: head/sys/modules/atapi/Makefile
===================================================================
--- head/sys/modules/atapi/Makefile	(revision 32986)
+++ head/sys/modules/atapi/Makefile	(revision 32987)
@@ -1,36 +1,30 @@
-#	$Id: Makefile,v 1.8 1997/02/22 12:47:39 peter Exp $
+#	$Id: Makefile,v 1.9 1997/08/07 13:23:31 bde Exp $
 
 .PATH:          ${.CURDIR}/../../sys/i386/isa
 KMOD            = atapi_mod
 SRCS            = atapi.c wdc.h opt_atapi.h #wcd.h 
 NOMAN           =
-CFLAGS         += -nostdinc -I. -DATAPI_MODULE
-CLEANFILES     += $(KMOD) machine wdc.h wcd.h opt_atapi.h *.b
-LN              = ln -f -s
+CFLAGS         += -DATAPI_MODULE
+CLEANFILES     += $(KMOD) wdc.h wcd.h opt_atapi.h *.b
 EXPORT_SYMS	= _atapi_mod _atapi_debug_ptr _atapi_intr_ptr \
 		  _atapi_request_callback_ptr _atapi_request_immediate_ptr \
 		  _atapi_request_wait_ptr _atapi_start_ptr
 
 load:           ${PROG}
 		${MODLOAD} -u -e atapi_mod $(PROG)
 
 unload:         ${PROG}
 		${MODUNLOAD} -n atapi
 
 wdc.h:
 		echo "#define NWDC 2" > wdc.h
 
 #		echo "#define NWD 4" >> wdc.h
 
 wcd.h:
 		echo "#define NWCD 1" > wcd.h
 
 opt_atapi.h:
 		echo "#define ATAPI 1"> opt_atapi.h
-
-.c.o:
-		-@$(LN) ${.CURDIR}/../../sys/i386/include machine
-		$(CC) $(CFLAGS) -c $<
-		-@rm -f machine
 
 .include <bsd.kmod.mk>
Index: head/sys/modules/linux/Makefile
===================================================================
--- head/sys/modules/linux/Makefile	(revision 32986)
+++ head/sys/modules/linux/Makefile	(revision 32987)
@@ -1,42 +1,37 @@
-#	$Id: Makefile,v 1.11 1997/02/22 12:48:23 peter Exp $
+#	$Id: Makefile,v 1.12 1997/12/16 18:45:50 eivind Exp $
 
 .PATH:	${.CURDIR}/../../sys/i386/linux
 KMOD=	linux_mod
 SRCS=	linux.c linux_file.c linux_ioctl.c linux_misc.c linux_signal.c \
 	linux_ipc.c linux_socket.c linux_stats.c \
 	linux_dummy.c linux_sysent.c linux_sysvec.c linux_util.c \
 	imgact_linux.c opt_compat.h vnode_if.h
 OBJS=	linux_locore.o
 MAN8=	linux.8
 
-CFLAGS+= -DLKM -I. -DCOMPAT_LINUX #-DDEBUG
+CFLAGS+= -DLKM -DCOMPAT_LINUX #-DDEBUG
 EXPORT_SYMS=_linux_mod
-CLEANFILES+= vnode_if.h vnode_if.c linux_genassym.o linux_genassym machine \
+CLEANFILES+= vnode_if.h vnode_if.c linux_genassym.o linux_genassym \
 	linux_assym.h opt_compat.h
 
 linux_assym.h:	linux_genassym
 	./linux_genassym > linux_assym.h
 
 linux_locore.o:	linux_locore.s linux_assym.h
 	${CC} -c -x assembler-with-cpp -DLOCORE -DKERNEL ${CFLAGS} \
 		${.IMPSRC} -o ${.TARGET}
 
 linux_genassym.o:	linux_genassym.c linux.h
 	${CC} -c ${CFLAGS} -UKERNEL ${.IMPSRC}
 
 linux_genassym:	linux_genassym.o
 	${CC} ${CFLAGS} ${.ALLSRC} -o ${.TARGET}
 
-machine:
-	ln -fs ${.CURDIR}/../../sys/i386/include machine
-
 opt_compat.h:
 	echo "#define COMPAT_43 1" > opt_compat.h
-
-vnode_if.h:	machine
 
 afterinstall:
 	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
 		${.CURDIR}/linux ${DESTDIR}/usr/bin
 
 .include <bsd.kmod.mk>
Index: head/sys/modules/wcd/Makefile
===================================================================
--- head/sys/modules/wcd/Makefile	(revision 32986)
+++ head/sys/modules/wcd/Makefile	(revision 32987)
@@ -1,35 +1,29 @@
-#	$Id: Makefile,v 1.8 1997/08/07 13:23:37 bde Exp $
+#	$Id: Makefile,v 1.9 1998/01/24 02:21:53 eivind Exp $
 
 .PATH:          ${.CURDIR}/../../sys/i386/isa
 KMOD            = wcd_mod
 SRCS            = wcd.c wdc.h wcd.h opt_atapi.h opt_devfs.h
 NOMAN           =
-CFLAGS         += -nostdinc -I. -DWCD_MODULE
+CFLAGS         += -DWCD_MODULE
 CLEANFILES     += $(KMOD) machine wdc.h wcd.h opt_atapi.h opt_devfs.h *.b
-LN              = ln -f -s
 
 load:           ${PROG}
 		${MODLOAD} -u -e wcd $(PROG)
 
 unload:         ${PROG}
 		${MODUNLOAD} -n wcd
 
 wdc.h:
 		echo "#define NWDC 2" > wdc.h
 		echo "#define NWD 4" >> wdc.h
 
 wcd.h:
 		echo "#define NWCD 1" > wcd.h
 
 opt_atapi.h:
 		echo "#define ATAPI 1"> opt_atapi.h
 
 opt_devfs.h:
 		touch opt_devfs.h
-
-.c.o:
-		-@$(LN) ${.CURDIR}/../../sys/i386/include machine
-		$(CC) $(CFLAGS) -c $<
-		-@rm -f machine
 
 .include <bsd.kmod.mk>