d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't handle the `machine' symlink or related include paths here.

Browse Source 
bsd.kmod.mk now handles it more generally.
This commit is contained in:
bde 1998-02-01 17:53:56 +00:00
parent 88e9a98172
commit c9dfcc430a
6 changed files with 16 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lkm/atapi/Makefile
View File

@ -1,12 +1,11 @@
# $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
@ -28,9 +27,4 @@ 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>

11
lkm/linux/Makefile
View File

@ -1,4 +1,4 @@
# $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
@ -9,9 +9,9 @@ SRCS= linux.c linux_file.c linux_ioctl.c linux_misc.c linux_signal.c \
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
@ -27,14 +27,9 @@ linux_genassym.o: linux_genassym.c linux.h
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

10
lkm/wcd/Makefile
View File

@ -1,12 +1,11 @@
# $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)
@ -27,9 +26,4 @@ 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>

12
sys/modules/atapi/Makefile
View File

@ -1,12 +1,11 @@
# $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
@ -28,9 +27,4 @@ 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>

11
sys/modules/linux/Makefile
View File

@ -1,4 +1,4 @@
# $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
@ -9,9 +9,9 @@ SRCS= linux.c linux_file.c linux_ioctl.c linux_misc.c linux_signal.c \
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
@ -27,14 +27,9 @@ linux_genassym.o: linux_genassym.c linux.h
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

10
sys/modules/wcd/Makefile
View File

@ -1,12 +1,11 @@
# $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)
@ -27,9 +26,4 @@ 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>