Index: head/lib/libpam/modules/pam_unix/Makefile =================================================================== --- head/lib/libpam/modules/pam_unix/Makefile (revision 172831) +++ head/lib/libpam/modules/pam_unix/Makefile (revision 172832) @@ -1,53 +1,54 @@ # Copyright 1998 Juniper Networks, Inc. # All rights reserved. # Copyright (c) 2002 Networks Associates Technology, Inc. # All rights reserved. # # Portions of this software was developed for the FreeBSD Project by # ThinkSec AS and NAI Labs, the Security Research Division of Network # Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035 # ("CBOSS"), as part of the DARPA CHATS research program. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions # are met: # 1. Redistributions of source code must retain the above copyright # notice, this list of conditions and the following disclaimer. # 2. Redistributions in binary form must reproduce the above copyright # notice, this list of conditions and the following disclaimer in the # documentation and/or other materials provided with the distribution. # 3. The name of the author may not be used to endorse or promote # products derived from this software without specific prior written # permission. # # THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE # ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE # FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL # DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS # OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) # HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # # $FreeBSD$ NO_PROFILE= +NO_INSTALLLIB= .include LIB= pam_unix SRCS= pam_unix.c MAN= pam_unix.8 DPADD= ${LIBUTIL} ${LIBCRYPT} LDADD= -lutil -lcrypt .if ${MK_NIS} != "no" CFLAGS+= -DYP DPADD+= ${LIBYPCLNT} LDADD+= -lypclnt .endif .include Index: head/lib/ncurses/ncurses/Makefile =================================================================== --- head/lib/ncurses/ncurses/Makefile (revision 172831) +++ head/lib/ncurses/ncurses/Makefile (revision 172832) @@ -1,948 +1,948 @@ # $FreeBSD$ SHLIBDIR?= /lib .include .include "${.CURDIR}/../config.mk" LIB= ncurses${LIB_SUFFIX} SHLIB_MAJOR= 7 NO_LINT= NCURSES_MAJOR!= egrep 'NCURSES_MAJOR[ ]*=' ${NCURSES_DIR}/dist.mk | sed -e 's%^[^0-9]*%%' NCURSES_MINOR!= egrep 'NCURSES_MINOR[ ]*=' ${NCURSES_DIR}/dist.mk | sed -e 's%^[^0-9]*%%' NCURSES_PATCH!= egrep 'NCURSES_PATCH[ ]*=' ${NCURSES_DIR}/dist.mk | sed -e 's%^[^0-9]*%%' # From autoconf (!) .if defined(ENABLE_WIDEC) NCURSES_CH_T= cchar_t NEED_WCHAR_H= 1 .else NCURSES_CH_T= chtype NEED_WCHAR_H= 0 .endif NCURSES_CONST= const NCURSES_EXT_COLORS= 0 NCURSES_EXT_FUNCS= 1 NCURSES_INLINE= inline NCURSES_LIBUTF8= 0 NCURSES_MBSTATE_T= 0 NCURSES_MOUSE_VERSION= 1 NCURSES_OSPEED= short NCURSES_SBOOL= char NCURSES_TPARM_VARARGS= 1 NCURSES_WCHAR_T= 0 NCURSES_WINT_T= 0 NCURSES_XNAMES= 1 BROKEN_LINKER= 0 BUILTIN_BOOL= 1 ENABLE_LP64= 0 HAVE_TCGETATTR= 1 HAVE_TERMIOS_H= 1 HAVE_TERMIO_H= 0 HAVE_VSSCANF= 1 HEADER_STDBOOL= 1 # XXX amd64, ia64 1L and int ONEUL= 1UL TYPEOF_CHTYPE= long TYPEOF_MMASK_T= long TYPE_OF_BOOL= unsigned char USE_CXX_BOOL= defined(__cplusplus) GENSRCS= \ codes.c \ expanded.c \ fallback.c \ lib_gen.c \ lib_keyname.c \ names.c \ unctrl.c GENHDRS= \ curses.h \ hashsize.h \ init_keytry.h \ ncurses_def.h \ nomacros.h \ parametrized.h \ term.h \ termcap.h \ unctrl.h SRCS= ${GENHDRS} ${GENSRCS} .PATH: ${NCURSES_DIR}/ncurses/base SRCS+= \ define_key.c \ key_defined.c \ keybound.c \ keyok.c \ legacy_coding.c \ lib_addch.c \ lib_addstr.c \ lib_beep.c \ lib_bkgd.c \ lib_box.c \ lib_chgat.c \ lib_clear.c \ lib_clearok.c \ lib_clrbot.c \ lib_clreol.c \ lib_color.c \ lib_colorset.c \ lib_delch.c \ lib_delwin.c \ lib_dft_fgbg.c \ lib_echo.c \ lib_endwin.c \ lib_erase.c \ lib_flash.c \ lib_freeall.c \ lib_getch.c \ lib_getstr.c \ lib_hline.c \ lib_immedok.c \ lib_inchstr.c \ lib_initscr.c \ lib_insch.c \ lib_insdel.c \ lib_insnstr.c \ lib_instr.c \ lib_isendwin.c \ lib_leaveok.c \ lib_mouse.c \ lib_move.c \ lib_mvwin.c \ lib_newterm.c \ lib_newwin.c \ lib_nl.c \ lib_overlay.c \ lib_pad.c \ lib_printw.c \ lib_redrawln.c \ lib_refresh.c \ lib_restart.c \ lib_scanw.c \ lib_screen.c \ lib_scroll.c \ lib_scrollok.c \ lib_scrreg.c \ lib_set_term.c \ lib_slk.c \ lib_slkatr_set.c \ lib_slkatrof.c \ lib_slkatron.c \ lib_slkatrset.c \ lib_slkattr.c \ lib_slkclear.c \ lib_slkcolor.c \ lib_slkinit.c \ lib_slklab.c \ lib_slkrefr.c \ lib_slkset.c \ lib_slktouch.c \ lib_touch.c \ lib_ungetch.c \ lib_vline.c \ lib_wattroff.c \ lib_wattron.c \ lib_winch.c \ lib_window.c \ memmove.c \ nc_panel.c \ resizeterm.c \ safe_sprintf.c \ tries.c \ version.c \ vsscanf.c \ wresize.c .PATH: ${NCURSES_DIR}/ncurses/tinfo SRCS+= \ access.c \ add_tries.c \ alloc_entry.c \ alloc_ttype.c \ captoinfo.c \ comp_captab.c \ comp_error.c \ comp_expand.c \ comp_hash.c \ comp_parse.c \ comp_scan.c \ db_iterator.c \ doalloc.c \ free_ttype.c \ getenv_num.c \ hashed_db.c \ home_terminfo.c \ init_keytry.c \ lib_acs.c \ lib_baudrate.c \ lib_cur_term.c \ lib_data.c \ lib_has_cap.c \ lib_kernel.c \ lib_longname.c \ lib_napms.c \ lib_options.c \ lib_print.c \ lib_raw.c \ lib_setup.c \ lib_termcap.c \ lib_termname.c \ lib_tgoto.c \ lib_ti.c \ lib_tparm.c \ lib_tputs.c \ lib_ttyflags.c \ name_match.c \ parse_entry.c \ read_entry.c \ setbuf.c \ strings.c \ trim_sgr0.c \ write_entry.c .PATH: ${NCURSES_DIR}/ncurses/tty SRCS+= \ hardscroll.c \ hashmap.c \ lib_mvcur.c \ lib_tstp.c \ lib_twait.c \ lib_vidattr.c \ tty_update.c .if defined(ENABLE_WIDEC) .PATH: ${NCURSES_DIR}/ncurses/widechar SRCS+= \ charable.c \ lib_add_wch.c \ lib_box_set.c \ lib_cchar.c \ lib_erasewchar.c \ lib_get_wch.c \ lib_get_wstr.c \ lib_hline_set.c \ lib_in_wch.c \ lib_in_wchnstr.c \ lib_ins_wch.c \ lib_inwstr.c \ lib_pecho_wchar.c \ lib_slk_wset.c \ lib_unget_wch.c \ lib_vid_attr.c \ lib_vline_set.c \ lib_wacs.c \ lib_wunctrl.c .endif .PATH: ${NCURSES_DIR}/ncurses/trace SRCS+= \ lib_trace.c \ visbuf.c # Currently unused, for debugging libncurses itself. DBGSRCS= \ lib_traceatr.c \ lib_tracebits.c \ lib_tracechr.c \ lib_tracedmp.c \ lib_tracemse.c \ trace_buf.c \ trace_tries.c \ trace_xnames.c \ varargs.c # From our old libtermcap. # Used instead of the hideous read_termcap.c abomination. SRCS+= termcap.c # Components of names.c and codes.c NAMESRCS= boolnames boolfnames numnames numfnames strnames strfnames CODESRCS= boolcodes numcodes strcodes CLEANFILES= ${GENSRCS} ${GENHDRS} keys.list make_hash term.h.new \ make_keys MKterm.h.awk comp_captab.c curses.head \ namehdr nameftr codeftr ${NAMESRCS} ${CODESRCS} CFLAGS+= -DFREEBSD_NATIVE -DTERMIOS # Installed HEADERS= curses.h term.h termcap.h unctrl.h SRCHDRS= ncurses_dll.h .if defined(ENABLE_WIDEC) INCS= ${HEADERS} ${SRCHDRS} INCSLINKS= curses.h ${INCLUDEDIR}/ncurses.h .endif -.if !defined(NO_INSTALLLIB) +.if ${MK_INSTALLLIB} != "no" SYMLINKS+= libncurses${LIB_SUFFIX}.a ${LIBDIR}/libcurses${LIB_SUFFIX}.a SYMLINKS+= libncurses${LIB_SUFFIX}.a ${LIBDIR}/libtermcap${LIB_SUFFIX}.a SYMLINKS+= libncurses${LIB_SUFFIX}.a ${LIBDIR}/libtermlib${LIB_SUFFIX}.a SYMLINKS+= libncurses${LIB_SUFFIX}.a ${LIBDIR}/libtinfo${LIB_SUFFIX}.a .endif .if !defined(NO_PIC) # no need for major at all, it's an ld-time redirection only SYMLINKS+= libncurses${LIB_SUFFIX}.so ${LIBDIR}/libcurses${LIB_SUFFIX}.so SYMLINKS+= libncurses${LIB_SUFFIX}.so ${LIBDIR}/libtermcap${LIB_SUFFIX}.so SYMLINKS+= libncurses${LIB_SUFFIX}.so ${LIBDIR}/libtermlib${LIB_SUFFIX}.so SYMLINKS+= libncurses${LIB_SUFFIX}.so ${LIBDIR}/libtinfo${LIB_SUFFIX}.so .endif .if ${MK_PROFILE} != "no" SYMLINKS+= libncurses${LIB_SUFFIX}_p.a ${LIBDIR}/libcurses${LIB_SUFFIX}_p.a SYMLINKS+= libncurses${LIB_SUFFIX}_p.a ${LIBDIR}/libtermcap${LIB_SUFFIX}_p.a SYMLINKS+= libncurses${LIB_SUFFIX}_p.a ${LIBDIR}/libtermlib${LIB_SUFFIX}_p.a SYMLINKS+= libncurses${LIB_SUFFIX}_p.a ${LIBDIR}/libtinfo${LIB_SUFFIX}_p.a .endif DOCSDIR= ${SHAREDIR}/doc/ncurses DOCS= ncurses-intro.html hackguide.html .if ${MK_HTML} != "no" .PATH: ${NCURSES_DIR}/doc/html FILESGROUPS= DOCS .endif # Generated source namehdr nameftr codeftr ${NAMESRCS} ${CODESRCS}: MKnames.awk Caps ${AWK} -f ${NCURSES_DIR}/ncurses/tinfo/MKnames.awk ${NCURSES_DIR}/include/Caps .ORDER: namehdr ${NAMESRCS} ${CODESRCS} nameftr codeftr names.c codes.c names.c: namehdr ${NAMESRCS} nameftr cat namehdr ${NAMESRCS} nameftr > $@ codes.c: namehdr ${CODESRCS} codeftr cat namehdr ${CODESRCS} codeftr > $@ lib_gen.c: MKlib_gen.sh curses.h LC_ALL=C sh ${NCURSES_DIR}/ncurses/base/MKlib_gen.sh "${CC} -E ${CFLAGS}" \ "${AWK}" generated < curses.h >$@ lib_keyname.c: keys.list MKkeyname.awk ${AWK} -f ${NCURSES_DIR}/ncurses/base/MKkeyname.awk keys.list > lib_keyname.c unctrl.c: MKunctrl.awk echo | ${AWK} -f ${NCURSES_DIR}/ncurses/base/MKunctrl.awk > unctrl.c comp_captab.c: MKcaptab.awk Caps make_hash sh ${NCURSES_DIR}/ncurses/tinfo/MKcaptab.awk "${AWK}" \ ${NCURSES_DIR}/include/Caps > comp_captab.c expanded.c: MKexpanded.sh sh ${NCURSES_DIR}/ncurses/tty/MKexpanded.sh "${CC} -E" ${CFLAGS} >expanded.c fallback.c: MKfallback.sh sh ${NCURSES_DIR}/ncurses/tinfo/MKfallback.sh > fallback.c # Generated headers nomacros.h: MKlib_gen.sh curses.h LC_ALL=C sh ${NCURSES_DIR}/ncurses/base/MKlib_gen.sh "${CC} -E ${CFLAGS}" \ "${AWK}" generated < curses.h | fgrep undef > $@ init_keytry.h: keys.list make_keys ./make_keys keys.list > init_keytry.h hashsize.h: MKhashsize.sh Caps sh ${NCURSES_DIR}/include/MKhashsize.sh ${NCURSES_DIR}/include/Caps > $@ parametrized.h: MKparametrized.sh Caps AWK=${AWK} sh ${NCURSES_DIR}/include/MKparametrized.sh \ ${NCURSES_DIR}/include/Caps > $@ term.h: MKterm.h.awk edit_cfg.sh Caps ${AWK} -f MKterm.h.awk ${NCURSES_DIR}/include/Caps > $@.new sh ${NCURSES_DIR}/include/edit_cfg.sh ${NCURSES_CFG_H} $@.new mv -f $@.new $@ curses.h: curses.head MKkey_defs.sh Caps cat curses.head > $@.new AWK=${AWK} _POSIX2_VERSION=199209 sh ${NCURSES_DIR}/include/MKkey_defs.sh \ ${NCURSES_DIR}/include/Caps >> $@.new .if defined(ENABLE_WIDEC) cat ${NCURSES_DIR}/include/curses.wide >> $@.new .endif cat ${NCURSES_DIR}/include/curses.tail >> $@.new mv -f $@.new $@ # Generated intermediate files keys.list: MKkeys_list.sh Caps AWK=${AWK} sh ${NCURSES_DIR}/ncurses/tinfo/MKkeys_list.sh \ ${NCURSES_DIR}/include/Caps | LC_ALL=C sort > keys.list # Build tools build-tools: make_hash make_keys make_keys: make_keys.c names.c ncurses_def.h ${HEADERS} ${CC} -o $@ ${CFLAGS} ${NCURSES_DIR}/ncurses/tinfo/make_keys.c make_hash: comp_hash.c hashsize.h ncurses_def.h ${HEADERS} ${CC} -o $@ ${CFLAGS} -DMAIN_PROGRAM \ ${NCURSES_DIR}/ncurses/tinfo/comp_hash.c # ./configure generated MKterm.h.awk: MKterm.h.awk.in sed <${NCURSES_DIR}/include/MKterm.h.awk.in >$@ \ -e "/@NCURSES_MAJOR@/s%%${NCURSES_MAJOR}%" \ -e "/@NCURSES_MINOR@/s%%${NCURSES_MINOR}%" \ -e "/@NCURSES_CONST@/s%%${NCURSES_CONST}%" \ -e "/@NCURSES_TPARM_VARARGS@/s%%${NCURSES_TPARM_VARARGS}%" \ -e "/@NCURSES_SBOOL@/s%%${NCURSES_SBOOL}%" \ -e "/@NCURSES_XNAMES@/s%%${NCURSES_XNAMES}%" \ -e "/@HAVE_TERMIOS_H@/s%%${HAVE_TERMIOS_H}%" \ -e "/@HAVE_TERMIO_H@/s%%${HAVE_TERMIO_H}%" \ -e "/@HAVE_TCGETATTR@/s%%${HAVE_TCGETATTR}%" termcap.h: termcap.h.in sed <${NCURSES_DIR}/include/termcap.h.in >$@ \ -e "/@NCURSES_MAJOR@/s%%${NCURSES_MAJOR}%" \ -e "/@NCURSES_MINOR@/s%%${NCURSES_MINOR}%" \ -e "/@NCURSES_CONST@/s%%${NCURSES_CONST}%" \ -e "/@NCURSES_OSPEED@/s%%${NCURSES_OSPEED}%" curses.head: curses.h.in sed <${NCURSES_DIR}/include/curses.h.in >$@ \ -e "/@BROKEN_LINKER@/s%%${BROKEN_LINKER}%" \ -e "/@HAVE_VSSCANF@/s%%${HAVE_VSSCANF}%" \ -e "/@NCURSES_CH_T@/s%%${NCURSES_CH_T}%" \ -e "/@NCURSES_CONST@/s%%${NCURSES_CONST}%" \ -e "/@NCURSES_EXT_COLORS@/s%%${NCURSES_EXT_COLORS}%" \ -e "/@NCURSES_EXT_FUNCS@/s%%${NCURSES_EXT_FUNCS}%" \ -e "/@NCURSES_INLINE@/s%%${NCURSES_INLINE}%" \ -e "/@NCURSES_LIBUTF8@/s%%${NCURSES_LIBUTF8}%" \ -e "/@NCURSES_MAJOR@/s%%${NCURSES_MAJOR}%" \ -e "/@NCURSES_MBSTATE_T@/s%%${NCURSES_MBSTATE_T}%" \ -e "/@NCURSES_MINOR@/s%%${NCURSES_MINOR}%" \ -e "/@NCURSES_MOUSE_VERSION@/s%%${NCURSES_MOUSE_VERSION}%" \ -e "/@NCURSES_PATCH@/s%%${NCURSES_PATCH}%" \ -e "/@NCURSES_TPARM_VARARGS@/s%%${NCURSES_TPARM_VARARGS}%" \ -e "/@NCURSES_WCHAR_T@/s%%${NCURSES_WCHAR_T}%" \ -e "/@NCURSES_WCHAR_T@/s%%${NCURSES_WCHAR_T}%" \ -e "/@NCURSES_WINT_T@/s%%${NCURSES_WINT_T}%" \ -e "/@NEED_WCHAR_H@/s%%${NEED_WCHAR_H}%" \ -e "/@USE_CXX_BOOL@/s%%${USE_CXX_BOOL}%" \ -e "s%@cf_cv_1UL@%${ONEUL}%g" \ -e "s%@cf_cv_builtin_bool@%${BUILTIN_BOOL}%g" \ -e "s%@cf_cv_enable_lp64@%${ENABLE_LP64}%g" \ -e "s%@cf_cv_header_stdbool_h@%${HEADER_STDBOOL}%g" \ -e "s%@cf_cv_type_of_bool@%${TYPE_OF_BOOL}%g" \ -e "s%@cf_cv_typeof_chtype@%${TYPEOF_CHTYPE}%g" \ -e "s%@cf_cv_typeof_mmask_t@%${TYPEOF_MMASK_T}%g" \ -e "s/ _WCHAR_T/ __wchar_t/g" \ -e "s/ _WINT_T/ __wint_t/g" unctrl.h: unctrl.h.in sed <${NCURSES_DIR}/include/$@.in >$@ \ -e "/@NCURSES_MAJOR@/s%%${NCURSES_MAJOR}%" \ -e "/@NCURSES_MINOR@/s%%${NCURSES_MINOR}%" # MAN page gunk terminfo.5: MKterminfo.sh terminfo.head Caps sh ${NCURSES_DIR}/man/MKterminfo.sh ${NCURSES_DIR}/man/terminfo.head \ ${NCURSES_DIR}/include/Caps ${NCURSES_DIR}/man/terminfo.tail >$@ CLEANFILES+= terminfo.5 .PATH: ${NCURSES_DIR}/man MAN= \ curs_addch.3 \ curs_addchstr.3 \ curs_addstr.3 \ curs_attr.3 \ curs_beep.3 \ curs_bkgd.3 \ curs_bkgrnd.3 \ curs_border.3 \ curs_border_set.3 \ curs_clear.3 \ curs_color.3 \ curs_delch.3 \ curs_deleteln.3 \ curs_extend.3 \ curs_getcchar.3 \ curs_getch.3 \ curs_getstr.3 \ curs_getyx.3 \ curs_inch.3 \ curs_inchstr.3 \ curs_initscr.3 \ curs_inopts.3 \ curs_insch.3 \ curs_insstr.3 \ curs_instr.3 \ curs_inwstr.3 \ curs_kernel.3 \ curs_mouse.3 \ curs_move.3 \ curs_outopts.3 \ curs_overlay.3 \ curs_pad.3 \ curs_print.3 \ curs_refresh.3 \ curs_scr_dump.3 \ curs_scroll.3 \ curs_slk.3 \ curs_termattrs.3 \ curs_termcap.3 \ curs_terminfo.3 \ curs_touch.3 \ curs_trace.3 \ curs_util.3 \ curs_window.3 \ default_colors.3 \ define_key.3 \ key_defined.3 \ keybound.3 \ keyok.3 \ legacy_coding.3 \ ncurses.3 \ resizeterm.3 \ wresize.3 .if defined(ENABLE_WIDEC) MAN+= \ curs_add_wch.3 \ curs_add_wchstr.3 \ curs_addwstr.3 \ curs_get_wch.3 \ curs_get_wstr.3 \ curs_in_wch.3 \ curs_in_wchstr.3 \ curs_ins_wch.3 \ curs_ins_wstr.3 \ curs_printw.3 \ curs_scanw.3 .endif CLEANFILES+= ${MAN:M*.3} MAN+= term.5 terminfo.5 MAN+= term.7 MLINKS= ncurses.3 curses.3 \ curs_addch.3 addch.3 \ curs_addch.3 echochar.3 \ curs_addch.3 mvaddch.3 \ curs_addch.3 mvwaddch.3 \ curs_addch.3 waddch.3 \ curs_addch.3 wechochar.3 \ curs_addchstr.3 addchnstr.3 \ curs_addchstr.3 addchstr.3 \ curs_addchstr.3 mvaddchnstr.3 \ curs_addchstr.3 mvaddchstr.3 \ curs_addchstr.3 mvwaddchnstr.3 \ curs_addchstr.3 mvwaddchstr.3 \ curs_addchstr.3 waddchnstr.3 \ curs_addchstr.3 waddchstr.3 \ curs_addstr.3 addnstr.3 \ curs_addstr.3 addstr.3 \ curs_addstr.3 mvaddnstr.3 \ curs_addstr.3 mvaddstr.3 \ curs_addstr.3 mvwaddnstr.3 \ curs_addstr.3 mvwaddstr.3 \ curs_addstr.3 waddnstr.3 \ curs_addstr.3 waddstr.3 \ curs_attr.3 PAIR_NUMBER.3 \ curs_attr.3 attr_get.3 \ curs_attr.3 attr_off.3 \ curs_attr.3 attr_on.3 \ curs_attr.3 attr_set.3 \ curs_attr.3 attroff.3 \ curs_attr.3 attron.3 \ curs_attr.3 attrset.3 \ curs_attr.3 chgat.3 \ curs_attr.3 color_set.3 \ curs_attr.3 mvchgat.3 \ curs_attr.3 mvwchgat.3 \ curs_attr.3 standend.3 \ curs_attr.3 standout.3 \ curs_attr.3 wattr_get.3 \ curs_attr.3 wattr_off.3 \ curs_attr.3 wattr_on.3 \ curs_attr.3 wattr_set.3 \ curs_attr.3 wattroff.3 \ curs_attr.3 wattron.3 \ curs_attr.3 wattrset.3 \ curs_attr.3 wchgat.3 \ curs_attr.3 wcolor_set.3 \ curs_attr.3 wstandend.3 \ curs_attr.3 wstandout.3 \ curs_beep.3 beep.3 \ curs_beep.3 flash.3 \ curs_bkgd.3 bkgd.3 \ curs_bkgd.3 bkgdset.3 \ curs_bkgd.3 getbkgd.3 \ curs_bkgd.3 wbkgd.3 \ curs_bkgd.3 wbkgdset.3 \ curs_bkgrnd.3 bkgrnd.3 \ curs_bkgrnd.3 bkgrndset.3 \ curs_bkgrnd.3 getbkgrnd.3 \ curs_bkgrnd.3 wbkgrnd.3 \ curs_bkgrnd.3 wbkgrndset.3 \ curs_bkgrnd.3 wgetbkgrnd.3 \ curs_border.3 border.3 \ curs_border.3 box.3 \ curs_border.3 hline.3 \ curs_border.3 mvhline.3 \ curs_border.3 mvvline.3 \ curs_border.3 mvwhline.3 \ curs_border.3 mvwvline.3 \ curs_border.3 vline.3 \ curs_border.3 wborder.3 \ curs_border.3 whline.3 \ curs_border.3 wvline.3 \ curs_border_set.3 border_set.3 \ curs_border_set.3 box_set.3 \ curs_border_set.3 hline_set.3 \ curs_border_set.3 mvhline_set.3 \ curs_border_set.3 mvvline_set.3 \ curs_border_set.3 mvwhline_set.3 \ curs_border_set.3 mvwvline_set.3 \ curs_border_set.3 vline_set.3 \ curs_border_set.3 wborder_set.3 \ curs_border_set.3 whline_set.3 \ curs_border_set.3 wvline_set.3 \ curs_clear.3 clear.3 \ curs_clear.3 clrtobot.3 \ curs_clear.3 clrtoeol.3 \ curs_clear.3 erase.3 \ curs_clear.3 wclear.3 \ curs_clear.3 wclrtobot.3 \ curs_clear.3 wclrtoeol.3 \ curs_clear.3 werase.3 \ curs_color.3 COLOR_PAIR.3 \ curs_color.3 can_change_color.3 \ curs_color.3 color_content.3 \ curs_color.3 has_colors.3 \ curs_color.3 init_color.3 \ curs_color.3 init_pair.3 \ curs_color.3 pair_content.3 \ curs_color.3 start_color.3 \ curs_delch.3 delch.3 \ curs_delch.3 mvdelch.3 \ curs_delch.3 mvwdelch.3 \ curs_delch.3 wdelch.3 \ curs_deleteln.3 deleteln.3 \ curs_deleteln.3 insdelln.3 \ curs_deleteln.3 insertln.3 \ curs_deleteln.3 wdeleteln.3 \ curs_deleteln.3 winsdelln.3 \ curs_deleteln.3 winsertln.3 \ curs_extend.3 curses_version.3 \ curs_extend.3 use_extended_names.3 \ curs_getcchar.3 getcchar.3 \ curs_getcchar.3 setcchar.3 \ curs_getch.3 getch.3 \ curs_getch.3 has_key.3 \ curs_getch.3 mvgetch.3 \ curs_getch.3 mvwgetch.3 \ curs_getch.3 ungetch.3 \ curs_getch.3 wgetch.3 \ curs_getstr.3 getnstr.3 \ curs_getstr.3 getstr.3 \ curs_getstr.3 mvgetnstr.3 \ curs_getstr.3 mvgetstr.3 \ curs_getstr.3 mvwgetnstr.3 \ curs_getstr.3 mvwgetstr.3 \ curs_getstr.3 wgetnstr.3 \ curs_getstr.3 wgetstr.3 \ curs_getyx.3 getbegyx.3 \ curs_getyx.3 getmaxyx.3 \ curs_getyx.3 getparyx.3 \ curs_getyx.3 getyx.3 \ curs_inch.3 inch.3 \ curs_inch.3 mvinch.3 \ curs_inch.3 mvwinch.3 \ curs_inch.3 winch.3 \ curs_inchstr.3 inchnstr.3 \ curs_inchstr.3 inchstr.3 \ curs_inchstr.3 mvinchnstr.3 \ curs_inchstr.3 mvinchstr.3 \ curs_inchstr.3 mvwinchnstr.3 \ curs_inchstr.3 mvwinchstr.3 \ curs_inchstr.3 winchnstr.3 \ curs_inchstr.3 winchstr.3 \ curs_initscr.3 delscreen.3 \ curs_initscr.3 endwin.3 \ curs_initscr.3 initscr.3 \ curs_initscr.3 isendwin.3 \ curs_initscr.3 newterm.3 \ curs_initscr.3 set_term.3 \ curs_inopts.3 cbreak.3 \ curs_inopts.3 echo.3 \ curs_inopts.3 halfdelay.3 \ curs_inopts.3 intrflush.3 \ curs_inopts.3 keypad.3 \ curs_inopts.3 meta.3 \ curs_inopts.3 nocbreak.3 \ curs_inopts.3 nodelay.3 \ curs_inopts.3 noecho.3 \ curs_inopts.3 noqiflush.3 \ curs_inopts.3 noraw.3 \ curs_inopts.3 notimeout.3 \ curs_inopts.3 qiflush.3 \ curs_inopts.3 raw.3 \ curs_inopts.3 timeout.3 \ curs_inopts.3 typeahead.3 \ curs_inopts.3 wtimeout.3 \ curs_insch.3 insch.3 \ curs_insch.3 mvinsch.3 \ curs_insch.3 mvwinsch.3 \ curs_insch.3 winsch.3 \ curs_insstr.3 insnstr.3 \ curs_insstr.3 insstr.3 \ curs_insstr.3 mvinsnstr.3 \ curs_insstr.3 mvinsstr.3 \ curs_insstr.3 mvwinsnstr.3 \ curs_insstr.3 mvwinsstr.3 \ curs_insstr.3 winsnstr.3 \ curs_insstr.3 winsstr.3 \ curs_instr.3 innstr.3 \ curs_instr.3 instr.3 \ curs_instr.3 mvinnstr.3 \ curs_instr.3 mvinstr.3 \ curs_instr.3 mvwinnstr.3 \ curs_instr.3 mvwinstr.3 \ curs_instr.3 winnstr.3 \ curs_instr.3 winstr.3 \ curs_kernel.3 curs_set.3 \ curs_kernel.3 def_prog_mode.3 \ curs_kernel.3 def_shell_mode.3 \ curs_kernel.3 getsyx.3 \ curs_kernel.3 napms.3 \ curs_kernel.3 reset_prog_mode.3 \ curs_kernel.3 reset_shell_mode.3 \ curs_kernel.3 resetty.3 \ curs_kernel.3 ripoffline.3 \ curs_kernel.3 savetty.3 \ curs_kernel.3 setsyx.3 \ curs_mouse.3 getmouse.3 \ curs_mouse.3 mouse_trafo.3 \ curs_mouse.3 mouseinterval.3 \ curs_mouse.3 mousemask.3 \ curs_mouse.3 ungetmouse.3 \ curs_mouse.3 wenclose.3 \ curs_mouse.3 wmouse_trafo.3 \ curs_move.3 move.3 \ curs_move.3 wmove.3 \ curs_outopts.3 clearok.3 \ curs_outopts.3 idcok.3 \ curs_outopts.3 idlok.3 \ curs_outopts.3 immedok.3 \ curs_outopts.3 leaveok.3 \ curs_outopts.3 nl.3 \ curs_outopts.3 nonl.3 \ curs_outopts.3 scrollok.3 \ curs_outopts.3 setscrreg.3 \ curs_outopts.3 wsetscrreg.3 \ curs_overlay.3 copywin.3 \ curs_overlay.3 overlay.3 \ curs_overlay.3 overwrite.3 \ curs_pad.3 newpad.3 \ curs_pad.3 pecho_wchar.3 \ curs_pad.3 pechochar.3 \ curs_pad.3 pnoutrefresh.3 \ curs_pad.3 prefresh.3 \ curs_pad.3 subpad.3 \ curs_print.3 mcprint.3 \ curs_refresh.3 doupdate.3 \ curs_refresh.3 redrawwin.3 \ curs_refresh.3 refresh.3 \ curs_refresh.3 wnoutrefresh.3 \ curs_refresh.3 wredrawln.3 \ curs_refresh.3 wrefresh.3 \ curs_scr_dump.3 scr_dump.3 \ curs_scr_dump.3 scr_init.3 \ curs_scr_dump.3 scr_restore.3 \ curs_scr_dump.3 scr_set.3 \ curs_scroll.3 scrl.3 \ curs_scroll.3 scroll.3 \ curs_scroll.3 wscrl.3 \ curs_slk.3 slk_attr.3 \ curs_slk.3 slk_attr_off.3 \ curs_slk.3 slk_attr_on.3 \ curs_slk.3 slk_attr_set.3 \ curs_slk.3 slk_attroff.3 \ curs_slk.3 slk_attron.3 \ curs_slk.3 slk_attrset.3 \ curs_slk.3 slk_clear.3 \ curs_slk.3 slk_color.3 \ curs_slk.3 slk_init.3 \ curs_slk.3 slk_label.3 \ curs_slk.3 slk_noutrefresh.3 \ curs_slk.3 slk_refresh.3 \ curs_slk.3 slk_restore.3 \ curs_slk.3 slk_set.3 \ curs_slk.3 slk_touch.3 \ curs_termattrs.3 baudrate.3 \ curs_termattrs.3 erasechar.3 \ curs_termattrs.3 erasewchar.3 \ curs_termattrs.3 has_ic.3 \ curs_termattrs.3 has_il.3 \ curs_termattrs.3 killchar.3 \ curs_termattrs.3 killwchar.3 \ curs_termattrs.3 longname.3 \ curs_termattrs.3 term_attrs.3 \ curs_termattrs.3 termattrs.3 \ curs_termattrs.3 termname.3 \ curs_termcap.3 termcap.3 \ curs_termcap.3 tgetent.3 \ curs_termcap.3 tgetflag.3 \ curs_termcap.3 tgetnum.3 \ curs_termcap.3 tgetstr.3 \ curs_termcap.3 tgoto.3 \ curs_termcap.3 tputs.3 \ curs_terminfo.3 del_curterm.3 \ curs_terminfo.3 mvcur.3 \ curs_terminfo.3 putp.3 \ curs_terminfo.3 restartterm.3 \ curs_terminfo.3 set_curterm.3 \ curs_terminfo.3 setterm.3 \ curs_terminfo.3 setupterm.3 \ curs_terminfo.3 tigetflag.3 \ curs_terminfo.3 tigetnum.3 \ curs_terminfo.3 tigetstr.3 \ curs_terminfo.3 tparm.3 \ curs_terminfo.3 tputs.3 \ curs_terminfo.3 vid_attr.3 \ curs_terminfo.3 vid_puts.3 \ curs_terminfo.3 vidattr.3 \ curs_terminfo.3 vidputs.3 \ curs_touch.3 is_linetouched.3 \ curs_touch.3 is_wintouched.3 \ curs_touch.3 touchline.3 \ curs_touch.3 touchwin.3 \ curs_touch.3 untouchwin.3 \ curs_touch.3 wtouchln.3 \ curs_trace.3 _nc_tracebits.3 \ curs_trace.3 _traceattr.3 \ curs_trace.3 _traceattr2.3 \ curs_trace.3 _tracechar.3 \ curs_trace.3 _tracechtype.3 \ curs_trace.3 _tracechtype2.3 \ curs_trace.3 _tracedump.3 \ curs_trace.3 _tracef.3 \ curs_trace.3 _tracemouse.3 \ curs_trace.3 trace.3 \ curs_util.3 delay_output.3 \ curs_util.3 filter.3 \ curs_util.3 flushinp.3 \ curs_util.3 getwin.3 \ curs_util.3 key_name.3 \ curs_util.3 keyname.3 \ curs_util.3 nofilter.3 \ curs_util.3 putwin.3 \ curs_util.3 unctrl.3 \ curs_util.3 use_env.3 \ curs_util.3 wunctrl.3 \ curs_window.3 delwin.3 \ curs_window.3 derwin.3 \ curs_window.3 dupwin.3 \ curs_window.3 mvderwin.3 \ curs_window.3 mvwin.3 \ curs_window.3 newwin.3 \ curs_window.3 subwin.3 \ curs_window.3 syncok.3 \ curs_window.3 wcursyncup.3 \ curs_window.3 wsyncdown.3 \ curs_window.3 wsyncup.3 \ default_colors.3 assume_default_colors.3 \ default_colors.3 use_default_colors.3 \ legacy_coding.3 use_legacy_coding.3 \ resizeterm.3 is_term_resized.3 \ resizeterm.3 resize_term.3 .if defined(ENABLE_WIDEC) MLINKS+=curs_add_wch.3 add_wch.3 \ curs_add_wch.3 echo_wchar.3 \ curs_add_wch.3 mvadd_wch.3 \ curs_add_wch.3 mvwadd_wch.3 \ curs_add_wch.3 wadd_wch.3 \ curs_add_wch.3 wecho_wchar.3 \ curs_add_wchstr.3 add_wchnstr.3 \ curs_add_wchstr.3 add_wchstr.3 \ curs_add_wchstr.3 mvadd_wchnstr.3 \ curs_add_wchstr.3 mvadd_wchstr.3 \ curs_add_wchstr.3 mvwadd_wchnstr.3 \ curs_add_wchstr.3 mvwadd_wchstr.3 \ curs_add_wchstr.3 wadd_wchnstr.3 \ curs_add_wchstr.3 wadd_wchstr.3 \ curs_addwstr.3 addnwstr.3 \ curs_addwstr.3 addwstr.3 \ curs_addwstr.3 mvaddnwstr.3 \ curs_addwstr.3 mvaddwstr.3 \ curs_addwstr.3 mvwaddnwstr.3 \ curs_addwstr.3 mvwaddwstr.3 \ curs_addwstr.3 waddnwstr.3 \ curs_addwstr.3 waddwstr.3 \ curs_get_wch.3 get_wch.3 \ curs_get_wch.3 mvget_wch.3 \ curs_get_wch.3 mvwget_wch.3 \ curs_get_wch.3 unget_wch.3 \ curs_get_wch.3 wget_wch.3 \ curs_get_wstr.3 get_wstr.3 \ curs_get_wstr.3 getn_wstr.3 \ curs_get_wstr.3 mvget_wstr.3 \ curs_get_wstr.3 mvgetn_wstr.3 \ curs_get_wstr.3 mvwget_wstr.3 \ curs_get_wstr.3 mvwgetn_wstr.3 \ curs_get_wstr.3 wget_wstr.3 \ curs_get_wstr.3 wgetn_wstr.3 \ curs_in_wch.3 in_wch.3 \ curs_in_wch.3 mvin_wch.3 \ curs_in_wch.3 mvwin_wch.3 \ curs_in_wch.3 win_wch.3 \ curs_in_wchstr.3 in_wchnstr.3 \ curs_in_wchstr.3 in_wchstr.3 \ curs_in_wchstr.3 mvin_wchnstr.3 \ curs_in_wchstr.3 mvin_wchstr.3 \ curs_in_wchstr.3 mvwin_wchnstr.3 \ curs_in_wchstr.3 mvwin_wchstr.3 \ curs_in_wchstr.3 win_wchnstr.3 \ curs_in_wchstr.3 win_wchstr.3 \ curs_ins_wch.3 ins_wch.3 \ curs_ins_wch.3 mvins_wch.3 \ curs_ins_wch.3 mvwins_wch.3 \ curs_ins_wch.3 wins_wch.3 \ curs_ins_wstr.3 ins_nwstr.3 \ curs_ins_wstr.3 ins_wstr.3 \ curs_ins_wstr.3 mvins_nwstr.3 \ curs_ins_wstr.3 mvins_wstr.3 \ curs_ins_wstr.3 mvwins_nwstr.3 \ curs_ins_wstr.3 mvwins_wstr.3 \ curs_ins_wstr.3 wins_nwstr.3 \ curs_ins_wstr.3 wins_wstr.3 \ curs_inwstr.3 innwstr.3 \ curs_inwstr.3 inwstr.3 \ curs_inwstr.3 mvinnwstr.3 \ curs_inwstr.3 mvinwstr.3 \ curs_inwstr.3 mvwinnwstr.3 \ curs_inwstr.3 mvwinwstr.3 \ curs_inwstr.3 winnwstr.3 \ curs_inwstr.3 winwstr.3 \ curs_printw.3 mvprintw.3 \ curs_printw.3 mvwprintw.3 \ curs_printw.3 printw.3 \ curs_printw.3 vw_printw.3 \ curs_printw.3 vwprintw.3 \ curs_printw.3 wprintw.3 \ curs_scanw.3 mvscanw.3 \ curs_scanw.3 mvwscanw.3 \ curs_scanw.3 scanw.3 \ curs_scanw.3 vw_scanw.3 \ curs_scanw.3 vwscanw.3 \ curs_scanw.3 wscanw.3 .endif .include # Keep the .SUFFIXES line after the include of bsd.lib.mk .SUFFIXES: .3 .3x .3x.3: cat ${.IMPSRC} > ${.TARGET} Index: head/share/mk/bsd.lib.mk =================================================================== --- head/share/mk/bsd.lib.mk (revision 172831) +++ head/share/mk/bsd.lib.mk (revision 172832) @@ -1,353 +1,353 @@ # from: @(#)bsd.lib.mk 5.26 (Berkeley) 5/2/91 # $FreeBSD$ # .include # Set up the variables controlling shared libraries. After this section, # SHLIB_NAME will be defined only if we are to create a shared library. # SHLIB_LINK will be defined only if we are to create a link to it. # INSTALL_PIC_ARCHIVE will be defined only if we are to create a PIC archive. .if defined(NO_PIC) .undef SHLIB_NAME .undef INSTALL_PIC_ARCHIVE .else .if !defined(SHLIB) && defined(LIB) SHLIB= ${LIB} .endif .if !defined(SHLIB_NAME) && defined(SHLIB) && defined(SHLIB_MAJOR) SHLIB_NAME= lib${SHLIB}.so.${SHLIB_MAJOR} .endif .if defined(SHLIB_NAME) && !empty(SHLIB_NAME:M*.so.*) SHLIB_LINK?= ${SHLIB_NAME:R} .endif SONAME?= ${SHLIB_NAME} .endif .if defined(CRUNCH_CFLAGS) CFLAGS+= ${CRUNCH_CFLAGS} .endif .if ${MK_ASSERT_DEBUG} == "no" CFLAGS+= -DNDEBUG NO_WERROR= .endif .if defined(DEBUG_FLAGS) CFLAGS+= ${DEBUG_FLAGS} .endif .if !defined(DEBUG_FLAGS) STRIP?= -s .endif .include # prefer .s to a .c, add .po, remove stuff not used in the BSD libraries # .So used for PIC object files .SUFFIXES: .SUFFIXES: .out .o .po .So .S .asm .s .c .cc .cpp .cxx .m .C .f .y .l .ln .if !defined(PICFLAG) .if ${MACHINE_ARCH} == "sparc64" PICFLAG=-fPIC .else PICFLAG=-fpic .endif .endif .if ${CC} == "icc" PO_FLAG=-p .else PO_FLAG=-pg .endif .c.po: ${CC} ${PO_FLAG} ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET} .c.So: ${CC} ${PICFLAG} -DPIC ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET} .cc.po .C.po .cpp.po .cxx.po: ${CXX} ${PO_FLAG} ${CXXFLAGS} -c ${.IMPSRC} -o ${.TARGET} .cc.So .C.So .cpp.So .cxx.So: ${CXX} ${PICFLAG} -DPIC ${CXXFLAGS} -c ${.IMPSRC} -o ${.TARGET} .f.po: ${FC} -pg ${FFLAGS} -o ${.TARGET} -c ${.IMPSRC} .f.So: ${FC} ${PICFLAG} -DPIC ${FFLAGS} -o ${.TARGET} -c ${.IMPSRC} .m.po: ${OBJC} ${OBJCFLAGS} -pg -c ${.IMPSRC} -o ${.TARGET} .m.So: ${OBJC} ${PICFLAG} -DPIC ${OBJCFLAGS} -c ${.IMPSRC} -o ${.TARGET} .s.po .s.So: ${AS} ${AFLAGS} -o ${.TARGET} ${.IMPSRC} .asm.po: ${CC} -x assembler-with-cpp -DPROF ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET} .asm.So: ${CC} -x assembler-with-cpp ${PICFLAG} -DPIC ${CFLAGS} \ -c ${.IMPSRC} -o ${.TARGET} .S.po: ${CC} -DPROF ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET} .S.So: ${CC} ${PICFLAG} -DPIC ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET} all: objwarn .include # Allow librararies to specify their own version map or have it # automatically generated (see bsd.symver.mk above). .if ${MK_SYMVER} == "yes" && !empty(VERSION_MAP) ${SHLIB_NAME}: ${VERSION_MAP} LDFLAGS+= -Wl,--version-script=${VERSION_MAP} .endif .if defined(LIB) && !empty(LIB) || defined(SHLIB_NAME) OBJS+= ${SRCS:N*.h:R:S/$/.o/} .endif .if defined(LIB) && !empty(LIB) _LIBS= lib${LIB}.a lib${LIB}.a: ${OBJS} ${STATICOBJS} @${ECHO} building static ${LIB} library @rm -f ${.TARGET} .if !defined(NM) @${AR} cq ${.TARGET} `lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD} .else @${AR} cq ${.TARGET} `NM='${NM}' lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD} .endif ${RANLIB} ${.TARGET} .endif .if !defined(INTERNALLIB) .if ${MK_PROFILE} != "no" && defined(LIB) && !empty(LIB) _LIBS+= lib${LIB}_p.a POBJS+= ${OBJS:.o=.po} ${STATICOBJS:.o=.po} lib${LIB}_p.a: ${POBJS} @${ECHO} building profiled ${LIB} library @rm -f ${.TARGET} .if !defined(NM) @${AR} cq ${.TARGET} `lorder ${POBJS} | tsort -q` ${ARADD} .else @${AR} cq ${.TARGET} `NM='${NM}' lorder ${POBJS} | tsort -q` ${ARADD} .endif ${RANLIB} ${.TARGET} .endif .if defined(SHLIB_NAME) || \ defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB) SOBJS+= ${OBJS:.o=.So} .endif .if defined(SHLIB_NAME) _LIBS+= ${SHLIB_NAME} ${SHLIB_NAME}: ${SOBJS} @${ECHO} building shared library ${SHLIB_NAME} @rm -f ${.TARGET} ${SHLIB_LINK} .if defined(SHLIB_LINK) @ln -fs ${.TARGET} ${SHLIB_LINK} .endif .if !defined(NM) @${CC} ${LDFLAGS} -shared -Wl,-x \ -o ${.TARGET} -Wl,-soname,${SONAME} \ `lorder ${SOBJS} | tsort -q` ${LDADD} .else @${CC} ${LDFLAGS} -shared -Wl,-x \ -o ${.TARGET} -Wl,-soname,${SONAME} \ `NM='${NM}' lorder ${SOBJS} | tsort -q` ${LDADD} .endif .endif .if defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB) && ${MK_TOOLCHAIN} != "no" _LIBS+= lib${LIB}_pic.a lib${LIB}_pic.a: ${SOBJS} @${ECHO} building special pic ${LIB} library @rm -f ${.TARGET} @${AR} cq ${.TARGET} ${SOBJS} ${ARADD} ${RANLIB} ${.TARGET} .endif .if defined(WANT_LINT) && !defined(NO_LINT) && defined(LIB) && !empty(LIB) LINTLIB= llib-l${LIB}.ln _LIBS+= ${LINTLIB} LINTOBJS+= ${SRCS:M*.c:.c=.ln} ${LINTLIB}: ${LINTOBJS} @${ECHO} building lint library ${.TARGET} @rm -f ${.TARGET} ${LINT} ${LINTLIBFLAGS} ${CFLAGS:M-[DIU]*} ${.ALLSRC} .endif .endif # !defined(INTERNALLIB) all: ${_LIBS} .if ${MK_MAN} != "no" all: _manpages .endif _EXTRADEPEND: @TMP=_depend$$$$; \ sed -e 's/^\([^\.]*\).o[ ]*:/\1.o \1.po \1.So:/' < ${DEPENDFILE} \ > $$TMP; \ mv $$TMP ${DEPENDFILE} .if !defined(NO_EXTRADEPEND) && defined(SHLIB_NAME) .if defined(DPADD) && !empty(DPADD) echo ${SHLIB_NAME}: ${DPADD} >> ${DEPENDFILE} .endif .endif .if !target(install) .if defined(PRECIOUSLIB) .if !defined(NO_FSCHG) SHLINSTALLFLAGS+= -fschg .endif SHLINSTALLFLAGS+= -S .endif _INSTALLFLAGS:= ${INSTALLFLAGS} .for ie in ${INSTALLFLAGS_EDIT} _INSTALLFLAGS:= ${_INSTALLFLAGS${ie}} .endfor _SHLINSTALLFLAGS:= ${SHLINSTALLFLAGS} .for ie in ${INSTALLFLAGS_EDIT} _SHLINSTALLFLAGS:= ${_SHLINSTALLFLAGS${ie}} .endfor .if !defined(INTERNALLIB) realinstall: _libinstall .ORDER: beforeinstall _libinstall _libinstall: -.if defined(LIB) && !empty(LIB) && !defined(NO_INSTALLLIB) +.if defined(LIB) && !empty(LIB) && ${MK_INSTALLLIB} != "no" ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ ${_INSTALLFLAGS} lib${LIB}.a ${DESTDIR}${LIBDIR} .endif .if ${MK_PROFILE} != "no" && defined(LIB) && !empty(LIB) ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ ${_INSTALLFLAGS} lib${LIB}_p.a ${DESTDIR}${LIBDIR} .endif .if defined(SHLIB_NAME) ${INSTALL} ${STRIP} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ ${_INSTALLFLAGS} ${_SHLINSTALLFLAGS} \ ${SHLIB_NAME} ${DESTDIR}${SHLIBDIR} .if defined(SHLIB_LINK) .if ${SHLIBDIR} == ${LIBDIR} ln -fs ${SHLIB_NAME} ${DESTDIR}${LIBDIR}/${SHLIB_LINK} .else ln -fs ${_SHLIBDIRPREFIX}${SHLIBDIR}/${SHLIB_NAME} \ ${DESTDIR}${LIBDIR}/${SHLIB_LINK} .if exists(${DESTDIR}${LIBDIR}/${SHLIB_NAME}) -chflags noschg ${DESTDIR}${LIBDIR}/${SHLIB_NAME} rm -f ${DESTDIR}${LIBDIR}/${SHLIB_NAME} .endif .endif .endif .endif .if defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB) && ${MK_TOOLCHAIN} != "no" ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ ${_INSTALLFLAGS} lib${LIB}_pic.a ${DESTDIR}${LIBDIR} .endif .if defined(WANT_LINT) && !defined(NO_LINT) && defined(LIB) && !empty(LIB) ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ ${_INSTALLFLAGS} ${LINTLIB} ${DESTDIR}${LINTLIBDIR} .endif .endif # !defined(INTERNALLIB) .include .include .include .include .if ${MK_MAN} != "no" realinstall: _maninstall .ORDER: beforeinstall _maninstall .endif .endif .if !target(lint) lint: ${SRCS:M*.c} ${LINT} ${LINTFLAGS} ${CFLAGS:M-[DIU]*} ${.ALLSRC} .endif .if ${MK_MAN} != "no" .include .endif .include .if !exists(${.OBJDIR}/${DEPENDFILE}) .if defined(LIB) && !empty(LIB) ${OBJS} ${STATICOBJS} ${POBJS}: ${SRCS:M*.h} .for _S in ${SRCS:N*.[hly]} ${_S:R}.po: ${_S} .endfor .endif .if defined(SHLIB_NAME) || \ defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB) ${SOBJS}: ${SRCS:M*.h} .for _S in ${SRCS:N*.[hly]} ${_S:R}.So: ${_S} .endfor .endif .endif .if !target(clean) clean: .if defined(CLEANFILES) && !empty(CLEANFILES) rm -f ${CLEANFILES} .endif .if defined(LIB) && !empty(LIB) rm -f a.out ${OBJS} ${OBJS:S/$/.tmp/} ${STATICOBJS} .endif .if !defined(INTERNALLIB) .if ${MK_PROFILE} != "no" && defined(LIB) && !empty(LIB) rm -f ${POBJS} ${POBJS:S/$/.tmp/} .endif .if defined(SHLIB_NAME) || \ defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB) rm -f ${SOBJS} ${SOBJS:.So=.so} ${SOBJS:S/$/.tmp/} .endif .if defined(SHLIB_NAME) .if defined(SHLIB_LINK) rm -f ${SHLIB_LINK} .endif .if defined(LIB) && !empty(LIB) rm -f lib${LIB}.so.* lib${LIB}.so .endif .endif .if defined(WANT_LINT) && defined(LIB) && !empty(LIB) rm -f ${LINTOBJS} .endif .endif # !defined(INTERNALLIB) .if defined(_LIBS) && !empty(_LIBS) rm -f ${_LIBS} .endif .if defined(CLEANDIRS) && !empty(CLEANDIRS) rm -rf ${CLEANDIRS} .endif .if !empty(VERSION_DEF) && !empty(SYMBOL_MAPS) rm -f ${VERSION_MAP} .endif .endif .include .include Index: head/share/mk/bsd.own.mk =================================================================== --- head/share/mk/bsd.own.mk (revision 172831) +++ head/share/mk/bsd.own.mk (revision 172832) @@ -1,481 +1,483 @@ # $FreeBSD$ # # The include file set common variables for owner, # group, mode, and directories. Defaults are in brackets. # # # +++ variables +++ # # DESTDIR Change the tree where the file gets installed. [not set] # # DISTDIR Change the tree where the file for a distribution # gets installed (see /usr/src/release/Makefile). [not set] # # COMPRESS_CMD Program to compress documents. # Output is to stdout. [gzip -cn] # # COMPRESS_EXT File name extension of ${COMPRESS_CMD} command. [.gz] # # BINOWN Binary owner. [root] # # BINGRP Binary group. [wheel] # # BINMODE Binary mode. [555] # # NOBINMODE Mode for non-executable files. [444] # # LIBDIR Base path for libraries. [/usr/lib] # # LIBCOMPATDIR Base path for compat libraries. [/usr/lib/compat] # # LIBDATADIR Base path for misc. utility data files. [/usr/libdata] # # LINTLIBDIR Base path for lint libraries. [/usr/libdata/lint] # # SHLIBDIR Base path for shared libraries. [${LIBDIR}] # # LIBOWN Library owner. [${BINOWN}] # # LIBGRP Library group. [${BINGRP}] # # LIBMODE Library mode. [${NOBINMODE}] # # # KMODDIR Base path for loadable kernel modules # (see kld(4)). [/boot/kernel] # # KMODOWN KLD owner. [${BINOWN}] # # KMODGRP KLD group. [${BINGRP}] # # KMODMODE KLD mode. [${BINMODE}] # # # SHAREDIR Base path for architecture-independent ascii # text files. [/usr/share] # # SHAREOWN ASCII text file owner. [root] # # SHAREGRP ASCII text file group. [wheel] # # SHAREMODE ASCII text file mode. [${NOBINMODE}] # # # DOCDIR Base path for system documentation (e.g. PSD, USD, # handbook, FAQ etc.). [${SHAREDIR}/doc] # # DOCOWN Documentation owner. [${SHAREOWN}] # # DOCGRP Documentation group. [${SHAREGRP}] # # DOCMODE Documentation mode. [${NOBINMODE}] # # # INFODIR Base path for GNU's hypertext system # called Info (see info(1)). [${SHAREDIR}/info] # # INFOOWN Info owner. [${SHAREOWN}] # # INFOGRP Info group. [${SHAREGRP}] # # INFOMODE Info mode. [${NOBINMODE}] # # # MANDIR Base path for manual installation. [${SHAREDIR}/man/man] # # MANOWN Manual owner. [${SHAREOWN}] # # MANGRP Manual group. [${SHAREGRP}] # # MANMODE Manual mode. [${NOBINMODE}] # # # NLSDIR Base path for National Language Support files # installation. [${SHAREDIR}/nls] # # NLSOWN National Language Support files owner. [${SHAREOWN}] # # NLSGRP National Language Support files group. [${SHAREGRP}] # # NLSMODE National Language Support files mode. [${NOBINMODE}] # # INCLUDEDIR Base path for standard C include files [/usr/include] .if !target(____) ____: .if !defined(_WITHOUT_SRCCONF) SRCCONF?= /etc/src.conf .if exists(${SRCCONF}) .include "${SRCCONF}" .endif .endif # Binaries BINOWN?= root BINGRP?= wheel BINMODE?= 555 NOBINMODE?= 444 .if defined(MODULES_WITH_WORLD) KMODDIR?= /boot/modules .else KMODDIR?= /boot/kernel .endif KMODOWN?= ${BINOWN} KMODGRP?= ${BINGRP} KMODMODE?= ${BINMODE} LIBDIR?= /usr/lib LIBCOMPATDIR?= /usr/lib/compat LIBDATADIR?= /usr/libdata LINTLIBDIR?= /usr/libdata/lint SHLIBDIR?= ${LIBDIR} LIBOWN?= ${BINOWN} LIBGRP?= ${BINGRP} LIBMODE?= ${NOBINMODE} # Share files SHAREDIR?= /usr/share SHAREOWN?= root SHAREGRP?= wheel SHAREMODE?= ${NOBINMODE} MANDIR?= ${SHAREDIR}/man/man MANOWN?= ${SHAREOWN} MANGRP?= ${SHAREGRP} MANMODE?= ${NOBINMODE} DOCDIR?= ${SHAREDIR}/doc DOCOWN?= ${SHAREOWN} DOCGRP?= ${SHAREGRP} DOCMODE?= ${NOBINMODE} INFODIR?= ${SHAREDIR}/info INFOOWN?= ${SHAREOWN} INFOGRP?= ${SHAREGRP} INFOMODE?= ${NOBINMODE} NLSDIR?= ${SHAREDIR}/nls NLSOWN?= ${SHAREOWN} NLSGRP?= ${SHAREGRP} NLSMODE?= ${NOBINMODE} DEFAULT_THREAD_LIB?= libthr INCLUDEDIR?= /usr/include # Common variables .if !defined(DEBUG_FLAGS) STRIP?= -s .endif COMPRESS_CMD?= gzip -cn COMPRESS_EXT?= .gz .if !defined(_WITHOUT_SRCCONF) # # Define MK_* variables (which are either "yes" or "no") for users # to set via WITH_*/WITHOUT_* in /etc/src.conf and override in the # make(1) environment. # These should be tested with `== "no"' or `!= "no"' in makefiles. # The NO_* variables should only be set by makefiles. # # # Supported NO_* options (if defined, MK_* will be forced to "no", # regardless of user's setting). # .for var in \ + INSTALLLIB \ MAN \ PROFILE .if defined(NO_${var}) WITHOUT_${var}= .endif .endfor # # Compat NO_* options (same as above, except their use is deprecated). # .if !defined(BURN_BRIDGES) .for var in \ ACPI \ ATM \ AUDIT \ AUTHPF \ BIND \ BIND_DNSSEC \ BIND_ETC \ BIND_LIBS_LWRES \ BIND_MTREE \ BIND_NAMED \ BIND_UTILS \ BLUETOOTH \ BOOT \ CALENDAR \ CPP \ CRYPT \ CVS \ CXX \ DICT \ DYNAMICROOT \ EXAMPLES \ FORTH \ FORTRAN \ FP_LIBC \ GAMES \ GCOV \ GDB \ GNU \ GPIB \ GROFF \ HTML \ I4B \ INET6 \ INFO \ IPFILTER \ IPX \ KERBEROS \ LIB32 \ LIBPTHREAD \ LIBTHR \ LOCALES \ LPR \ MAILWRAPPER \ NETCAT \ NIS \ NLS \ NLS_CATALOGS \ NS_CACHING \ OBJC \ OPENSSH \ OPENSSL \ PAM \ PF \ RCMDS \ RCS \ RESCUE \ SENDMAIL \ SETUID_LOGIN \ SHAREDOCS \ SYSCONS \ TCSH \ TOOLCHAIN \ USB \ WPA_SUPPLICANT_EAPOL .if defined(NO_${var}) #.warning NO_${var} is deprecated in favour of WITHOUT_${var}= WITHOUT_${var}= .endif .endfor .endif # !defined(BURN_BRIDGES) # # Older-style variables that enabled behaviour when set. # .if defined(YES_HESIOD) WITH_HESIOD= .endif .if defined(MAKE_IDEA) WITH_IDEA= .endif # # MK_* options which default to "yes". # .for var in \ ACPI \ ASSERT_DEBUG \ ATM \ AUDIT \ AUTHPF \ BIND \ BIND_DNSSEC \ BIND_ETC \ BIND_LIBS_LWRES \ BIND_MTREE \ BIND_NAMED \ BIND_UTILS \ BLUETOOTH \ BOOT \ BZIP2 \ CALENDAR \ CDDL \ CPP \ CRYPT \ CVS \ CXX \ DICT \ DYNAMICROOT \ EXAMPLES \ FORTH \ FORTRAN \ FP_LIBC \ GAMES \ GCOV \ GDB \ GNU \ GPIB \ GROFF \ HTML \ I4B \ INET6 \ INFO \ + INSTALLLIB \ IPFILTER \ IPX \ KERBEROS \ KVM \ LIB32 \ LIBPTHREAD \ LIBKSE \ LIBTHR \ LOCALES \ LPR \ MAILWRAPPER \ MAN \ NCP \ NETCAT \ NIS \ NLS \ NLS_CATALOGS \ NS_CACHING \ OBJC \ OPENSSH \ OPENSSL \ PAM \ PF \ PROFILE \ RCMDS \ RCS \ RESCUE \ SENDMAIL \ SETUID_LOGIN \ SHAREDOCS \ SSP \ SYMVER \ SYSCONS \ TCSH \ TOOLCHAIN \ USB \ WPA_SUPPLICANT_EAPOL \ ZONEINFO \ ZFS .if defined(WITH_${var}) && defined(WITHOUT_${var}) .error WITH_${var} and WITHOUT_${var} can't both be set. .endif .if defined(MK_${var}) .error MK_${var} can't be set by a user. .endif .if defined(WITHOUT_${var}) MK_${var}:= no .else MK_${var}:= yes .endif .endfor # # MK_* options which default to "no". # .for var in \ BIND_LIBS \ HESIOD \ IDEA .if defined(WITH_${var}) && defined(WITHOUT_${var}) .error WITH_${var} and WITHOUT_${var} can't both be set. .endif .if defined(MK_${var}) .error MK_${var} can't be set by a user. .endif .if defined(WITH_${var}) MK_${var}:= yes .else MK_${var}:= no .endif .endfor # # Force some options off if their dependencies are off. # Order is somewhat important. # .if ${MK_LIBPTHREAD} == "no" MK_LIBKSE:= no MK_LIBTHR:= no .endif .if ${MK_LIBKSE} == "no" && ${MK_LIBTHR} == "no" MK_BIND:= no .endif .if ${MK_BIND} == "no" MK_BIND_DNSSEC:= no MK_BIND_ETC:= no MK_BIND_LIBS:= no MK_BIND_LIBS_LWRES:= no MK_BIND_MTREE:= no MK_BIND_NAMED:= no MK_BIND_UTILS:= no .endif .if ${MK_BIND_MTREE} == "no" MK_BIND_ETC:= no .endif .if ${MK_CDDL} == "no" MK_ZFS:= no .endif .if ${MK_CRYPT} == "no" MK_OPENSSL:= no MK_OPENSSH:= no MK_KERBEROS:= no .endif .if ${MK_IPX} == "no" MK_NCP:= no .endif .if ${MK_OPENSSL} == "no" MK_OPENSSH:= no MK_KERBEROS:= no .endif .if ${MK_PF} == "no" MK_AUTHPF:= no .endif .if ${MK_TOOLCHAIN} == "no" MK_GDB:= no .endif # # Set defaults for the MK_*_SUPPORT variables. # # # MK_*_SUPPORT options which default to "yes" unless their corresponding # MK_* variable is set to "no". # .for var in \ BZIP2 \ GNU \ INET6 \ IPX \ KERBEROS \ KVM \ PAM .if defined(WITH_${var}_SUPPORT) && defined(WITHOUT_${var}_SUPPORT) .error WITH_${var}_SUPPORT and WITHOUT_${var}_SUPPORT can't both be set. .endif .if defined(MK_${var}_SUPPORT) .error MK_${var}_SUPPORT can't be set by a user. .endif .if defined(WITHOUT_${var}_SUPPORT) || ${MK_${var}} == "no" MK_${var}_SUPPORT:= no .else MK_${var}_SUPPORT:= yes .endif .endfor .endif # !_WITHOUT_SRCCONF .endif # !target(____) Index: head/usr.bin/lex/lib/Makefile =================================================================== --- head/usr.bin/lex/lib/Makefile (revision 172831) +++ head/usr.bin/lex/lib/Makefile (revision 172832) @@ -1,18 +1,20 @@ # $FreeBSD$ .include LIB= ln SRCS= libmain.c libyywrap.c NO_PIC= +.if ${MK_INSTALLLIB} != "no" LINKS= ${LIBDIR}/libln.a ${LIBDIR}/libl.a LINKS+= ${LIBDIR}/libln.a ${LIBDIR}/libfl.a +.endif .if ${MK_PROFILE} != "no" LINKS+= ${LIBDIR}/libln_p.a ${LIBDIR}/libl_p.a LINKS+= ${LIBDIR}/libln_p.a ${LIBDIR}/libfl_p.a .endif .include