From 3bf8b9cee342406047c93f30bb2f82844ee31e65 Mon Sep 17 00:00:00 2001 From: "David E. O'Brien" Date: Sat, 11 May 2002 18:02:33 +0000 Subject: NOPIC, NOPROFILE, NOMAN, and INTERNALSTATICLIB are redundant when using INTERNALLIB now. --- sys/boot/alpha/libalpha/Makefile | 2 -- sys/boot/arc/lib/Makefile | 2 -- sys/boot/efi/libefi/Makefile | 3 --- sys/boot/ficl/Makefile | 2 -- sys/boot/i386/btx/lib/Makefile | 3 --- sys/boot/i386/libi386/Makefile | 3 --- sys/boot/ia64/libski/Makefile | 3 --- sys/boot/ofw/libofw/Makefile | 3 --- sys/boot/pc98/btx/lib/Makefile | 3 --- sys/boot/pc98/libpc98/Makefile | 3 --- 10 files changed, 27 deletions(-) diff --git a/sys/boot/alpha/libalpha/Makefile b/sys/boot/alpha/libalpha/Makefile index a3fe81835924..068bd2edcc93 100644 --- a/sys/boot/alpha/libalpha/Makefile +++ b/sys/boot/alpha/libalpha/Makefile @@ -1,8 +1,6 @@ # $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 fbbfeb8356b9..042ab5e85a48 100644 --- a/sys/boot/arc/lib/Makefile +++ b/sys/boot/arc/lib/Makefile @@ -1,8 +1,6 @@ # $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 18f26a89f53b..894b14371c09 100644 --- a/sys/boot/efi/libefi/Makefile +++ b/sys/boot/efi/libefi/Makefile @@ -3,10 +3,7 @@ .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 a1187e7e7366..08561ec89254 100644 --- a/sys/boot/ficl/Makefile +++ b/sys/boot/ficl/Makefile @@ -24,8 +24,6 @@ PROG= testmain .else LIB= ficl INTERNALLIB= yes -INTERNALSTATICLIB= yes -NOPROFILE= yes .include .endif diff --git a/sys/boot/i386/btx/lib/Makefile b/sys/boot/i386/btx/lib/Makefile index 40c65657ea7a..5a71cb81d0a7 100644 --- a/sys/boot/i386/btx/lib/Makefile +++ b/sys/boot/i386/btx/lib/Makefile @@ -5,9 +5,6 @@ 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 2b3e82c2eebd..1268e02eb5ad 100644 --- a/sys/boot/i386/libi386/Makefile +++ b/sys/boot/i386/libi386/Makefile @@ -1,10 +1,7 @@ # $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 417a6922dedb..b6da2c8ef6ff 100644 --- a/sys/boot/ia64/libski/Makefile +++ b/sys/boot/ia64/libski/Makefile @@ -1,10 +1,7 @@ # $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 7db8b8e36a0d..87c0535b3fe7 100644 --- a/sys/boot/ofw/libofw/Makefile +++ b/sys/boot/ofw/libofw/Makefile @@ -1,10 +1,7 @@ # $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 40c65657ea7a..5a71cb81d0a7 100644 --- a/sys/boot/pc98/btx/lib/Makefile +++ b/sys/boot/pc98/btx/lib/Makefile @@ -5,9 +5,6 @@ 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 35bf67c0e1bd..cec2491333d3 100644 --- a/sys/boot/pc98/libpc98/Makefile +++ b/sys/boot/pc98/libpc98/Makefile @@ -1,10 +1,7 @@ # $FreeBSD$ # LIB= pc98 -NOPIC= -NOPROFILE= INTERNALLIB= true -INTERNALSTATICLIB= true .PATH: ${.CURDIR}/../../i386/libi386 -- cgit v1.2.3