Removed now unused INTERNALSTATICLIB.

INTERNALLIB now implies NOPIC and NOPROFILE. Removed gratuitous NOMAN.
2002-05-13 11:09:07 +00:00 · 2002-05-13 11:09:07 +00:00 · 46f8fdc34e
commit 46f8fdc34e
parent 2a53f3fb35
32 changed files with 4 additions and 72 deletions
--- a/gnu/usr.bin/binutils/libbfd/Makefile
+++ b/gnu/usr.bin/binutils/libbfd/Makefile
@ -16,10 +16,7 @@ WARNS=	2
 CFLAGS+= -I${SRCDIR}/bfd
 CFLAGS+= -DBFD_VERSION=\"${VERSION_DATE}\" -DBFD_VERSION_DATE=${VERSION_DATE}
 CFLAGS+= -DBFD_VERSION_STRING=\"${VERSION}\"
-NOPROFILE=	true
-NOPIC=		true
 INTERNALLIB=	true
-INTERNALSTATICLIB=true
 CLEANFILES+=	config.h targmatch.h

 # If set, BINUTILSDISTDIR is the path to a directory containing the full GNU
--- a/gnu/usr.bin/binutils/libbinutils/Makefile
+++ b/gnu/usr.bin/binutils/libbinutils/Makefile
@ -13,9 +13,6 @@ CFLAGS+= -DTARGET=\"${TARGET_ARCH}-unknown-freebsd\"
 CFLAGS+= -DBFD_VERSION_STRING=\"${VERSION}\"
 CFLAGS+= -I${SRCDIR}/binutils
 CFLAGS+= -I${SRCDIR}/bfd
-NOPROFILE=	true
-NOPIC=		true
 INTERNALLIB=	true
-INTERNALSTATICLIB=true

 .include <bsd.lib.mk>
--- a/gnu/usr.bin/binutils/libiberty/Makefile
+++ b/gnu/usr.bin/binutils/libiberty/Makefile
@ -15,9 +15,6 @@ SRCS+=	basename.c
 .endif
 WARNS=	1
 CFLAGS+=	-DHAVE_CONFIG_H
-NOPROFILE=	true
-NOPIC=		true
 INTERNALLIB=	true
-INTERNALSTATICLIB=true

 .include <bsd.lib.mk>
--- a/gnu/usr.bin/binutils/libopcodes/Makefile
+++ b/gnu/usr.bin/binutils/libopcodes/Makefile
@ -7,10 +7,7 @@
 LIB=	opcodes
 SRCS+=	dis-buf.c disassemble.c
 CFLAGS+= -I${SRCDIR}/opcodes -I${SRCDIR}/bfd
-NOPROFILE=	true
-NOPIC=		true
 INTERNALLIB=	true
-INTERNALSTATICLIB=true

 # If set, BINUTILSDISTDIR is the path to a directory containing the full GNU
 # binutils release. FreeBSD only distributes the bits that are required to
--- a/gnu/usr.bin/groff/src/libs/libbib/Makefile
+++ b/gnu/usr.bin/groff/src/libs/libbib/Makefile
@ -2,7 +2,6 @@

 LIB=		bib
 INTERNALLIB=	YES
-INTERNALSTATICLIB=YES
 SRCS=		common.cc index.cc linear.cc search.cc map.c

 .include <bsd.lib.mk>
--- a/gnu/usr.bin/groff/src/libs/libdriver/Makefile
+++ b/gnu/usr.bin/groff/src/libs/libdriver/Makefile
@ -2,7 +2,6 @@

 LIB=		driver
 INTERNALLIB=	YES
-INTERNALSTATICLIB=YES
 SRCS=		input.cc printer.cc

 .include <bsd.lib.mk>
--- a/gnu/usr.bin/groff/src/libs/libgroff/Makefile
+++ b/gnu/usr.bin/groff/src/libs/libgroff/Makefile
@ -2,7 +2,6 @@

 LIB=		groff
 INTERNALLIB=	YES
-INTERNALSTATICLIB=YES
 SRCS=		assert.cc change_lf.cc cmap.cc cset.cc device.cc errarg.cc\
 		error.cc fatal.cc filename.cc font.cc fontfile.cc\
 		htmlindicate.cc lf.cc lineno.cc macropath.cc\
--- a/gnu/usr.bin/man/lib/Makefile
+++ b/gnu/usr.bin/man/lib/Makefile
@ -1,6 +1,7 @@
+# $FreeBSD$
+
 LIB=	man
 INTERNALLIB= true
-INTERNALSTATICLIB= true

 CFLAGS+= -DSTDC_HEADERS
 CLEANFILES+= config.h
--- a/gnu/usr.bin/rcs/lib/Makefile
+++ b/gnu/usr.bin/rcs/lib/Makefile
@ -1,3 +1,5 @@
+# $FreeBSD$
+
 # Define FSYNC_ALL to get slower but safer writes in case of crashes in
 # the middle of CVS/RCS changes
 #CFLAGS += -DFSYNC_ALL
@ -7,8 +9,6 @@ SRCS    = maketime.c partime.c rcsedit.c rcsfcmp.c rcsfnms.c rcsgen.c \
 	  rcskeep.c rcskeys.c rcslex.c rcsmap.c rcsrev.c rcssyn.c rcstime.c \
 	  rcsutil.c merger.c version.c

-NOPROFILE=		noprofile
 INTERNALLIB=		true
-INTERNALSTATICLIB=	true

 .include <bsd.lib.mk>
--- a/gnu/usr.bin/texinfo/libtxi/Makefile
+++ b/gnu/usr.bin/texinfo/libtxi/Makefile
@ -2,7 +2,6 @@

 LIB=	txi
 INTERNALLIB= true
-INTERNALSTATICLIB= true

 SRCS=	getopt.c getopt1.c substring.c xexit.c xmalloc.c xstrdup.c

--- a/kerberos5/lib/libsl/Makefile
+++ b/kerberos5/lib/libsl/Makefile
@ -7,9 +7,7 @@ CFLAGS+=-I${KRB5DIR}/lib/sl \
 	-I${.OBJDIR}
 SRCS=	sl.c roken.h

-NOPIC=	yes
 INTERNALLIB= yes
-INTERNALSTATICLIB= yes

 .include <bsd.lib.mk>

--- a/kerberos5/lib/libtelnet/Makefile
+++ b/kerberos5/lib/libtelnet/Makefile
@ -3,8 +3,6 @@
 LIB=		telnet

 INTERNALLIB=	yes
-INTERNALSTATICLIB=yes
-NOPIC=		yes

 SRCS=		genget.c getent.c misc.c encrypt.c auth.c \
 		enc_des.c sra.c pk.c
--- a/kerberos5/lib/libvers/Makefile
+++ b/kerberos5/lib/libvers/Makefile
@ -2,8 +2,6 @@

 LIB=		vers
 INTERNALLIB=	YES
-INTERNALSTATICLIB= YES
-NOPIC=		YES

 CFLAGS+=	-I${KRB5DIR}/include \
 		-I${ROKENOBJDIR} \
--- a/kerberosIV/lib/libtelnet/Makefile
+++ b/kerberosIV/lib/libtelnet/Makefile
@ -3,8 +3,6 @@
 LIB=		telnet

 INTERNALLIB=	yes
-INTERNALSTATICLIB=yes
-NOPIC=		yes

 SRCS=		genget.c getent.c misc.c encrypt.c auth.c \
 		enc_des.c sra.c pk.c
--- a/lib/libbind/Makefile
+++ b/lib/libbind/Makefile
@ -79,8 +79,6 @@ SRCS+=	tree.c bitncmp.c assertions.c \
 #	base64.c

 INTERNALLIB=		true
-NOPIC=			true
-INTERNALSTATICLIB=	true

 .include <bsd.lib.mk>

--- a/lib/libsm/Makefile
+++ b/lib/libsm/Makefile
@ -28,8 +28,6 @@ SRCS+=	assert.c debug.c errstring.c exc.c heap.c match.c rpool.c \
 CLEANFILES+=sm_os.h

 INTERNALLIB=		true
-NOPIC=			true
-INTERNALSTATICLIB=	true

 sm_os.h:
 	ln -sf ${SENDMAIL_DIR}/include/sm/os/sm_os_freebsd.h sm_os.h
--- a/lib/libsmdb/Makefile
+++ b/lib/libsmdb/Makefile
@ -18,8 +18,6 @@ SRCS+=	smdb.c smdb1.c smdb2.c smndbm.c
 CLEANFILES+=sm_os.h

 INTERNALLIB=		true
-NOPIC=			true
-INTERNALSTATICLIB=	true

 sm_os.h:
 	ln -sf ${SENDMAIL_DIR}/include/sm/os/sm_os_freebsd.h sm_os.h
--- a/lib/libsmutil/Makefile
+++ b/lib/libsmutil/Makefile
@ -18,8 +18,6 @@ SRCS+=	debug.c err.c lockfile.c safefile.c snprintf.c cf.c
 CLEANFILES+=sm_os.h

 INTERNALLIB=		true
-NOPIC=			true
-INTERNALSTATICLIB=	true

 sm_os.h:
 	ln -sf ${SENDMAIL_DIR}/include/sm/os/sm_os_freebsd.h sm_os.h
--- a/lib/libtelnet/Makefile
+++ b/lib/libtelnet/Makefile
@ -4,8 +4,6 @@
 LIB=		telnet

 INTERNALLIB=	yes
-INTERNALSTATICLIB=yes
-NOPIC=		yes

 SRCS=		genget.c getent.c misc.c

--- a/sbin/dhclient/common/Makefile
+++ b/sbin/dhclient/common/Makefile
@ -7,7 +7,6 @@ DIST_DIR= ${.CURDIR}/../../../contrib/isc-dhcp

 LIB=	dhcp
 INTERNALLIB=		true
-INTERNALSTATICLIB=	true

 SRCS=	alloc.c bpf.c comapi.c conflex.c ctrace.c discover.c dispatch.c \
 	dlpi.c dns.c ethernet.c execute.c fddi.c icmp.c inet.c lpf.c \
--- a/sbin/dhclient/dst/Makefile
+++ b/sbin/dhclient/dst/Makefile
@ -7,12 +7,9 @@ DIST_DIR= ${.CURDIR}/../../../contrib/isc-dhcp

 LIB=	 dst
 INTERNALLIB=		true
-INTERNALSTATICLIB=	true

 SRCS=	base64.c dst_api.c dst_support.c hmac_link.c md5_dgst.c prandom.c

 CFLAGS+= -DHMAC_MD5 -DMINIRES_LIB

-NOMAN=			true
-
 .include <bsd.lib.mk>
--- a/sbin/dhclient/minires/Makefile
+++ b/sbin/dhclient/minires/Makefile
@ -7,7 +7,6 @@ DIST_DIR= ${.CURDIR}/../../../contrib/isc-dhcp

 LIB=	res
 INTERNALLIB=		true
-INTERNALSTATICLIB=	true

 SRCS=	ns_date.c ns_name.c ns_parse%FIXED.c ns_samedomain.c ns_sign.c ns_verify.c \
 	res_comp.c res_findzonecut.c res_init.c res_mkquery.c res_mkupdate.c \
@ -15,8 +14,6 @@ SRCS=	ns_date.c ns_name.c ns_parse%FIXED.c ns_samedomain.c ns_sign.c ns_verify.c

 CFLAGS+= -DHMAC_MD5 -DMINIRES_LIB

-NOMAN=	true
-
 CLEANFILES+=	ns_parse%FIXED.c res_query%FIXED.c
 ns_parse%FIXED.c: ns_parse.c
 	sed 's/struct _ns_flagdata _ns_flagdata/struct _ns_flagdata _ns_flagdata_DONT/'	\
--- a/sbin/dhclient/omapip/Makefile
+++ b/sbin/dhclient/omapip/Makefile
@ -7,7 +7,6 @@ DIST_DIR= ${.CURDIR}/../../../contrib/isc-dhcp

 LIB=	 omapi
 INTERNALLIB=		true
-INTERNALSTATICLIB=	true

 SRCS=	alloc.c array.c auth.c buffer.c connection.c convert.c dispatch.c \
 	errwarn.c generic.c handle.c hash.c inet_addr.c listener.c \
--- a/secure/lib/libtelnet/Makefile
+++ b/secure/lib/libtelnet/Makefile
@ -3,8 +3,6 @@
 LIB=		telnet

 INTERNALLIB=	yes
-INTERNALSTATICLIB=yes
-NOPIC=		yes

 SRCS=		genget.c getent.c misc.c encrypt.c auth.c \
 		enc_des.c sra.c pk.c
--- 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
--- 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 <bsd.lib.mk>
 .endif

--- 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 \
--- 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
--- 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 \
--- 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

--- a/usr.sbin/ntp/libntp/Makefile
+++ b/usr.sbin/ntp/libntp/Makefile
@ -3,11 +3,7 @@
 .PATH: ${.CURDIR}/../../../contrib/ntp/libntp

 LIB= ntp
-NOPROFILE=		true
 INTERNALLIB=		true
-NOPIC=			true
-INTERNALSTATICLIB=	true
-NOMAN=			true

 SRCS=	a_md5encrypt.c	adjtime.c	atoint.c	atolfp.c \
 	atouint.c	audio.c	authencrypt.c	authkeys.c \
--- a/usr.sbin/ntp/libparse/Makefile
+++ b/usr.sbin/ntp/libparse/Makefile
@ -3,11 +3,7 @@
 .PATH: ${.CURDIR}/../../../contrib/ntp/libparse

 LIB= parse
-NOPROFILE=              true
-NOPIC=                  true
 INTERNALLIB=            true
-INTERNALSTATICLIB=      true
-NOMAN=                  true

 SRCS=	clk_computime.c	clk_dcf7000.c	clk_hopf6021.c	clk_meinberg.c \
 	clk_rawdcf.c	clk_rcc8000.c	clk_schmid.c	clk_trimtaip.c \