Add -aout to CFLAGS and LDFLAGS in bsd.kmod.mk, not in

src/lkm/Makefile.inc.  This fixes broken builds of the syscons LKMs
when OBJFORMAT=elf.  Removed src/lkm/Makefile.inc since it became
empty and is worse than useless.
This commit is contained in:
bde 1998-09-02 14:29:09 +00:00
parent 993f0bdaa7
commit f7659c1a7c
3 changed files with 10 additions and 9 deletions

View File

@ -1,7 +0,0 @@
# $Id: Makefile.inc,v 1.4 1997/02/22 12:47:27 peter Exp $
# already set in bsd.kmod.mk
# KMODDIR= /lkm
CFLAGS+=-aout
LDFLAGS+=-aout

View File

@ -1,5 +1,5 @@
# From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91
# $Id: bsd.kmod.mk,v 1.50 1998/07/29 14:19:48 bde Exp $
# $Id: bsd.kmod.mk,v 1.51 1998/08/08 07:02:07 peter Exp $
#
# The include file <bsd.kmod.mk> handles installing Loadable Kernel Modules.
#
@ -109,6 +109,10 @@ CFLAGS+= -I${.OBJDIR} -I${.OBJDIR}/@
CFLAGS+= -I${DESTDIR}/usr/include
.endif
# XXX temporary until we build ELF kernels.
CFLAGS+= -aout
LDFLAGS+= -aout
.if defined(NOSHARED) && ( ${NOSHARED} != "no" && ${NOSHARED} != "NO" )
LDFLAGS+= -static
.endif

View File

@ -1,5 +1,5 @@
# From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91
# $Id: bsd.kmod.mk,v 1.50 1998/07/29 14:19:48 bde Exp $
# $Id: bsd.kmod.mk,v 1.51 1998/08/08 07:02:07 peter Exp $
#
# The include file <bsd.kmod.mk> handles installing Loadable Kernel Modules.
#
@ -109,6 +109,10 @@ CFLAGS+= -I${.OBJDIR} -I${.OBJDIR}/@
CFLAGS+= -I${DESTDIR}/usr/include
.endif
# XXX temporary until we build ELF kernels.
CFLAGS+= -aout
LDFLAGS+= -aout
.if defined(NOSHARED) && ( ${NOSHARED} != "no" && ${NOSHARED} != "NO" )
LDFLAGS+= -static
.endif