From 1d0de5e5577f4ac28a8bb16345e61384ac0e0dcb Mon Sep 17 00:00:00 2001
From: Bruce Evans <bde@FreeBSD.org>
Date: Wed, 2 Sep 1998 14:29:09 +0000
Subject: [PATCH] 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.

---
 lkm/Makefile.inc     | 7 -------
 share/mk/bsd.kmod.mk | 6 +++++-
 sys/conf/kmod.mk     | 6 +++++-
 3 files changed, 10 insertions(+), 9 deletions(-)
 delete mode 100644 lkm/Makefile.inc

diff --git a/lkm/Makefile.inc b/lkm/Makefile.inc
deleted file mode 100644
index 6184ee73a379..000000000000
--- a/lkm/Makefile.inc
+++ /dev/null
@@ -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
diff --git a/share/mk/bsd.kmod.mk b/share/mk/bsd.kmod.mk
index 229923b49e68..febbec5f8214 100644
--- a/share/mk/bsd.kmod.mk
+++ b/share/mk/bsd.kmod.mk
@@ -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
diff --git a/sys/conf/kmod.mk b/sys/conf/kmod.mk
index 229923b49e68..febbec5f8214 100644
--- a/sys/conf/kmod.mk
+++ b/sys/conf/kmod.mk
@@ -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