From 46f8fdc34e061de76cb8dfa19872edcd2fe2c66b Mon Sep 17 00:00:00 2001 From: Ruslan Ermilov Date: Mon, 13 May 2002 11:09:07 +0000 Subject: [PATCH] Removed now unused INTERNALSTATICLIB. INTERNALLIB now implies NOPIC and NOPROFILE. Removed gratuitous NOMAN. --- gnu/usr.bin/binutils/libbfd/Makefile | 3 --- gnu/usr.bin/binutils/libbinutils/Makefile | 3 --- gnu/usr.bin/binutils/libiberty/Makefile | 3 --- gnu/usr.bin/binutils/libopcodes/Makefile | 3 --- gnu/usr.bin/groff/src/libs/libbib/Makefile | 1 - gnu/usr.bin/groff/src/libs/libdriver/Makefile | 1 - gnu/usr.bin/groff/src/libs/libgroff/Makefile | 1 - gnu/usr.bin/man/lib/Makefile | 3 ++- gnu/usr.bin/rcs/lib/Makefile | 4 ++-- gnu/usr.bin/texinfo/libtxi/Makefile | 1 - kerberos5/lib/libsl/Makefile | 2 -- kerberos5/lib/libtelnet/Makefile | 2 -- kerberos5/lib/libvers/Makefile | 2 -- kerberosIV/lib/libtelnet/Makefile | 2 -- lib/libbind/Makefile | 2 -- lib/libsm/Makefile | 2 -- lib/libsmdb/Makefile | 2 -- lib/libsmutil/Makefile | 2 -- lib/libtelnet/Makefile | 2 -- sbin/dhclient/common/Makefile | 1 - sbin/dhclient/dst/Makefile | 3 --- sbin/dhclient/minires/Makefile | 3 --- sbin/dhclient/omapip/Makefile | 1 - secure/lib/libtelnet/Makefile | 2 -- sys/boot/efi/libefi/Makefile | 3 --- sys/boot/ficl/Makefile | 2 -- sys/boot/i386/libi386/Makefile | 3 --- sys/boot/ia64/libski/Makefile | 3 --- sys/boot/ofw/libofw/Makefile | 3 --- sys/boot/pc98/libpc98/Makefile | 3 --- usr.sbin/ntp/libntp/Makefile | 4 ---- usr.sbin/ntp/libparse/Makefile | 4 ---- 32 files changed, 4 insertions(+), 72 deletions(-) diff --git a/gnu/usr.bin/binutils/libbfd/Makefile b/gnu/usr.bin/binutils/libbfd/Makefile index fee486c30982..2aea1f401e15 100644 --- 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 diff --git a/gnu/usr.bin/binutils/libbinutils/Makefile b/gnu/usr.bin/binutils/libbinutils/Makefile index ef58e82ef78f..d9cd774f28d6 100644 --- 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 diff --git a/gnu/usr.bin/binutils/libiberty/Makefile b/gnu/usr.bin/binutils/libiberty/Makefile index 3d86ef443e53..f34be9e2f2ca 100644 --- 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 diff --git a/gnu/usr.bin/binutils/libopcodes/Makefile b/gnu/usr.bin/binutils/libopcodes/Makefile index 356ecb706b42..053245f89e97 100644 --- 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 diff --git a/gnu/usr.bin/groff/src/libs/libbib/Makefile b/gnu/usr.bin/groff/src/libs/libbib/Makefile index af1f60590b96..a4d3f234adf6 100644 --- 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 diff --git a/gnu/usr.bin/groff/src/libs/libdriver/Makefile b/gnu/usr.bin/groff/src/libs/libdriver/Makefile index e082c7930e6d..6eab2412ae0e 100644 --- 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 diff --git a/gnu/usr.bin/groff/src/libs/libgroff/Makefile b/gnu/usr.bin/groff/src/libs/libgroff/Makefile index d768cf93af4c..d309f1933c68 100644 --- 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\ diff --git a/gnu/usr.bin/man/lib/Makefile b/gnu/usr.bin/man/lib/Makefile index c29bf7cf08ae..243d141eaf1f 100644 --- 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 diff --git a/gnu/usr.bin/rcs/lib/Makefile b/gnu/usr.bin/rcs/lib/Makefile index d3792325a0fb..ce0865143bd0 100644 --- 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 diff --git a/gnu/usr.bin/texinfo/libtxi/Makefile b/gnu/usr.bin/texinfo/libtxi/Makefile index b7427aa07ef1..96df19ab68cb 100644 --- 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 diff --git a/kerberos5/lib/libsl/Makefile b/kerberos5/lib/libsl/Makefile index c26f13cd1b86..45b2eccfd544 100644 --- 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 diff --git a/kerberos5/lib/libtelnet/Makefile b/kerberos5/lib/libtelnet/Makefile index 2286cf9ec3cd..d78e65f0dabb 100644 --- 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 diff --git a/kerberos5/lib/libvers/Makefile b/kerberos5/lib/libvers/Makefile index 6f31ea5e8d9d..02e2717d1de8 100644 --- 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} \ diff --git a/kerberosIV/lib/libtelnet/Makefile b/kerberosIV/lib/libtelnet/Makefile index 7b3f012447ab..ba0be87c2c13 100644 --- 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 diff --git a/lib/libbind/Makefile b/lib/libbind/Makefile index 4747957b516e..fcbddf345ffd 100644 --- 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 diff --git a/lib/libsm/Makefile b/lib/libsm/Makefile index b3b74d8ff8c7..0fdc44752545 100644 --- 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 diff --git a/lib/libsmdb/Makefile b/lib/libsmdb/Makefile index 816a1ec3d504..a4414142740e 100644 --- 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 diff --git a/lib/libsmutil/Makefile b/lib/libsmutil/Makefile index fe65a06ee7da..03673cac0eab 100644 --- 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 diff --git a/lib/libtelnet/Makefile b/lib/libtelnet/Makefile index 2b55cbe0c154..542a2615290e 100644 --- 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 diff --git a/sbin/dhclient/common/Makefile b/sbin/dhclient/common/Makefile index 0e859814d763..5d4bb92f6e83 100644 --- 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 \ diff --git a/sbin/dhclient/dst/Makefile b/sbin/dhclient/dst/Makefile index e0624797f1df..b501a2e8f6ea 100644 --- 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 diff --git a/sbin/dhclient/minires/Makefile b/sbin/dhclient/minires/Makefile index 046740e1dd9c..e0013b47737c 100644 --- 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/' \ diff --git a/sbin/dhclient/omapip/Makefile b/sbin/dhclient/omapip/Makefile index 5c1b0b6585fc..f2b5fbda968e 100644 --- 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 \ diff --git a/secure/lib/libtelnet/Makefile b/secure/lib/libtelnet/Makefile index 1e0fb0ce9523..102be59108e4 100644 --- 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 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/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/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 diff --git a/usr.sbin/ntp/libntp/Makefile b/usr.sbin/ntp/libntp/Makefile index 589c2891da80..d4101a9e5570 100644 --- 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 \ diff --git a/usr.sbin/ntp/libparse/Makefile b/usr.sbin/ntp/libparse/Makefile index 1a142baacf4e..6176726be842 100644 --- 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 \