Fixed the `machine' link. It pointed to the wrong place, and was created
too late to be used in all cases. It should probably be created (early) in bsd.kmod.mk for all LKMs. Use cc instead of cpp | as for the same reasons as in the kernel makefile. CFLAGS isn't split up as well as in the kernel makefile, but cc doesn't pass compiler warning flags to cpp, so there is no need to split it.
This commit is contained in:
parent
79df6d8597
commit
c11bd94104
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=16726
@ -1,4 +1,4 @@
|
||||
# $Id: Makefile,v 1.6 1996/03/02 20:00:35 peter Exp $
|
||||
# $Id: Makefile,v 1.7 1996/03/10 08:42:31 sos Exp $
|
||||
|
||||
.PATH: ${.CURDIR}/../../sys/i386/linux
|
||||
KMOD= linux_mod
|
||||
@ -10,7 +10,6 @@ OBJS= linux_locore.o
|
||||
NOMAN=
|
||||
|
||||
CFLAGS+= -DLKM -I. -DCOMPAT_43 -DCOMPAT_LINUX #-DDEBUG
|
||||
CPPFLAGS= -I. -I${.CURDIR}/../../sys
|
||||
EXPORT_SYMS=_linux_mod
|
||||
CLEANFILES+= vnode_if.h vnode_if.c linux_genassym.o linux_genassym machine \
|
||||
linux_assym.h
|
||||
@ -19,9 +18,8 @@ linux_assym.h: linux_genassym
|
||||
./linux_genassym > linux_assym.h
|
||||
|
||||
linux_locore.o: linux_locore.s linux_assym.h
|
||||
@if [ ! -h machine ]; then ln -s ${.CURDIR}/../../i386/include machine \
|
||||
; fi
|
||||
${CPP} -DLOCORE -DKERNEL ${CPPFLAGS} ${.IMPSRC} | ${AS} ${ASFLAGS} -o ${.TARGET}
|
||||
${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}
|
||||
@ -29,8 +27,13 @@ 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
|
||||
|
||||
vnode_if.h: machine
|
||||
|
||||
afterinstall:
|
||||
${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
|
||||
${.CURDIR}/linux ${DESTDIR}/usr/bin
|
||||
${.CURDIR}/linux ${DESTDIR}/usr/bin
|
||||
|
||||
.include <bsd.kmod.mk>
|
||||
|
@ -1,4 +1,4 @@
|
||||
# $Id: Makefile,v 1.6 1996/03/02 20:00:35 peter Exp $
|
||||
# $Id: Makefile,v 1.7 1996/03/10 08:42:31 sos Exp $
|
||||
|
||||
.PATH: ${.CURDIR}/../../sys/i386/linux
|
||||
KMOD= linux_mod
|
||||
@ -10,7 +10,6 @@ OBJS= linux_locore.o
|
||||
NOMAN=
|
||||
|
||||
CFLAGS+= -DLKM -I. -DCOMPAT_43 -DCOMPAT_LINUX #-DDEBUG
|
||||
CPPFLAGS= -I. -I${.CURDIR}/../../sys
|
||||
EXPORT_SYMS=_linux_mod
|
||||
CLEANFILES+= vnode_if.h vnode_if.c linux_genassym.o linux_genassym machine \
|
||||
linux_assym.h
|
||||
@ -19,9 +18,8 @@ linux_assym.h: linux_genassym
|
||||
./linux_genassym > linux_assym.h
|
||||
|
||||
linux_locore.o: linux_locore.s linux_assym.h
|
||||
@if [ ! -h machine ]; then ln -s ${.CURDIR}/../../i386/include machine \
|
||||
; fi
|
||||
${CPP} -DLOCORE -DKERNEL ${CPPFLAGS} ${.IMPSRC} | ${AS} ${ASFLAGS} -o ${.TARGET}
|
||||
${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}
|
||||
@ -29,8 +27,13 @@ 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
|
||||
|
||||
vnode_if.h: machine
|
||||
|
||||
afterinstall:
|
||||
${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
|
||||
${.CURDIR}/linux ${DESTDIR}/usr/bin
|
||||
${.CURDIR}/linux ${DESTDIR}/usr/bin
|
||||
|
||||
.include <bsd.kmod.mk>
|
||||
|
Loading…
Reference in New Issue
Block a user