From 74176cc1618932a3f20bb4d6cd287faf3fb63332 Mon Sep 17 00:00:00 2001 From: ru Date: Tue, 21 Dec 2004 09:33:47 +0000 Subject: NODOCCOMPRESS -> NO_DOCCOMPRESS NOINFO -> NO_INFO NOINFOCOMPRESS -> NO_INFOCOMPRESS NOLINT -> NO_LINT NOPIC -> NO_PIC NOPROFILE -> NO_PROFILE --- lib/libc_r/Makefile | 4 ++-- lib/libcompat/Makefile | 2 +- lib/libdisk/Makefile | 4 ++-- lib/libncurses/Makefile | 6 +++--- lib/libpam/libpam/Makefile | 2 +- lib/libpam/modules/Makefile.inc | 4 ++-- lib/libstand/Makefile | 4 ++-- lib/liby/Makefile | 2 +- lib/ncurses/ncurses/Makefile | 6 +++--- 9 files changed, 17 insertions(+), 17 deletions(-) (limited to 'lib') diff --git a/lib/libc_r/Makefile b/lib/libc_r/Makefile index a0e98e1..08512b3 100644 --- a/lib/libc_r/Makefile +++ b/lib/libc_r/Makefile @@ -27,10 +27,10 @@ PRECIOUSLIB= .if ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "sparc64" SYMLINKS+=lib${LIB}.a ${LIBDIR}/libpthread.a -.if !defined(NOPIC) +.if !defined(NO_PIC) SYMLINKS+=lib${LIB}.so ${SHLIBDIR}/libpthread.so .endif -.if !defined(NOPROFILE) +.if !defined(NO_PROFILE) SYMLINKS+=lib${LIB}_p.a ${LIBDIR}/libpthread_p.a .endif .endif diff --git a/lib/libcompat/Makefile b/lib/libcompat/Makefile index 5cac818..b9b174d 100644 --- a/lib/libcompat/Makefile +++ b/lib/libcompat/Makefile @@ -3,7 +3,7 @@ LIB=compat CFLAGS+=-DLIBC_SCCS -DSYSLIBC_SCCS -I${.CURDIR}/../libc/locale -NOPIC= +NO_PIC= .PATH: ${.CURDIR}/4.1/${MACHINE_ARCH} ${.CURDIR}/4.1 \ ${.CURDIR}/4.3/${MACHINE_ARCH} ${.CURDIR}/4.3 \ diff --git a/lib/libdisk/Makefile b/lib/libdisk/Makefile index d47da8f..ebc5991 100644 --- a/lib/libdisk/Makefile +++ b/lib/libdisk/Makefile @@ -21,8 +21,8 @@ CFLAGS+= -DPC98 .endif CLEANFILES+= tmp.c tst01 tst01.o -NOPROFILE= -NOPIC= +NO_PROFILE= +NO_PIC= MAN= libdisk.3 diff --git a/lib/libncurses/Makefile b/lib/libncurses/Makefile index 1eb3eb4..38334cc 100644 --- a/lib/libncurses/Makefile +++ b/lib/libncurses/Makefile @@ -234,7 +234,7 @@ SYMLINKS+=libncurses.a ${LIBDIR}/libtermlib.a SYMLINKS+=libncurses.a ${LIBDIR}/libmytinfo.a SYMLINKS+=libncurses.a ${LIBDIR}/libtinfo.a .endif -.if !defined(NOPIC) +.if !defined(NO_PIC) # no need for major at all, it's an ld-time redirection only SYMLINKS+=libncurses.so ${LIBDIR}/libcurses.so SYMLINKS+=libncurses.so ${LIBDIR}/libtermcap.so @@ -242,7 +242,7 @@ SYMLINKS+=libncurses.so ${LIBDIR}/libtermlib.so SYMLINKS+=libncurses.so ${LIBDIR}/libmytinfo.so SYMLINKS+=libncurses.so ${LIBDIR}/libtinfo.so .endif -.if !defined(NOPROFILE) +.if !defined(NO_PROFILE) SYMLINKS+=libncurses_p.a ${LIBDIR}/libcurses_p.a SYMLINKS+=libncurses_p.a ${LIBDIR}/libtermcap_p.a SYMLINKS+=libncurses_p.a ${LIBDIR}/libtermlib_p.a @@ -556,6 +556,6 @@ MLINKS+=curs_window.3 delwin.3 curs_window.3 derwin.3 curs_window.3 dupwin.3 \ MLINKS+=default_colors.3 assume_default_colors.3 \ default_colors.3 use_default_colors.3 -NOLINT= +NO_LINT= .include diff --git a/lib/libpam/libpam/Makefile b/lib/libpam/libpam/Makefile index e6763e9..43f3b16 100644 --- a/lib/libpam/libpam/Makefile +++ b/lib/libpam/libpam/Makefile @@ -39,7 +39,7 @@ OPENPAM= ${.CURDIR}/../../../contrib/openpam .PATH: ${OPENPAM}/include ${OPENPAM}/lib ${OPENPAM}/doc/man LIB= pam -NOPROFILE= +NO_PROFILE= SRCS= openpam_borrow_cred.c \ openpam_configure.c \ diff --git a/lib/libpam/modules/Makefile.inc b/lib/libpam/modules/Makefile.inc index 1fa92e8..317b3fe 100644 --- a/lib/libpam/modules/Makefile.inc +++ b/lib/libpam/modules/Makefile.inc @@ -3,7 +3,7 @@ PAMDIR= ${.CURDIR}/../../../../contrib/openpam NOINSTALLLIB= -NOPROFILE= +NO_PROFILE= CFLAGS+= -I${PAMDIR}/include -I${.CURDIR}/../../libpam WARNS?= 4 @@ -12,7 +12,7 @@ WARNS?= 4 # For the static case, libpam.a depends on the modules. # For the dynamic case, the modules depend on libpam.so.N .if defined(_NO_LIBPAM_SO_YET) -NOPIC= +NO_PIC= .else SHLIB_NAME?= ${LIB}.so.${SHLIB_MAJOR} DPADD+= ${LIBPAM} diff --git a/lib/libstand/Makefile b/lib/libstand/Makefile index 3261f34..0b961be 100644 --- a/lib/libstand/Makefile +++ b/lib/libstand/Makefile @@ -7,8 +7,8 @@ # LIB= stand -NOPROFILE= -NOPIC= +NO_PROFILE= +NO_PIC= INCS= stand.h MAN= libstand.3 diff --git a/lib/liby/Makefile b/lib/liby/Makefile index 417f431..8a3f6b4 100644 --- a/lib/liby/Makefile +++ b/lib/liby/Makefile @@ -5,6 +5,6 @@ SHLIB_MAJOR= 2 SRCS= main.c yyerror.c -NOPIC= +NO_PIC= .include diff --git a/lib/ncurses/ncurses/Makefile b/lib/ncurses/ncurses/Makefile index 1eb3eb4..38334cc 100644 --- a/lib/ncurses/ncurses/Makefile +++ b/lib/ncurses/ncurses/Makefile @@ -234,7 +234,7 @@ SYMLINKS+=libncurses.a ${LIBDIR}/libtermlib.a SYMLINKS+=libncurses.a ${LIBDIR}/libmytinfo.a SYMLINKS+=libncurses.a ${LIBDIR}/libtinfo.a .endif -.if !defined(NOPIC) +.if !defined(NO_PIC) # no need for major at all, it's an ld-time redirection only SYMLINKS+=libncurses.so ${LIBDIR}/libcurses.so SYMLINKS+=libncurses.so ${LIBDIR}/libtermcap.so @@ -242,7 +242,7 @@ SYMLINKS+=libncurses.so ${LIBDIR}/libtermlib.so SYMLINKS+=libncurses.so ${LIBDIR}/libmytinfo.so SYMLINKS+=libncurses.so ${LIBDIR}/libtinfo.so .endif -.if !defined(NOPROFILE) +.if !defined(NO_PROFILE) SYMLINKS+=libncurses_p.a ${LIBDIR}/libcurses_p.a SYMLINKS+=libncurses_p.a ${LIBDIR}/libtermcap_p.a SYMLINKS+=libncurses_p.a ${LIBDIR}/libtermlib_p.a @@ -556,6 +556,6 @@ MLINKS+=curs_window.3 delwin.3 curs_window.3 derwin.3 curs_window.3 dupwin.3 \ MLINKS+=default_colors.3 assume_default_colors.3 \ default_colors.3 use_default_colors.3 -NOLINT= +NO_LINT= .include -- cgit v1.1