Back out last commit. I expect our bsd.*.mk gods to remove the need for

defining so many extra things in addition to INTERNALLIB.  We don't like
repetitive C code and we shouldn't for make code either.

10 files changed, 27 insertions, 0 deletions

diff --git a/sys/boot/alpha/libalpha/Makefile b/sys/boot/alpha/libalpha/Makefile
index 068bd2e..a3fe818 100644
--- a/sys/boot/alpha/libalpha/Makefile
+++ b/sys/boot/alpha/libalpha/Makefile
@@ -1,6 +1,8 @@
 # $FreeBSD$
 
 LIB=		alpha
+NOPIC=		true
+NOPROFILE=	true
 INTERNALLIB=	true
 
 CFLAGS+=	-ffreestanding
diff --git a/sys/boot/arc/lib/Makefile b/sys/boot/arc/lib/Makefile
index 042ab5e..fbbfeb8 100644
--- a/sys/boot/arc/lib/Makefile
+++ b/sys/boot/arc/lib/Makefile
@@ -1,6 +1,8 @@
 # $FreeBSD$
 
 LIB=		arc
+NOPIC=		true
+NOPROFILE=	true
 INTERNALLIB=	true
 
 CFLAGS+=	-ffreestanding
diff --git a/sys/boot/efi/libefi/Makefile b/sys/boot/efi/libefi/Makefile
index 894b143..18f26a8 100644
--- a/sys/boot/efi/libefi/Makefile
+++ b/sys/boot/efi/libefi/Makefile
@@ -3,7 +3,10 @@
 .PATH: ${.CURDIR}/../../../${MACHINE_ARCH}/${MACHINE_ARCH}
 
 LIB=		efi
+NOPIC=		true
+NOPROFILE=	true
 INTERNALLIB=	true
+INTERNALSTATICLIB=	true
 
 SRCS=	libefi.c efi_console.c time.c copy.c devicename.c module.c exit.c
 SRCS+=	delay.c efifs.c efinet.c elf_freebsd.c bootinfo.c pal.s
diff --git a/sys/boot/ficl/Makefile b/sys/boot/ficl/Makefile
index 08561ec..a1187e7 100644
--- a/sys/boot/ficl/Makefile
+++ b/sys/boot/ficl/Makefile
@@ -24,6 +24,8 @@ PROG=		testmain
 .else
 LIB=		ficl
 INTERNALLIB=	yes
+INTERNALSTATICLIB= yes
+NOPROFILE=	yes
 .include <bsd.lib.mk>
 .endif
 
diff --git a/sys/boot/i386/btx/lib/Makefile b/sys/boot/i386/btx/lib/Makefile
index 5a71cb8..40c6565 100644
--- a/sys/boot/i386/btx/lib/Makefile
+++ b/sys/boot/i386/btx/lib/Makefile
@@ -5,6 +5,9 @@ AFLAGS+=	-elf
 LDFLAGS+=	-elf
 CLEANFILES+=	crt0.o
 INTERNALLIB=	true
+NOMAN=		true
+NOPIC=		true
+NOPROFILE=	true
 
 all: crt0.o
 
diff --git a/sys/boot/i386/libi386/Makefile b/sys/boot/i386/libi386/Makefile
index 1268e02..2b3e82c 100644
--- a/sys/boot/i386/libi386/Makefile
+++ b/sys/boot/i386/libi386/Makefile
@@ -1,7 +1,10 @@
 # $FreeBSD$
 #
 LIB=			i386
+NOPIC=
+NOPROFILE=
 INTERNALLIB=		true
+INTERNALSTATICLIB=	true
 
 SRCS=	aout_freebsd.c biosacpi.c bioscd.c biosdisk.c biosmem.c biospnp.c \
 	biospci.c bootinfo.c comconsole.c devicename.c elf_freebsd.c gatea20.c \
diff --git a/sys/boot/ia64/libski/Makefile b/sys/boot/ia64/libski/Makefile
index b6da2c8..417a692 100644
--- a/sys/boot/ia64/libski/Makefile
+++ b/sys/boot/ia64/libski/Makefile
@@ -1,7 +1,10 @@
 # $FreeBSD$
 
 LIB=		ski
+NOPIC=		true
+NOPROFILE=	true
 INTERNALLIB=	true
+INTERNALSTATICLIB=	true
 
 SRCS=	skiconsole.c time.c copy.c devicename.c module.c exit.c
 SRCS+=	delay.c skifs.c elf_freebsd.c bootinfo.c ssc.c
diff --git a/sys/boot/ofw/libofw/Makefile b/sys/boot/ofw/libofw/Makefile
index 87c0535..7db8b8e 100644
--- a/sys/boot/ofw/libofw/Makefile
+++ b/sys/boot/ofw/libofw/Makefile
@@ -1,7 +1,10 @@
 # $FreeBSD$
 
 LIB=		ofw
+NOPIC=		true
+NOPROFILE=	true
 INTERNALLIB=	true
+INTERNALSTATICLIB=	true
 
 SRCS=	devicename.c elf_freebsd.c ofw_console.c ofw_copy.c ofw_devsearch.c \
 	ofw_disk.c ofw_memory.c ofw_module.c ofw_net.c ofw_reboot.c \
diff --git a/sys/boot/pc98/btx/lib/Makefile b/sys/boot/pc98/btx/lib/Makefile
index 5a71cb8..40c6565 100644
--- a/sys/boot/pc98/btx/lib/Makefile
+++ b/sys/boot/pc98/btx/lib/Makefile
@@ -5,6 +5,9 @@ AFLAGS+=	-elf
 LDFLAGS+=	-elf
 CLEANFILES+=	crt0.o
 INTERNALLIB=	true
+NOMAN=		true
+NOPIC=		true
+NOPROFILE=	true
 
 all: crt0.o
 
diff --git a/sys/boot/pc98/libpc98/Makefile b/sys/boot/pc98/libpc98/Makefile
index cec2491..35bf67c 100644
--- a/sys/boot/pc98/libpc98/Makefile
+++ b/sys/boot/pc98/libpc98/Makefile
@@ -1,7 +1,10 @@
 # $FreeBSD$
 #
 LIB=			pc98
+NOPIC=
+NOPROFILE=
 INTERNALLIB=		true
+INTERNALSTATICLIB=	true
 
 .PATH:	${.CURDIR}/../../i386/libi386