From 662c47ecd32095389bf264ce1f249fb9de534295 Mon Sep 17 00:00:00 2001
From: jtk <jtk@NetBSD.org>
Date: Fri, 13 Sep 1996 02:24:30 +0000
Subject: [PATCH] use ls, not ${LS}; remove now-unneeded Makefile.inc

---
 sys/arch/i386/apm_init/Makefile     |  4 +--
 sys/arch/i386/apm_init/Makefile.inc | 52 -----------------------------
 sys/arch/i386/bioscall/Makefile     |  4 +--
 sys/arch/i386/bioscall/Makefile.inc | 52 -----------------------------
 4 files changed, 4 insertions(+), 108 deletions(-)
 delete mode 100644 sys/arch/i386/apm_init/Makefile.inc
 delete mode 100644 sys/arch/i386/bioscall/Makefile.inc

diff --git a/sys/arch/i386/apm_init/Makefile b/sys/arch/i386/apm_init/Makefile
index a67aabeaba71..3a085fcc6068 100644
--- a/sys/arch/i386/apm_init/Makefile
+++ b/sys/arch/i386/apm_init/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.5 1996/09/13 00:02:36 jtk Exp $
+#	$NetBSD: Makefile,v 1.6 1996/09/13 02:24:30 jtk Exp $
 
 CPPFLAGS=	${APMCPPFLAGS}
 CFLAGS+=	-I${.CURDIR}/../.. -I${.CURDIR}/../../..
@@ -18,7 +18,7 @@ biostramp: ${OBJS} ${DEPS}
 	${LD} -Bstatic -N -T 0 -o biostramp $(OBJS)
 	cp biostramp biostramp.sym
 	@${STRIP} biostramp
-	@if [ `${LS} -l biostramp |awk '{print $$5}'` -gt 4096 ]; then \
+	@if [ `ls -l biostramp |awk '{print $$5}'` -gt 4096 ]; then \
 		echo "biostramp too big"; \
 		exit 1; \
 	fi
diff --git a/sys/arch/i386/apm_init/Makefile.inc b/sys/arch/i386/apm_init/Makefile.inc
deleted file mode 100644
index de973af7297f..000000000000
--- a/sys/arch/i386/apm_init/Makefile.inc
+++ /dev/null
@@ -1,52 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.7 1996/09/09 18:42:51 mycroft Exp $
-#
-#	NOTE: $S must correspond to the top of the 'sys' tree
-
-APMDIR=		${I386}/apm_init
-
-APMDST?=	${.OBJDIR}/lib/apm_init
-APMINC?=	${APMDST}/biostramp.inc
-
-APMDEPS= \
-	${APMDIR}/Makefile \
-	${APMDIR}/bin2asm.sh \
-	${APMDIR}/biostramp.S \
-	${APMDIR}/rmaouthdr \
-	${.OBJDIR}/assym.h \
-	${.OBJDIR}/apm.h \
-	${I386}/include/param.h \
-	${I386}/include/cpu.h \
-	${I386}/include/psl.h \
-	${I386}/include/intr.h \
-	${I386}/include/frame.h \
-	${I386}/include/signal.h \
-	${I386}/include/trap.h \
-	${I386}/include/segments.h \
-	${I386}/include/cputypes.h \
-	${I386}/include/specialreg.h \
-	${I386}/include/apmvar.h \
-	${I386}/include/asm.h
-
-APMMAKE= \
-	cd ${APMDIR} && MAKEOBJDIR=${APMDST} ${MAKE} \
-	    CC='${CC}' CFLAGS='${CFLAGS}' \
-	    AS='${AS}' AFLAGS='${AFLAGS}' \
-	    LD='${LD}' STRIP='${STRIP}' \
-	    APMCPPFLAGS='${CPPFLAGS:S@^-I.$@-I${.OBJDIR}@}' \
-	    APMDEPS='${APMDEPS}'
-
-${APMINC}:		.NOTMAIN __always_make_apmlib \
-			${APMDEPS} apm.h
-	@echo making sure the apm grappling hook is up to date...
-	@${APMMAKE} biostramp.inc
-
-clean:: 		.NOTMAIN __always_make_apmlib
-	@echo cleaning the apm grappling hook objects
-	@${APMMAKE} clean
-
-depend:: 		.NOTMAIN __always_make_apmlib
-	@echo depending the apm grappling hook objects
-	@${APMMAKE} depend
-
-__always_make_apmlib:		.NOTMAIN
-	@mkdir -p ${APMDST}
diff --git a/sys/arch/i386/bioscall/Makefile b/sys/arch/i386/bioscall/Makefile
index a67aabeaba71..3a085fcc6068 100644
--- a/sys/arch/i386/bioscall/Makefile
+++ b/sys/arch/i386/bioscall/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.5 1996/09/13 00:02:36 jtk Exp $
+#	$NetBSD: Makefile,v 1.6 1996/09/13 02:24:30 jtk Exp $
 
 CPPFLAGS=	${APMCPPFLAGS}
 CFLAGS+=	-I${.CURDIR}/../.. -I${.CURDIR}/../../..
@@ -18,7 +18,7 @@ biostramp: ${OBJS} ${DEPS}
 	${LD} -Bstatic -N -T 0 -o biostramp $(OBJS)
 	cp biostramp biostramp.sym
 	@${STRIP} biostramp
-	@if [ `${LS} -l biostramp |awk '{print $$5}'` -gt 4096 ]; then \
+	@if [ `ls -l biostramp |awk '{print $$5}'` -gt 4096 ]; then \
 		echo "biostramp too big"; \
 		exit 1; \
 	fi
diff --git a/sys/arch/i386/bioscall/Makefile.inc b/sys/arch/i386/bioscall/Makefile.inc
deleted file mode 100644
index de973af7297f..000000000000
--- a/sys/arch/i386/bioscall/Makefile.inc
+++ /dev/null
@@ -1,52 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.7 1996/09/09 18:42:51 mycroft Exp $
-#
-#	NOTE: $S must correspond to the top of the 'sys' tree
-
-APMDIR=		${I386}/apm_init
-
-APMDST?=	${.OBJDIR}/lib/apm_init
-APMINC?=	${APMDST}/biostramp.inc
-
-APMDEPS= \
-	${APMDIR}/Makefile \
-	${APMDIR}/bin2asm.sh \
-	${APMDIR}/biostramp.S \
-	${APMDIR}/rmaouthdr \
-	${.OBJDIR}/assym.h \
-	${.OBJDIR}/apm.h \
-	${I386}/include/param.h \
-	${I386}/include/cpu.h \
-	${I386}/include/psl.h \
-	${I386}/include/intr.h \
-	${I386}/include/frame.h \
-	${I386}/include/signal.h \
-	${I386}/include/trap.h \
-	${I386}/include/segments.h \
-	${I386}/include/cputypes.h \
-	${I386}/include/specialreg.h \
-	${I386}/include/apmvar.h \
-	${I386}/include/asm.h
-
-APMMAKE= \
-	cd ${APMDIR} && MAKEOBJDIR=${APMDST} ${MAKE} \
-	    CC='${CC}' CFLAGS='${CFLAGS}' \
-	    AS='${AS}' AFLAGS='${AFLAGS}' \
-	    LD='${LD}' STRIP='${STRIP}' \
-	    APMCPPFLAGS='${CPPFLAGS:S@^-I.$@-I${.OBJDIR}@}' \
-	    APMDEPS='${APMDEPS}'
-
-${APMINC}:		.NOTMAIN __always_make_apmlib \
-			${APMDEPS} apm.h
-	@echo making sure the apm grappling hook is up to date...
-	@${APMMAKE} biostramp.inc
-
-clean:: 		.NOTMAIN __always_make_apmlib
-	@echo cleaning the apm grappling hook objects
-	@${APMMAKE} clean
-
-depend:: 		.NOTMAIN __always_make_apmlib
-	@echo depending the apm grappling hook objects
-	@${APMMAKE} depend
-
-__always_make_apmlib:		.NOTMAIN
-	@mkdir -p ${APMDST}