Index: head/gnu/lib/libdialog/Makefile =================================================================== --- head/gnu/lib/libdialog/Makefile (revision 275076) +++ head/gnu/lib/libdialog/Makefile (revision 275077) @@ -1,23 +1,22 @@ # $FreeBSD$ DIALOG= ${.CURDIR}/../../../contrib/dialog LIB= dialog SHLIB_MAJOR= 8 SRCS= argv.c arrows.c buildlist.c buttons.c calendar.c checklist.c \ columns.c dlg_keys.c editbox.c fselect.c formbox.c guage.c \ help.c inputbox.c inputstr.c menubox.c mixedform.c \ mixedgauge.c mouse.c mousewget.c msgbox.c pause.c prgbox.c \ progressbox.c rangebox.c rc.c tailbox.c textbox.c timebox.c \ trace.c treeview.c ui_getc.c util.c version.c yesno.c INCS= dialog.h dlg_colors.h dlg_config.h dlg_keys.h MAN= dialog.3 -DPADD= ${LIBNCURSESW} ${LIBM} -LDADD= -lncursesw -lm +LIBADD= ncursesw m CFLAGS+= -I${.CURDIR} -I${DIALOG} -D_XOPEN_SOURCE_EXTENDED -DGCC_UNUSED=__unused .PATH: ${DIALOG} WARNS?= 1 .include Index: head/gnu/lib/libgcc/Makefile =================================================================== --- head/gnu/lib/libgcc/Makefile (revision 275076) +++ head/gnu/lib/libgcc/Makefile (revision 275077) @@ -1,370 +1,368 @@ # $FreeBSD$ GCCDIR= ${.CURDIR}/../../../contrib/gcc GCCLIB= ${.CURDIR}/../../../contrib/gcclibs SHLIB_NAME= libgcc_s.so.1 SHLIBDIR?= /lib .include # # libgcc is linked in last and thus cannot depend on ssp symbols coming # from earlier libraries. Disable stack protection for this library. # MK_SSP= no .include "${.CURDIR}/../../usr.bin/cc/Makefile.tgt" .if ${TARGET_CPUARCH} == "arm" CFLAGS+= -DTARGET_ARM_EABI .endif .PATH: ${GCCDIR}/config/${GCC_CPU} ${GCCDIR}/config ${GCCDIR} CFLAGS+= -DIN_GCC -DIN_LIBGCC2 -D__GCC_FLOAT_NOT_NEEDED \ -DHAVE_GTHR_DEFAULT \ -I${GCCLIB}/include \ -I${GCCDIR}/config -I${GCCDIR} -I. \ -I${.CURDIR}/../../usr.bin/cc/cc_tools LDFLAGS+= -nodefaultlibs -DPADD+= ${LIBC} -LDADD+= -lc +LIBADD+= c OBJS= # added to below in various ways depending on TARGET_CPUARCH #--------------------------------------------------------------------------- # # Library members defined in libgcc2.c. # When upgrading GCC, obtain the following list from mklibgcc.in # LIB2FUNCS= _muldi3 _negdi2 _lshrdi3 _ashldi3 _ashrdi3 \ _cmpdi2 _ucmpdi2 \ _enable_execute_stack _trampoline __main _absvsi2 _absvdi2 _addvsi3 \ _addvdi3 _subvsi3 _subvdi3 _mulvsi3 _mulvdi3 _negvsi2 _negvdi2 _ctors \ _ffssi2 _ffsdi2 _clz _clzsi2 _clzdi2 _ctzsi2 _ctzdi2 _popcount_tab \ _popcountsi2 _popcountdi2 _paritysi2 _paritydi2 _powisf2 _powidf2 \ _powixf2 _powitf2 _mulsc3 _muldc3 _mulxc3 _multc3 _divsc3 _divdc3 \ _divxc3 _divtc3 _bswapsi2 _bswapdi2 .if ${COMPILER_TYPE} != "clang" || ${TARGET_CPUARCH} != "arm" LIB2FUNCS+= _clear_cache .endif # The floating-point conversion routines that involve a single-word integer. .for mode in sf df xf LIB2FUNCS+= _fixuns${mode}si .endfor # Likewise double-word routines. .if ${TARGET_CPUARCH} != "arm" # These are implemented in an ARM specific file but will not be filtered out .for mode in sf df xf tf LIB2FUNCS+= _fix${mode}di _fixuns${mode}di LIB2FUNCS+= _floatdi${mode} _floatundi${mode} .endfor .endif LIB2ADD = $(LIB2FUNCS_EXTRA) LIB2ADD_ST = $(LIB2FUNCS_STATIC_EXTRA) # Additional sources to handle exceptions; overridden by targets as needed. LIB2ADDEH = unwind-dw2.c unwind-dw2-fde-glibc.c unwind-sjlj.c gthr-gnat.c \ unwind-c.c LIB2ADDEHSTATIC = $(LIB2ADDEH) LIB2ADDEHSHARED = $(LIB2ADDEH) # List of extra C and assembler files to add to static and shared libgcc2. # Assembler files should have names ending in `.asm'. LIB2FUNCS_EXTRA = # List of extra C and assembler files to add to static libgcc2. # Assembler files should have names ending in `.asm'. LIB2FUNCS_STATIC_EXTRA = # Defined in libgcc2.c, included only in the static library. # KAN: Excluded _sf_to_tf and _df_to_tf as TPBIT_FUNCS are not # built on any of our platforms. LIB2FUNCS_ST = _eprintf __gcc_bcmp FPBIT_FUNCS = _pack_sf _unpack_sf _addsub_sf _mul_sf _div_sf \ _fpcmp_parts_sf _compare_sf _eq_sf _ne_sf _gt_sf _ge_sf \ _lt_sf _le_sf _unord_sf _si_to_sf _sf_to_si _negate_sf _make_sf \ _sf_to_df _thenan_sf _sf_to_usi _usi_to_sf DPBIT_FUNCS = _pack_df _unpack_df _addsub_df _mul_df _div_df \ _fpcmp_parts_df _compare_df _eq_df _ne_df _gt_df _ge_df \ _lt_df _le_df _unord_df _si_to_df _df_to_si _negate_df _make_df \ _df_to_sf _thenan_df _df_to_usi _usi_to_df TPBIT_FUNCS = _pack_tf _unpack_tf _addsub_tf _mul_tf _div_tf \ _fpcmp_parts_tf _compare_tf _eq_tf _ne_tf _gt_tf _ge_tf \ _lt_tf _le_tf _unord_tf _si_to_tf _tf_to_si _negate_tf _make_tf \ _tf_to_df _tf_to_sf _thenan_tf _tf_to_usi _usi_to_tf # These might cause a divide overflow trap and so are compiled with # unwinder info. LIB2_DIVMOD_FUNCS = _divdi3 _moddi3 _udivdi3 _umoddi3 _udiv_w_sdiv _udivmoddi4 #----------------------------------------------------------------------- # # Platform specific bits. # When upgrading GCC, get the following definitions from config//t-* # .if ${TARGET_CPUARCH} == "arm" # from config/arm/t-strongarm-elf CFLAGS+= -Dinhibit_libc -fno-inline CFLAGS.clang+= -fheinous-gnu-extensions LIB1ASMSRC = lib1funcs.asm LIB1ASMFUNCS = _dvmd_tls _bb_init_func LIB2ADDEH = unwind-arm.c libunwind.S pr-support.c unwind-c.c # Some compilers generate __aeabi_ functions libgcc_s is missing -DPADD+= ${LIBCOMPILER_RT} -LDADD+= -lcompiler_rt +LIBADD+= compiler_rt .endif .if ${TARGET_CPUARCH} == mips LIB2FUNCS_EXTRA = floatunsidf.c floatunsisf.c # ABIs other than o32 need this .if ${TARGET_ARCH} != "mips" && ${TARGET_ARCH} != "mipsel" LIB2FUNCS_EXTRA+= floatdidf.c fixunsdfsi.c LIB2FUNCS_EXTRA+= floatdisf.c floatundidf.c LIB2FUNCS_EXTRA+= fixsfdi.c floatundisf.c LIB2FUNCS_EXTRA+= fixdfdi.c fixunssfsi.c .endif .endif .if ${TARGET_ARCH} == "powerpc" # from config/rs6000/t-ppccomm LIB2FUNCS_EXTRA = tramp.asm LIB2FUNCS_STATIC_EXTRA = eabi.asm .endif .if ${TARGET_ARCH} == "powerpc64" # from config/rs6000/t-ppccomm LIB2FUNCS_EXTRA = tramp.asm .endif .if ${TARGET_CPUARCH} == "sparc64" # from config/sparc/t-elf LIB1ASMSRC = lb1spc.asm LIB1ASMFUNCS = _mulsi3 _divsi3 _modsi3 .endif #----------------------------------------------------------------------- # Remove any objects from LIB2FUNCS and LIB2_DIVMOD_FUNCS that are # defined as optimized assembly code in LIB1ASMFUNCS. .if defined(LIB1ASMFUNCS) .for sym in ${LIB1ASMFUNCS} LIB2FUNCS:= ${LIB2FUNCS:S/${sym}//g} LIB2_DIVMOD_FUNCS:= ${LIB2_DIVMOD_FUNCS:S/${sym}//g} .endfor .endif COMMONHDRS= tm.h tconfig.h options.h unwind.h gthr-default.h #----------------------------------------------------------------------- # # Helpful shortcuts for compiler invocations. # HIDE = -fvisibility=hidden -DHIDE_EXPORTS CC_T = ${CC} -c ${CFLAGS} ${HIDE} -fPIC CC_P = ${CC} -c ${CFLAGS} ${HIDE} -p -fPIC CC_S = ${CC} -c ${CFLAGS} ${PICFLAG} -DSHARED #----------------------------------------------------------------------- # # Functions from libgcc2.c # STD_CFLAGS = DIV_CFLAGS = -fexceptions -fnon-call-exceptions STD_FUNCS = ${LIB2FUNCS} DIV_FUNCS = ${LIB2_DIVMOD_FUNCS} STD_CFILE = libgcc2.c DIV_CFILE = libgcc2.c OBJ_GRPS = STD DIV #----------------------------------------------------------------------- # # Floating point emulation functions # .if ${TARGET_CPUARCH} == "armNOT_YET" || \ ${TARGET_CPUARCH} == "powerpc" || ${TARGET_CPUARCH} == "sparc64" FPBIT_CFLAGS = -DFINE_GRAINED_LIBRARIES -DFLOAT DPBIT_CFLAGS = -DFINE_GRAINED_LIBRARIES FPBIT_CFILE = config/fp-bit.c DPBIT_CFILE = config/fp-bit.c OBJ_GRPS += FPBIT DPBIT .endif #----------------------------------------------------------------------- # # Generic build rules for object groups defined above # .for T in ${OBJ_GRPS} ${T}_OBJS_T = ${${T}_FUNCS:S/$/.o/} ${T}_OBJS_P = ${${T}_FUNCS:S/$/.po/} ${T}_OBJS_S = ${${T}_FUNCS:S/$/.So/} OBJS += ${${T}_FUNCS:S/$/.o/} ${${T}_OBJS_T}: ${${T}_CFILE} ${COMMONHDRS} ${CC_T} ${${T}_CFLAGS} -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.c} ${${T}_OBJS_P}: ${${T}_CFILE} ${COMMONHDRS} ${CC_P} ${${T}_CFLAGS} -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.c} ${${T}_OBJS_S}: ${${T}_CFILE} ${COMMONHDRS} ${CC_S} ${${T}_CFLAGS} -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.c} .endfor #----------------------------------------------------------------------- # # Extra objects coming from separate files # .if !empty(LIB2ADD) OBJS += ${LIB2ADD:R:S/$/.o/} SOBJS += ${LIB2ADD:R:S/$/.So/} POBJS += ${LIB2ADD:R:S/$/.po/} .endif #----------------------------------------------------------------------- # # Objects that should be in static library only. # SYMS_ST = ${LIB2FUNCS_ST} ${LIB2ADD_ST} STAT_OBJS_T = ${SYMS_ST:S/$/.o/} STAT_OBJS_P = ${SYMS_ST:S/$/.po/} STATICOBJS = ${SYMS_ST:S/$/.o/} ${STAT_OBJS_T}: ${STD_CFILE} ${COMMONHDRS} ${CC_T} -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.c} ${STAT_OBJS_P}: ${STD_CFILE} ${COMMONHDRS} ${CC_P} -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.c} #----------------------------------------------------------------------- # # Assembler files. # .if defined(LIB1ASMSRC) ASM_T = ${LIB1ASMFUNCS:S/$/.o/} ASM_P = ${LIB1ASMFUNCS:S/$/.po/} ASM_S = ${LIB1ASMFUNCS:S/$/.So/} ASM_V = ${LIB1ASMFUNCS:S/$/.vis/} OBJS += ${LIB1ASMFUNCS:S/$/.o/} ${ASM_T}: ${LIB1ASMSRC} ${.PREFIX}.vis ${CC} -x assembler-with-cpp -c ${CFLAGS} -DL${.PREFIX} \ -o ${.TARGET} -include ${.PREFIX}.vis ${.ALLSRC:N*.h:N*.vis} ${ASM_P}: ${LIB1ASMSRC} ${.PREFIX}.vis ${CC} -x assembler-with-cpp -p -c ${CFLAGS} -DL${.PREFIX} \ -o ${.TARGET} -include ${.PREFIX}.vis ${.ALLSRC:N*.h:N*.vis} ${ASM_S}: ${LIB1ASMSRC} ${CC} -x assembler-with-cpp -c ${PICFLAG} ${CFLAGS} -DL${.PREFIX} \ -o ${.TARGET} ${.ALLSRC:N*.h} ${ASM_V}: ${LIB1ASMSRC} ${CC} -x assembler-with-cpp -c ${CFLAGS} -DL${.PREFIX} \ -o ${.PREFIX}.vo ${.ALLSRC:N*.h} ( ${NM} -pg ${.PREFIX}.vo | \ awk 'NF == 3 && $$2 !~ /^[UN]$$/ { print "\t.hidden ", $$3 }'\ ) > ${.TARGET} CLEANFILES += ${ASM_V} ${ASM_V:R:S/$/.vo/} .endif #----------------------------------------------------------------------- # # Exception handling / unwinding support. # EH_OBJS_T = ${LIB2ADDEHSTATIC:R:S/$/.o/} EH_OBJS_P = ${LIB2ADDEHSTATIC:R:S/$/.po/} EH_OBJS_S = ${LIB2ADDEHSHARED:R:S/$/.So/} EH_CFLAGS = -fexceptions -D__GLIBC__=3 -DElfW=__ElfN SOBJS += ${EH_OBJS_S} .for _src in ${LIB2ADDEHSTATIC} ${_src:R:S/$/.o/}: ${_src} ${COMMONHDRS} ${CC_T} ${EH_CFLAGS} -o ${.TARGET} ${.IMPSRC} ${_src:R:S/$/.po/}: ${_src} ${COMMONHDRS} ${CC_P} ${EH_CFLAGS} -o ${.TARGET} ${.IMPSRC} .endfor .for _src in ${LIB2ADDEHSHARED} ${_src:R:S/$/.So/}: ${_src} ${COMMONHDRS} ${CC_S} ${EH_CFLAGS} -o ${.TARGET} ${.IMPSRC} .endfor #----------------------------------------------------------------------- # # Generated headers # ${COMMONHDRS}: ${.CURDIR}/../../usr.bin/cc/cc_tools/Makefile (cd ${.CURDIR}; ${MAKE} -f ${.ALLSRC} MFILE=${.ALLSRC} GCCDIR=${GCCDIR} ${.TARGET}) CLEANFILES += ${COMMONHDRS} CLEANFILES += cs-*.h option* #----------------------------------------------------------------------- # # Build symbol version map # SHLIB_MKMAP = ${GCCDIR}/mkmap-symver.awk SHLIB_MKMAP_OPTS = SHLIB_MAPFILES = ${GCCDIR}/libgcc-std.ver .if ${TARGET_CPUARCH} == "arm" SHLIB_MAPFILES += ${GCCDIR}/config/arm/libgcc-bpabi.ver .endif VERSION_MAP = libgcc.map libgcc.map: ${SHLIB_MKMAP} ${SHLIB_MAPFILES} ${SOBJS} ${OBJS:R:S/$/.So/} ( ${NM} -pg ${SOBJS};echo %% ; \ cat ${SHLIB_MAPFILES} \ | sed -e '/^[ ]*#/d' \ -e 's/^%\(if\|else\|elif\|endif\|define\)/#\1/' \ | ${CC} ${CFLAGS} -E -xassembler-with-cpp -; \ ) | awk -f ${SHLIB_MKMAP} ${SHLIB_MKMAP_OPTS} > ${.TARGET} CLEANFILES += libgcc.map #----------------------------------------------------------------------- # # Build additional static libgcc_eh[_p].a libraries. # libgcc_eh.a: ${EH_OBJS_T} @${ECHO} building static gcc_eh library @rm -f ${.TARGET} @${AR} ${ARFLAGS} ${.TARGET} `lorder ${EH_OBJS_T} | tsort -q` ${RANLIB} ${RANLIBFLAGS} ${.TARGET} all: libgcc_eh.a .if ${MK_PROFILE} != "no" libgcc_eh_p.a: ${EH_OBJS_P} @${ECHO} building profiled gcc_eh library @rm -f ${.TARGET} @${AR} ${ARFLAGS} ${.TARGET} `lorder ${EH_OBJS_P} | tsort -q` ${RANLIB} ${RANLIBFLAGS} ${.TARGET} all: libgcc_eh_p.a .endif _libinstall: _lib-eh-install _lib-eh-install: .if ${MK_INSTALLLIB} != "no" ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ ${_INSTALLFLAGS} libgcc_eh.a ${DESTDIR}${LIBDIR} .endif .if ${MK_PROFILE} != "no" ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ ${_INSTALLFLAGS} libgcc_eh_p.a ${DESTDIR}${LIBDIR} .endif CLEANFILES+= libgcc_eh.a libgcc_eh_p.a ${EH_OBJS_T} ${EH_OBJS_P} .include .SUFFIXES: .vis .vo Index: head/gnu/lib/libreadline/readline/Makefile =================================================================== --- head/gnu/lib/libreadline/readline/Makefile (revision 275076) +++ head/gnu/lib/libreadline/readline/Makefile (revision 275077) @@ -1,29 +1,28 @@ # $FreeBSD$ LIB= readline INTERNALLIB= yes NO_MAN= yes TILDESRC= tilde.c SRCS= readline.c vi_mode.c funmap.c keymaps.c parens.c search.c \ rltty.c complete.c bind.c isearch.c display.c signals.c \ util.c kill.c undo.c macro.c input.c callback.c terminal.c \ text.c nls.c misc.c compat.c xmalloc.c $(HISTSRC) $(TILDESRC) INSTALLED_HEADERS= readline.h chardefs.h keymaps.h history.h tilde.h \ rlstdc.h rlconf.h rltypedefs.h CFLAGS+= -I${.OBJDIR}/.. SRCDIR= ${.CURDIR}/../../../../contrib/libreadline .for _h in ${INSTALLED_HEADERS} CLEANFILES+= ${_h} DPSRCS+= ${.OBJDIR}/${_h} ${.OBJDIR}/${_h}: ${SRCDIR}/${_h} ${INSTALL} ${.ALLSRC} ${.TARGET} .endfor -DPADD= ${LIBTERMCAPW} -LDADD= -ltermcapw +LIBADD= ncursesw .include Index: head/gnu/lib/libstdc++/Makefile =================================================================== --- head/gnu/lib/libstdc++/Makefile (revision 275076) +++ head/gnu/lib/libstdc++/Makefile (revision 275077) @@ -1,637 +1,637 @@ # $FreeBSD$ .include GCCVER= 4.2 GCCDIR= ${.CURDIR}/../../../contrib/gcc GCCLIB= ${.CURDIR}/../../../contrib/gcclibs SRCDIR= ${.CURDIR}/../../../contrib/libstdc++ SUPDIR= ${SRCDIR}/libsupc++ .PATH: ${SRCDIR}/src ${SRCDIR}/libmath ${SRCDIR}/config/io \ ${SRCDIR}/config/locale/darwin ${SRCDIR}/config/locale/generic \ ${SRCDIR}/include ${SUPDIR} ${GCCDIR} ${GCCLIB}/libiberty LIB= stdc++ SHLIB_MAJOR= 6 CFLAGS+= -DIN_GLIBCPP_V3 -DHAVE_CONFIG_H CFLAGS+= -I${.CURDIR} -I${SUPDIR} -I${GCCDIR} -I${SRCDIR}/include CFLAGS+= -I${GCCLIB}/include -I${SRCDIR}/include -I. CFLAGS+= -frandom-seed=RepeatabilityConsideredGood CXXFLAGS+= -fno-implicit-templates -ffunction-sections -fdata-sections \ -Wno-deprecated PO_CXXFLAGS= ${CXXFLAGS:N-ffunction-sections} -DPADD= ${LIBM} -LDADD= -lm -Wl,-f,libsupc++.so.1 +LIBADD+= m +LDADD= -Wl,-f,libsupc++.so.1 # libstdc++ sources SRCS+= bitmap_allocator.cc pool_allocator.cc \ mt_allocator.cc codecvt.cc compatibility.cc complex_io.cc \ ctype.cc debug.cc debug_list.cc functexcept.cc globals_io.cc \ ios.cc ios_failure.cc ios_init.cc ios_locale.cc limits.cc \ list.cc locale.cc locale_init.cc locale_facets.cc \ localename.cc stdexcept.cc strstream.cc tree.cc \ allocator-inst.cc concept-inst.cc fstream-inst.cc ext-inst.cc \ ios-inst.cc iostream-inst.cc istream-inst.cc istream.cc \ locale-inst.cc misc-inst.cc ostream-inst.cc sstream-inst.cc \ streambuf-inst.cc streambuf.cc string-inst.cc valarray-inst.cc \ wlocale-inst.cc wstring-inst.cc atomicity.cc \ codecvt_members.cc collate_members.cc ctype_members.cc \ messages_members.cc monetary_members.cc numeric_members.cc \ time_members.cc basic_file_stdio.cc c_locale.cc \ # compatibility-ldbl.cc # target sources SRCS+= atomicity.cc codecvt_members.cc collate_members.cc ctype_members.cc \ messages_members.cc monetary_members.cc numeric_members.cc \ time_members.cc # target sources extra SRCS+= basic_file_stdio.cc c_locale.cc # C parts of math SRCS+= stubs.c # Embedded copy of libsupc++ SRCS+= del_op.cc del_opnt.cc del_opv.cc del_opvnt.cc eh_alloc.cc eh_arm.cc \ eh_aux_runtime.cc eh_call.cc eh_catch.cc eh_exception.cc eh_globals.cc \ eh_personality.cc eh_term_handler.cc eh_terminate.cc eh_throw.cc \ eh_type.cc eh_unex_handler.cc guard.cc new_handler.cc new_op.cc \ new_opnt.cc new_opv.cc new_opvnt.cc pure.cc tinfo.cc tinfo2.cc \ vec.cc vterminate.cc # from libiberty: SRCS+= cp-demangle.c # MD headers location .if ${MACHINE_CPUARCH} == "sparc64" MARCHDIR= sparc .elif ${MACHINE_CPUARCH} == "i386" && ${MACHINE_CPU} != 'i386' MARCHDIR= i486 .elif ${MACHINE_CPUARCH} == "amd64" MARCHDIR= i486 .else MARCHDIR= ${MACHINE_CPUARCH} .endif .if exists(${SRCDIR}/config/cpu/${MARCHDIR}/atomicity.h) ATOMICITY_H= ${SRCDIR}/config/cpu/${MARCHDIR}/atomicity.h .else ATOMICITY_H= ${SRCDIR}/config/cpu/generic/atomicity_mutex/atomicity.h .endif .if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386" .if exists(${SRCDIR}/config/cpu/generic/atomicity_builtins/atomicity.h) ATOMICITY_H= ${SRCDIR}/config/cpu/generic/atomicity_builtins/atomicity.h .endif .endif atomicity.cc: ${ATOMICITY_H} ln -sf ${.ALLSRC} ${.TARGET} CLEANFILES+= atomicity.cc INCSGROUPS= BITSHDRS BKWHDRS EXTHDRS BASEHDRS BASEXHDRS STDHDRS \ TARGETHDRS THRHDRS DEBUGHDRS TR1HDRS PBHDRS0 PBHDRS1 CXXINCLUDEDIR= ${INCLUDEDIR}/c++/${GCCVER} STDHDRS= std_algorithm.h std_bitset.h std_complex.h std_deque.h \ std_fstream.h std_functional.h std_iomanip.h std_ios.h \ std_iosfwd.h std_iostream.h std_istream.h std_iterator.h \ std_limits.h std_list.h std_locale.h std_map.h std_memory.h \ std_numeric.h std_ostream.h std_queue.h std_set.h \ std_sstream.h std_stack.h std_stdexcept.h std_streambuf.h \ std_string.h std_utility.h std_valarray.h std_vector.h .for h in ${STDHDRS} STDHDRSNAME_$h=${h:R:S;^std_;;} .endfor STDHDRS:= ${STDHDRS:S;^;${SRCDIR}/include/std/;} STDHDRSDIR= ${CXXINCLUDEDIR} BITSHDRS= allocator.h basic_ios.h basic_ios.tcc basic_string.h \ basic_string.tcc boost_concept_check.h char_traits.h codecvt.h \ concept_check.h cpp_type_traits.h deque.tcc fstream.tcc \ functexcept.h gslice.h gslice_array.h indirect_array.h \ ios_base.h istream.tcc list.tcc locale_classes.h \ locale_facets.h locale_facets.tcc localefwd.h mask_array.h \ ostream.tcc ostream_insert.h postypes.h stream_iterator.h \ streambuf_iterator.h slice_array.h sstream.tcc stl_algo.h \ stl_algobase.h stl_bvector.h stl_construct.h stl_deque.h \ stl_function.h stl_heap.h stl_iterator.h \ stl_iterator_base_funcs.h stl_iterator_base_types.h stl_list.h \ stl_map.h stl_multimap.h stl_multiset.h stl_numeric.h \ stl_pair.h stl_queue.h stl_raw_storage_iter.h stl_relops.h \ stl_set.h stl_stack.h stl_tempbuf.h stl_tree.h \ stl_uninitialized.h stl_vector.h streambuf.tcc stringfwd.h \ valarray_array.h valarray_array.tcc valarray_before.h \ valarray_after.h vector.tcc BITSHDRS:= ${BITSHDRS:S;^;${SRCDIR}/include/bits/;} BITSHDRSDIR= ${CXXINCLUDEDIR}/bits BKWHDRS= complex.h iomanip.h istream.h ostream.h stream.h streambuf.h \ algo.h algobase.h alloc.h bvector.h defalloc.h deque.h \ function.h hash_map.h hash_set.h hashtable.h heap.h iostream.h \ iterator.h list.h map.h multimap.h new.h multiset.h pair.h \ queue.h rope.h set.h slist.h stack.h tempbuf.h tree.h \ vector.h fstream.h strstream backward_warning.h BKWHDRS:= ${BKWHDRS:S;^;${SRCDIR}/include/backward/;} BKWHDRSDIR= ${CXXINCLUDEDIR}/backward EXTHDRS= algorithm atomicity.h array_allocator.h bitmap_allocator.h \ codecvt_specializations.h concurrence.h debug_allocator.h \ stdio_filebuf.h stdio_sync_filebuf.h functional \ hash_map hash_set hash_fun.h hashtable.h iterator \ malloc_allocator.h memory mt_allocator.h new_allocator.h \ numeric numeric_traits.h pod_char_traits.h pool_allocator.h \ rb_tree rope ropeimpl.h slist throw_allocator.h typelist.h \ type_traits.h rc_string_base.h sso_string_base.h vstring.h \ vstring.tcc vstring_fwd.h vstring_util.h EXTHDRS:= ${EXTHDRS:S;^;${SRCDIR}/include/ext/;} EXTHDRSDIR= ${CXXINCLUDEDIR}/ext TR1HDRS= array bind_repeat.h bind_iterate.h boost_shared_ptr.h cctype \ cfenv cfloat cinttypes climits cmath common.h complex cstdarg \ cstdbool cstdint cstdio cstdlib ctgmath ctime ctype.h cwchar \ cwctype fenv.h float.h functional functional_hash.h \ functional_iterate.h hashtable hashtable_policy.h inttypes.h \ limits.h math.h memory mu_iterate.h random random.tcc \ ref_fwd.h ref_wrap_iterate.h repeat.h stdarg.h stdbool.h \ stdint.h stdio.h stdlib.h tgmath.h tuple tuple_defs.h \ tuple_iterate.h type_traits type_traits_fwd.h unordered_set \ unordered_map utility wchar.h wctype.h TR1HDRS:= ${TR1HDRS:S;^;${SRCDIR}/include/tr1/;} TR1HDRSDIR= ${CXXINCLUDEDIR}/tr1 # This is the common subset of files that all three "C" header models use. BASEHDRS= std_cassert.h std_cctype.h std_cerrno.h std_cfloat.h \ std_ciso646.h std_climits.h std_clocale.h std_cmath.h \ std_csetjmp.h std_csignal.h std_cstdarg.h std_cstddef.h \ std_cstdio.h std_cstdlib.h std_cstring.h std_ctime.h \ std_cwchar.h std_cwctype.h .for h in ${BASEHDRS} BASEHDRSNAME_$h=${h:R:S;^std_;;} .endfor BASEHDRS:= ${BASEHDRS:S;^;${SRCDIR}/include/c_std/;} BASEHDRSDIR= ${CXXINCLUDEDIR} # Some of the different "C" header models need extra files. BASEXHDRS= ${SRCDIR}/include/c_std/cmath.tcc BASEXHDRSDIR= ${CXXINCLUDEDIR}/bits DEBUGHDRS= bitset debug.h deque formatter.h functions.h hash_map \ hash_map.h hash_multimap.h hash_multiset.h hash_set hash_set.h \ list macros.h map map.h multimap.h multiset.h safe_base.h \ safe_iterator.h safe_iterator.tcc safe_sequence.h set set.h \ string vector DEBUGHDRS:= ${DEBUGHDRS:S;^;${SRCDIR}/include/debug/;} DEBUGHDRSDIR= ${CXXINCLUDEDIR}/debug # Not installed, but kept here for completeness COMPATHDRS= assert.h ctype.h errno.h float.h iso646.h limits.h locale.h \ math.h setjmp.h signal.h stdarg.h stddef.h stdio.h stdlib.h \ string.h time.h wchar.h wctype.h COMPATHDRS:= ${COMPATHDRS:S;^;${SRCDIR}/include/debug/;} COMPATHDRSDIR= ${CXXINCLUDEDIR}/c_compatibility PBHDRS0 = \ assoc_container.hpp \ exception.hpp \ hash_policy.hpp \ list_update_policy.hpp \ priority_queue.hpp \ tag_and_trait.hpp \ tree_policy.hpp \ trie_policy.hpp PBHDRS0:= ${PBHDRS0:S;^;${SRCDIR}/include/ext/pb_ds/;} PBHDRS0DIR= ${CXXINCLUDEDIR}/ext/pb_ds PBHDRS1 = \ basic_types.hpp \ cond_dealtor.hpp \ constructors_destructor_fn_imps.hpp \ container_base_dispatch.hpp \ map_debug_base.hpp \ priority_queue_base_dispatch.hpp \ standard_policies.hpp \ tree_trace_base.hpp \ type_utils.hpp \ types_traits.hpp PBHDRS1:= ${PBHDRS1:S;^;${SRCDIR}/include/ext/pb_ds/detail/;} PBHDRS1DIR= ${CXXINCLUDEDIR}/ext/pb_ds/detail PBHDRS+= \ basic_tree_policy/basic_tree_policy_base.hpp \ basic_tree_policy/null_node_metadata.hpp \ basic_tree_policy/traits.hpp \ basic_types.hpp \ binary_heap_/binary_heap_.hpp \ binary_heap_/const_iterator.hpp \ binary_heap_/const_point_iterator.hpp \ binary_heap_/constructors_destructor_fn_imps.hpp \ binary_heap_/debug_fn_imps.hpp \ binary_heap_/entry_cmp.hpp \ binary_heap_/entry_pred.hpp \ binary_heap_/erase_fn_imps.hpp \ binary_heap_/find_fn_imps.hpp \ binary_heap_/info_fn_imps.hpp \ binary_heap_/insert_fn_imps.hpp \ binary_heap_/iterators_fn_imps.hpp \ binary_heap_/policy_access_fn_imps.hpp \ binary_heap_/resize_policy.hpp \ binary_heap_/split_join_fn_imps.hpp \ binary_heap_/trace_fn_imps.hpp \ binomial_heap_base_/binomial_heap_base_.hpp \ binomial_heap_base_/constructors_destructor_fn_imps.hpp \ binomial_heap_base_/debug_fn_imps.hpp \ binomial_heap_base_/erase_fn_imps.hpp \ binomial_heap_base_/find_fn_imps.hpp \ binomial_heap_base_/insert_fn_imps.hpp \ binomial_heap_base_/split_join_fn_imps.hpp \ binomial_heap_/binomial_heap_.hpp \ binomial_heap_/constructors_destructor_fn_imps.hpp \ binomial_heap_/debug_fn_imps.hpp \ bin_search_tree_/bin_search_tree_.hpp \ bin_search_tree_/cond_dtor_entry_dealtor.hpp \ bin_search_tree_/cond_key_dtor_entry_dealtor.hpp PBHDRS+= \ bin_search_tree_/constructors_destructor_fn_imps.hpp \ bin_search_tree_/debug_fn_imps.hpp \ bin_search_tree_/erase_fn_imps.hpp \ bin_search_tree_/find_fn_imps.hpp \ bin_search_tree_/info_fn_imps.hpp \ bin_search_tree_/insert_fn_imps.hpp \ bin_search_tree_/iterators_fn_imps.hpp \ bin_search_tree_/node_iterators.hpp \ bin_search_tree_/point_iterators.hpp \ bin_search_tree_/policy_access_fn_imps.hpp \ bin_search_tree_/r_erase_fn_imps.hpp \ bin_search_tree_/rotate_fn_imps.hpp \ bin_search_tree_/split_join_fn_imps.hpp \ bin_search_tree_/traits.hpp \ cc_hash_table_map_/cc_ht_map_.hpp \ cc_hash_table_map_/cmp_fn_imps.hpp \ cc_hash_table_map_/cond_key_dtor_entry_dealtor.hpp \ cc_hash_table_map_/constructor_destructor_fn_imps.hpp \ cc_hash_table_map_/constructor_destructor_no_store_hash_fn_imps.hpp \ cc_hash_table_map_/constructor_destructor_store_hash_fn_imps.hpp \ cc_hash_table_map_/debug_fn_imps.hpp \ cc_hash_table_map_/debug_no_store_hash_fn_imps.hpp \ cc_hash_table_map_/debug_store_hash_fn_imps.hpp \ cc_hash_table_map_/entry_list_fn_imps.hpp \ cc_hash_table_map_/erase_fn_imps.hpp \ cc_hash_table_map_/erase_no_store_hash_fn_imps.hpp \ cc_hash_table_map_/erase_store_hash_fn_imps.hpp \ cc_hash_table_map_/find_fn_imps.hpp \ cc_hash_table_map_/find_store_hash_fn_imps.hpp \ cc_hash_table_map_/info_fn_imps.hpp \ cc_hash_table_map_/insert_fn_imps.hpp \ cc_hash_table_map_/insert_no_store_hash_fn_imps.hpp \ cc_hash_table_map_/insert_store_hash_fn_imps.hpp \ cc_hash_table_map_/iterators_fn_imps.hpp \ cc_hash_table_map_/policy_access_fn_imps.hpp \ cc_hash_table_map_/resize_fn_imps.hpp \ cc_hash_table_map_/resize_no_store_hash_fn_imps.hpp \ cc_hash_table_map_/resize_store_hash_fn_imps.hpp \ cc_hash_table_map_/size_fn_imps.hpp \ cc_hash_table_map_/standard_policies.hpp PBHDRS+= \ cc_hash_table_map_/trace_fn_imps.hpp \ cond_dealtor.hpp \ constructors_destructor_fn_imps.hpp \ container_base_dispatch.hpp \ eq_fn/eq_by_less.hpp \ eq_fn/hash_eq_fn.hpp \ gp_hash_table_map_/constructor_destructor_fn_imps.hpp \ gp_hash_table_map_/constructor_destructor_no_store_hash_fn_imps.hpp \ gp_hash_table_map_/constructor_destructor_store_hash_fn_imps.hpp \ gp_hash_table_map_/debug_fn_imps.hpp \ gp_hash_table_map_/debug_no_store_hash_fn_imps.hpp \ gp_hash_table_map_/debug_store_hash_fn_imps.hpp \ gp_hash_table_map_/erase_fn_imps.hpp \ gp_hash_table_map_/erase_no_store_hash_fn_imps.hpp \ gp_hash_table_map_/erase_store_hash_fn_imps.hpp \ gp_hash_table_map_/find_fn_imps.hpp \ gp_hash_table_map_/find_no_store_hash_fn_imps.hpp \ gp_hash_table_map_/find_store_hash_fn_imps.hpp \ gp_hash_table_map_/gp_ht_map_.hpp \ gp_hash_table_map_/info_fn_imps.hpp \ gp_hash_table_map_/insert_fn_imps.hpp \ gp_hash_table_map_/insert_no_store_hash_fn_imps.hpp \ gp_hash_table_map_/insert_store_hash_fn_imps.hpp \ gp_hash_table_map_/iterator_fn_imps.hpp \ gp_hash_table_map_/policy_access_fn_imps.hpp \ gp_hash_table_map_/resize_fn_imps.hpp \ gp_hash_table_map_/resize_no_store_hash_fn_imps.hpp \ gp_hash_table_map_/resize_store_hash_fn_imps.hpp \ gp_hash_table_map_/standard_policies.hpp \ gp_hash_table_map_/trace_fn_imps.hpp \ hash_fn/direct_mask_range_hashing_imp.hpp \ hash_fn/direct_mod_range_hashing_imp.hpp \ hash_fn/linear_probe_fn_imp.hpp \ hash_fn/mask_based_range_hashing.hpp \ hash_fn/mod_based_range_hashing.hpp \ hash_fn/probe_fn_base.hpp \ hash_fn/quadratic_probe_fn_imp.hpp \ hash_fn/ranged_hash_fn.hpp \ hash_fn/ranged_probe_fn.hpp PBHDRS+= \ hash_fn/sample_probe_fn.hpp \ hash_fn/sample_ranged_hash_fn.hpp \ hash_fn/sample_ranged_probe_fn.hpp \ hash_fn/sample_range_hashing.hpp \ left_child_next_sibling_heap_/const_iterator.hpp \ left_child_next_sibling_heap_/const_point_iterator.hpp \ left_child_next_sibling_heap_/constructors_destructor_fn_imps.hpp \ left_child_next_sibling_heap_/debug_fn_imps.hpp \ left_child_next_sibling_heap_/erase_fn_imps.hpp \ left_child_next_sibling_heap_/info_fn_imps.hpp \ left_child_next_sibling_heap_/insert_fn_imps.hpp \ left_child_next_sibling_heap_/iterators_fn_imps.hpp \ left_child_next_sibling_heap_/left_child_next_sibling_heap_.hpp \ left_child_next_sibling_heap_/node.hpp \ left_child_next_sibling_heap_/null_metadata.hpp \ left_child_next_sibling_heap_/policy_access_fn_imps.hpp \ left_child_next_sibling_heap_/trace_fn_imps.hpp \ list_update_map_/constructor_destructor_fn_imps.hpp \ list_update_map_/debug_fn_imps.hpp \ list_update_map_/entry_metadata_base.hpp \ list_update_map_/erase_fn_imps.hpp \ list_update_map_/find_fn_imps.hpp \ list_update_map_/info_fn_imps.hpp \ list_update_map_/insert_fn_imps.hpp \ list_update_map_/iterators_fn_imps.hpp \ list_update_map_/lu_map_.hpp \ list_update_map_/trace_fn_imps.hpp \ list_update_policy/counter_lu_metadata.hpp \ list_update_policy/counter_lu_policy_imp.hpp \ list_update_policy/mtf_lu_policy_imp.hpp \ list_update_policy/sample_update_policy.hpp \ map_debug_base.hpp \ ov_tree_map_/cond_dtor.hpp \ ov_tree_map_/constructors_destructor_fn_imps.hpp \ ov_tree_map_/debug_fn_imps.hpp \ ov_tree_map_/erase_fn_imps.hpp \ ov_tree_map_/info_fn_imps.hpp \ ov_tree_map_/insert_fn_imps.hpp \ ov_tree_map_/iterators_fn_imps.hpp \ ov_tree_map_/node_iterators.hpp \ ov_tree_map_/ov_tree_map_.hpp PBHDRS+= \ ov_tree_map_/policy_access_fn_imps.hpp \ ov_tree_map_/split_join_fn_imps.hpp \ ov_tree_map_/traits.hpp \ pairing_heap_/constructors_destructor_fn_imps.hpp \ pairing_heap_/debug_fn_imps.hpp \ pairing_heap_/erase_fn_imps.hpp \ pairing_heap_/find_fn_imps.hpp \ pairing_heap_/insert_fn_imps.hpp \ pairing_heap_/pairing_heap_.hpp \ pairing_heap_/split_join_fn_imps.hpp \ pat_trie_/child_iterator.hpp \ pat_trie_/cond_dtor_entry_dealtor.hpp \ pat_trie_/const_child_iterator.hpp \ pat_trie_/constructors_destructor_fn_imps.hpp \ pat_trie_/debug_fn_imps.hpp \ pat_trie_/erase_fn_imps.hpp \ pat_trie_/find_fn_imps.hpp \ pat_trie_/head.hpp \ pat_trie_/info_fn_imps.hpp \ pat_trie_/insert_join_fn_imps.hpp \ pat_trie_/internal_node.hpp \ pat_trie_/iterators_fn_imps.hpp \ pat_trie_/leaf.hpp \ pat_trie_/node_base.hpp \ pat_trie_/node_iterators.hpp \ pat_trie_/node_metadata_base.hpp \ pat_trie_/pat_trie_.hpp \ pat_trie_/point_iterators.hpp \ pat_trie_/policy_access_fn_imps.hpp \ pat_trie_/r_erase_fn_imps.hpp \ pat_trie_/rotate_fn_imps.hpp \ pat_trie_/split_fn_imps.hpp \ pat_trie_/split_join_branch_bag.hpp \ pat_trie_/synth_e_access_traits.hpp \ pat_trie_/trace_fn_imps.hpp \ pat_trie_/traits.hpp \ pat_trie_/update_fn_imps.hpp \ priority_queue_base_dispatch.hpp \ rb_tree_map_/constructors_destructor_fn_imps.hpp \ rb_tree_map_/debug_fn_imps.hpp PBHDRS+= \ rb_tree_map_/erase_fn_imps.hpp \ rb_tree_map_/find_fn_imps.hpp \ rb_tree_map_/info_fn_imps.hpp \ rb_tree_map_/insert_fn_imps.hpp \ rb_tree_map_/node.hpp \ rb_tree_map_/rb_tree_.hpp \ rb_tree_map_/split_join_fn_imps.hpp \ rb_tree_map_/traits.hpp \ rc_binomial_heap_/constructors_destructor_fn_imps.hpp \ rc_binomial_heap_/debug_fn_imps.hpp \ rc_binomial_heap_/erase_fn_imps.hpp \ rc_binomial_heap_/insert_fn_imps.hpp \ rc_binomial_heap_/rc_binomial_heap_.hpp \ rc_binomial_heap_/rc.hpp \ rc_binomial_heap_/split_join_fn_imps.hpp \ rc_binomial_heap_/trace_fn_imps.hpp \ resize_policy/cc_hash_max_collision_check_resize_trigger_imp.hpp \ resize_policy/hash_exponential_size_policy_imp.hpp \ resize_policy/hash_load_check_resize_trigger_imp.hpp \ resize_policy/hash_load_check_resize_trigger_size_base.hpp \ resize_policy/hash_prime_size_policy_imp.hpp \ resize_policy/hash_standard_resize_policy_imp.hpp \ resize_policy/sample_resize_policy.hpp \ resize_policy/sample_resize_trigger.hpp \ resize_policy/sample_size_policy.hpp \ splay_tree_/constructors_destructor_fn_imps.hpp \ splay_tree_/debug_fn_imps.hpp \ splay_tree_/erase_fn_imps.hpp \ splay_tree_/find_fn_imps.hpp \ splay_tree_/info_fn_imps.hpp \ splay_tree_/insert_fn_imps.hpp \ splay_tree_/node.hpp \ splay_tree_/splay_fn_imps.hpp \ splay_tree_/splay_tree_.hpp \ splay_tree_/split_join_fn_imps.hpp \ splay_tree_/traits.hpp \ standard_policies.hpp \ thin_heap_/constructors_destructor_fn_imps.hpp \ thin_heap_/debug_fn_imps.hpp \ thin_heap_/erase_fn_imps.hpp PBHDRS+= \ thin_heap_/find_fn_imps.hpp \ thin_heap_/insert_fn_imps.hpp \ thin_heap_/split_join_fn_imps.hpp \ thin_heap_/thin_heap_.hpp \ thin_heap_/trace_fn_imps.hpp \ tree_policy/node_metadata_selector.hpp \ tree_policy/null_node_update_imp.hpp \ tree_policy/order_statistics_imp.hpp \ tree_policy/sample_tree_node_update.hpp \ tree_trace_base.hpp \ trie_policy/node_metadata_selector.hpp \ trie_policy/null_node_update_imp.hpp \ trie_policy/order_statistics_imp.hpp \ trie_policy/prefix_search_node_update_imp.hpp \ trie_policy/sample_trie_e_access_traits.hpp \ trie_policy/sample_trie_node_update.hpp \ trie_policy/string_trie_e_access_traits_imp.hpp \ trie_policy/trie_policy_base.hpp \ types_traits.hpp \ type_utils.hpp \ unordered_iterator/const_iterator.hpp \ unordered_iterator/const_point_iterator.hpp \ unordered_iterator/iterator.hpp \ unordered_iterator/point_iterator.hpp PBHDRSDIRS= \ pairing_heap_ \ splay_tree_ \ list_update_map_ \ basic_tree_policy \ trie_policy \ gp_hash_table_map_ \ tree_policy \ binomial_heap_base_ \ resize_policy \ bin_search_tree_ \ binomial_heap_ \ thin_heap_ \ pat_trie_ \ cc_hash_table_map_ \ rc_binomial_heap_ \ left_child_next_sibling_heap_ \ unordered_iterator \ binary_heap_ \ ov_tree_map_ \ hash_fn \ eq_fn \ rb_tree_map_ \ list_update_policy .for D in ${PBHDRSDIRS} PHDRGRP$D:= ${PBHDRS:M$D/*:S;^;${SRCDIR}/include/ext/pb_ds/detail/;} PHDRGRP$DDIR= ${CXXINCLUDEDIR}/ext/pb_ds/detail/$D INCSGROUPS+= PHDRGRP$D .endfor TARGETHDRS= abi/compatibility.h \ allocator/new_allocator_base.h \ io/basic_file_stdio.h \ io/c_io_stdio.h \ locale/generic/c_locale.h \ locale/generic/c++locale_internal.h \ locale/generic/messages_members.h \ locale/generic/time_members.h \ os/bsd/freebsd/ctype_base.h \ os/bsd/freebsd/ctype_inline.h \ os/bsd/freebsd/ctype_noninline.h \ os/bsd/freebsd/os_defines.h TARGETHDRS:= ${TARGETHDRS:S;^;${SRCDIR}/config/;} TARGETHDRS+= c++config.h TARGETHDRSNAME_basic_file_stdio.h= basic_file.h TARGETHDRSNAME_c_io_stdio.h= c++io.h TARGETHDRSNAME_c_locale.h= c++locale.h TARGETHDRSNAME_new_allocator_base.h= c++allocator.h TARGETHDRSDIR= ${CXXINCLUDEDIR}/bits MARCHHDRS= atomic_word.h cpu_defines.h cxxabi_tweaks.h .for h in ${MARCHHDRS} .if exists(${SRCDIR}/config/cpu/${MARCHDIR}/${h}) TARGETHDRS+= ${SRCDIR}/config/cpu/${MARCHDIR}/${h} .else TARGETHDRS+= ${SRCDIR}/config/cpu/generic/${h} .endif .endfor THRHDRS= gthr.h gthr-single.h gthr-posix.h gthr-tpf.h gthr-default.h THRHDRSDIR= ${CXXINCLUDEDIR}/bits uppercase = [ABCDEFGHIJKLMNOPQRSTUVWXYZ_] gthr.h: ${GCCDIR}/gthr.h sed -e '/^#pragma/b' \ -e '/^#/s/\(${uppercase}${uppercase}*\)/_GLIBCXX_\1/g' \ -e 's/_GLIBCXX_SUPPORTS_WEAK/__GXX_WEAK__/g' \ -e 's,^#include "\(.*\)",#include ,g' \ < ${.ALLSRC} > ${.TARGET} gthr-single.h: ${GCCDIR}/gthr-single.h sed -e 's/\(UNUSED\)/_GLIBCXX_\1/g' \ -e 's/\(GCC${uppercase}*_H\)/_GLIBCXX_\1/g' \ < ${.ALLSRC} > ${.TARGET} gthr-posix.h: ${GCCDIR}/gthr-posix.h sed -e 's/\(UNUSED\)/_GLIBCXX_\1/g' \ -e 's/\(GCC${uppercase}*_H\)/_GLIBCXX_\1/g' \ -e 's/SUPPORTS_WEAK/__GXX_WEAK__/g' \ -e 's/\(${uppercase}*USE_WEAK\)/_GLIBCXX_\1/g' \ < ${.ALLSRC} > ${.TARGET} gthr-tpf.h: ${GCCDIR}/gthr-posix.h sed -e 's/\(UNUSED\)/_GLIBCXX_\1/g' \ -e 's/\(GCC${uppercase}*_H\)/_GLIBCXX_\1/g' \ -e 's/SUPPORTS_WEAK/__GXX_WEAK__/g' \ -e 's/\(${uppercase}*USE_WEAK\)/_GLIBCXX_\1/g' \ < ${.ALLSRC} > ${.TARGET} gthr-default.h: ${GCCDIR}/gthr-posix.h sed -e 's/\(UNUSED\)/_GLIBCXX_\1/g' \ -e 's/\(GCC${uppercase}*_H\)/_GLIBCXX_\1/g' \ -e 's/SUPPORTS_WEAK/__GXX_WEAK__/g' \ -e 's/\(${uppercase}*USE_WEAK\)/_GLIBCXX_\1/g' \ -e 's,^#include "\(.*\)",#include ,g' \ < ${.ALLSRC} > ${.TARGET} CLEANFILES+= ${THRHDRS} .if ${MACHINE_CPUARCH} == "arm" unwind.h: ${GCCDIR}/config/arm/unwind-arm.h .else unwind.h: ${GCCDIR}/unwind-generic.h .endif unwind.h: ln -sf ${.ALLSRC} ${.TARGET} SRCS+= unwind.h CLEANFILES+= unwind.h DATESTAMP!= cat ${GCCDIR}/DATESTAMP c++config.h: ${.CURDIR}/config.h ${SRCDIR}/include/bits/c++config sed -e "s/\\(define __GLIBCXX__\\)/\1 ${DATESTAMP}/" \ -e 's/\(define _GLIBCXX_HAVE_ATTRIBUTE_VISIBILITY\)/\1 1/' \ -e 's/\(define _GLIBCXX_NAMESPACE_ASSOCIATION_VERSION\)/\1 0/' \ < ${SRCDIR}/include/bits/c++config > ${.TARGET} && \ sed -e 's/HAVE_/_GLIBCXX_HAVE_/g' \ -e 's/PACKAGE/_GLIBCXX_PACKAGE/g' \ -e 's/VERSION/_GLIBCXX_VERSION/g' \ -e 's/WORDS_/_GLIBCXX_WORDS_/g' \ < ${.CURDIR}/config.h >> ${.TARGET} && \ echo "#endif // _CXXCONFIG_" >> ${.TARGET} CLEANFILES+= c++config.h # Symbol versioning. VERSION_MAP= libstdc++.map ${VERSION_MAP}: ${SRCDIR}/config/abi/pre/gnu.ver ln -sf ${.ALLSRC} ${.TARGET} CLEANFILES+= ${VERSION_MAP} CXXFLAGS.clang+= -stdlib=libstdc++ .include # Filter out libc++-specific flags, and -std= flags above c++98 or gnu++98. CXXFLAGS:= ${CXXFLAGS:N-stdlib=libc++:N-std=c++[01][13x]:N-std=gnu++[01][13x]} Index: head/gnu/usr.bin/dialog/Makefile =================================================================== --- head/gnu/usr.bin/dialog/Makefile (revision 275076) +++ head/gnu/usr.bin/dialog/Makefile (revision 275077) @@ -1,13 +1,12 @@ # $FreeBSD$ DIALOG= ${.CURDIR}/../../../contrib/dialog PROG= dialog -DPADD= ${LIBDIALOG} ${LIBNCURSESW} ${LIBM} -LDADD= -ldialog -lncursesw -lm +LIBADD= dialog ncursesw m CFLAGS+= -I${.CURDIR} -I${DIALOG} .PATH: ${DIALOG} WARNS?= 6 .include Index: head/gnu/usr.bin/diff/Makefile =================================================================== --- head/gnu/usr.bin/diff/Makefile (revision 275076) +++ head/gnu/usr.bin/diff/Makefile (revision 275077) @@ -1,36 +1,35 @@ # $FreeBSD$ .include DIFFSRC=${.CURDIR}/../../../contrib/diff/src .PATH: ${DIFFSRC} \ ${.CURDIR}/../../../contrib/diff/lib \ ${.CURDIR}/../../../contrib/diff/man PROG= diff SRCS= analyze.c context.c diff.c dir.c ed.c ifdef.c io.c \ normal.c side.c util.c \ xmalloc.c strtoumax.c cmpbuf.c exitfail.c error.c quotesys.c \ strftime.c c-stack.c basename.c exclude.c hard-locale.c \ file-type.c posixver.c prepargs.c version-etc.c # Important for ctype macros! CFLAGS+=-funsigned-char CFLAGS+=-DHAVE_CONFIG_H CFLAGS+=-DPR_PROGRAM=\"/usr/bin/pr\" CFLAGS+=-I${.CURDIR}/../../../contrib/diff CFLAGS+=-I${.CURDIR}/../../../contrib/diff/src CFLAGS+=-I${.CURDIR}/../../../contrib/diff/lib CFLAGS+=-I${DESTDIR}/usr/include/gnu SUBDIR+=doc -DPADD= ${LIBGNUREGEX} -LDADD= -lgnuregex +LIBADD+= gnuregex .if ${MK_TESTS} != "no" SUBDIR+= tests .endif .include Index: head/gnu/usr.bin/gdb/gdb/Makefile =================================================================== --- head/gnu/usr.bin/gdb/gdb/Makefile (revision 275076) +++ head/gnu/usr.bin/gdb/gdb/Makefile (revision 275077) @@ -1,18 +1,19 @@ # $FreeBSD$ PROG= gdb${GDB_SUFFIX} SRCS= gdb.c BULIBS= ${OBJ_BU}/libbfd/libbfd.a ${OBJ_BU}/libopcodes/libopcodes.a \ ${OBJ_BU}/libiberty/libiberty.a GDBLIBS= ${OBJ_GDB}/libgdb/libgdb.a # libthread_db.so calls back into gdb for the proc services. Make all the # global symbols visible. LDFLAGS+= -Wl,-E -DPADD= ${GDBLIBS} ${BULIBS} ${LIBM} ${LIBREADLINE} ${LIBTERMCAPW} ${LIBGNUREGEX} -LDADD= ${GDBLIBS} ${BULIBS} -lm ${LDREADLINE} -ltermcapw -lgnuregex +DPADD= ${GDBLIBS} ${BULIBS} +LDADD= ${GDBLIBS} ${BULIBS} +LIBADD+= m readline ncursesw gnuregex .include CFLAGS+= -DDEBUGDIR=\"${DEBUGDIR}\" Index: head/gnu/usr.bin/gdb/gdbtui/Makefile =================================================================== --- head/gnu/usr.bin/gdb/gdbtui/Makefile (revision 275076) +++ head/gnu/usr.bin/gdb/gdbtui/Makefile (revision 275077) @@ -1,18 +1,19 @@ # $FreeBSD$ PROG= gdbtui${GDB_SUFFIX} SRCS= tui-main.c MAN= BULIBS= ${OBJ_BU}/libbfd/libbfd.a ${OBJ_BU}/libopcodes/libopcodes.a \ ${OBJ_BU}/libiberty/libiberty.a GDBLIBS= ${OBJ_GDB}/libgdb/libgdb.a # libthread_db.so calls back into gdb for the proc services. Make all the # global symbols visible. LDFLAGS+= -Wl,-E -DPADD= ${GDBLIBS} ${BULIBS} ${LIBM} ${LIBREADLINE} ${LIBTERMCAPW} ${LIBGNUREGEX} -LDADD= ${GDBLIBS} ${BULIBS} -lm ${LDREADLINE} -ltermcapw -lgnuregex +DPADD= ${GDBLIBS} ${BULIBS} +LDADD= ${GDBLIBS} ${BULIBS} +LIBADD+= m readline ncursesw gnuregex .include Index: head/gnu/usr.bin/gdb/kgdb/Makefile =================================================================== --- head/gnu/usr.bin/gdb/kgdb/Makefile (revision 275076) +++ head/gnu/usr.bin/gdb/kgdb/Makefile (revision 275077) @@ -1,20 +1,19 @@ # $FreeBSD$ PROG= kgdb${GDB_SUFFIX} SRCS= main.c kld.c kthr.c trgt.c trgt_${TARGET_CPUARCH}.c WARNS?= 2 BULIBS= ${OBJ_BU}/libbfd/libbfd.a ${OBJ_BU}/libopcodes/libopcodes.a \ ${OBJ_BU}/libiberty/libiberty.a GDBLIBS= ${OBJ_GDB}/libgdb/libgdb.a -DPADD= ${GDBLIBS} ${BULIBS} ${LIBKVM} ${LIBM} ${LIBREADLINE} ${LIBTERMCAPW} \ - ${LIBGNUREGEX} -LDADD= ${GDBLIBS} ${BULIBS} -lkvm${GDB_SUFFIX} -lm ${LDREADLINE} -ltermcapw \ - -lgnuregex +DPADD= ${GDBLIBS} ${BULIBS} ${LIBKVM} +LDADD= ${GDBLIBS} ${BULIBS} -lkvm${GDB_SUFFIX} +LIBADD+= m readline ncursesw gnuregex .if defined(GDB_CROSS_DEBUGGER) CFLAGS+= -Wl,-export-dynamic .endif .include Index: head/gnu/usr.bin/grep/Makefile =================================================================== --- head/gnu/usr.bin/grep/Makefile (revision 275076) +++ head/gnu/usr.bin/grep/Makefile (revision 275077) @@ -1,73 +1,71 @@ # $FreeBSD$ .include GREP_LIBZ=YES .if ${MK_BSD_GREP} != "yes" PROG= grep .else PROG= gnugrep .endif SRCS= closeout.c dfa.c error.c exclude.c grep.c grepmat.c hard-locale.c \ isdir.c kwset.c obstack.c quotearg.c savedir.c search.c xmalloc.c \ xstrtoumax.c CLEANFILES+= gnugrep.1 CFLAGS+=-I${.CURDIR} -I${DESTDIR}/usr/include/gnu -DHAVE_CONFIG_H .if ${MK_BSD_GREP} != "yes" LINKS+= ${BINDIR}/grep ${BINDIR}/egrep \ ${BINDIR}/grep ${BINDIR}/fgrep MLINKS= grep.1 egrep.1 grep.1 fgrep.1 .endif -DPADD= ${LIBGNUREGEX} ${LIBBZ2} -LDADD= -lgnuregex -lbz2 +LIBADD= gnuregex bz2 .if ${MK_BSD_GREP} != "yes" LINKS+= ${BINDIR}/grep ${BINDIR}/bzgrep \ ${BINDIR}/grep ${BINDIR}/bzegrep \ ${BINDIR}/grep ${BINDIR}/bzfgrep MLINKS+=grep.1 bzgrep.1 grep.1 bzegrep.1 grep.1 bzfgrep.1 .endif .if defined(GREP_LIBZ) && !empty(GREP_LIBZ) -LDADD+= -lz -DPADD+= ${LIBZ} +LIBADD+= z CFLAGS+=-DHAVE_LIBZ=1 .if ${MK_BSD_GREP} != "yes" LINKS+= ${BINDIR}/grep ${BINDIR}/zgrep \ ${BINDIR}/grep ${BINDIR}/zegrep \ ${BINDIR}/grep ${BINDIR}/zfgrep MLINKS+=grep.1 zgrep.1 grep.1 zegrep.1 grep.1 zfgrep.1 .endif .endif gnugrep.1: grep.1 cp ${.ALLSRC} ${.TARGET} SUBDIR+=doc check: all @failed=0; total=0; \ for tst in ${TESTS}; do \ total=$$(($$total+1)); \ if GREP=${.OBJDIR}/${PROG} srcdir=${.CURDIR}/tests \ ${.CURDIR}/tests/$$tst; then \ echo "PASS: $$tst"; \ else \ failed=$$(($$failed+1)); \ echo "FAIL: $$tst"; \ fi; \ done; \ if [ "$$failed" -eq 0 ]; then \ echo "All $$total tests passed"; \ else \ echo "$$failed of $$total tests failed"; \ fi TESTS= warning.sh khadafy.sh spencer1.sh bre.sh ere.sh status.sh empty.sh \ options.sh backref.sh file.sh .include Index: head/libexec/atf/atf-check/Makefile =================================================================== --- head/libexec/atf/atf-check/Makefile (revision 275076) +++ head/libexec/atf/atf-check/Makefile (revision 275077) @@ -1,49 +1,47 @@ #- # Copyright (c) 2011 Google, Inc. # All rights reserved. # # 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. # # 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$ .include .include ATF= ${.CURDIR:H:H:H}/contrib/atf .PATH: ${ATF}/atf-sh PROG_CXX= atf-check SRCS= atf-check.cpp MAN= atf-check.1 CFLAGS+= -I${ATF} CFLAGS+= -DATF_SHELL='"/bin/sh"' -DPADD+= ${LIBATF_CXX} ${LIBATF_C} -LDADD+= ${LDATF_CXX} ${LDATF_C} -USEPRIVATELIB= atf-c++ atf-c +LIBADD= atf_cxx .if ${MK_TESTS} != "no" SUBDIR+= tests .endif .include Index: head/libexec/atf/atf-sh/Makefile =================================================================== --- head/libexec/atf/atf-sh/Makefile (revision 275076) +++ head/libexec/atf/atf-sh/Makefile (revision 275077) @@ -1,59 +1,57 @@ #- # Copyright (c) 2011 Google, Inc. # All rights reserved. # # 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. # # 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$ .include .include ATF= ${.CURDIR:H:H:H}/contrib/atf .PATH: ${ATF}/atf-sh PROG_CXX= atf-sh SRCS= atf-sh.cpp MAN= atf-sh.1 atf-sh.3 MLINKS+= atf-sh.3 atf-sh-api.3 # Backwards compatibility. CFLAGS+= -DHAVE_CONFIG_H CFLAGS+= -DATF_LIBEXECDIR='"${LIBEXECDIR}"' CFLAGS+= -DATF_PKGDATADIR='"${SHAREDIR}/atf"' CFLAGS+= -DATF_SHELL='"/bin/sh"' CFLAGS+= -I${ATF} -DPADD+= ${LIBATF_C} ${LIBATF_CXX} -LDADD+= ${LDATF_C} ${LDATF_CXX} -USEPRIVATELIB= atf-c++ atf-c +LIBADD= atf_cxx FILESGROUPS= SUBR SUBRDIR= ${SHAREDIR}/atf SUBR= libatf-sh.subr .if ${MK_TESTS} != "no" SUBDIR+= tests .endif .include "../../../lib/atf/common.mk" .include Index: head/libexec/atrun/Makefile =================================================================== --- head/libexec/atrun/Makefile (revision 275076) +++ head/libexec/atrun/Makefile (revision 275077) @@ -1,32 +1,31 @@ # $FreeBSD$ MAINSRC=${.CURDIR}/../../usr.bin/at .include "${MAINSRC}/Makefile.inc" PROG= atrun SRCS= atrun.c gloadavg.c MAN= atrun.8 BINDIR= ${ATLIB_DIR} CLEANFILES= ${MAN} CFLAGS+=-I${MAINSRC} -I${.CURDIR} CFLAGS+=-DLOGIN_CAP -DPAM WARNS?= 2 WFORMAT=0 -DPADD= ${LIBPAM} ${LIBUTIL} -LDADD= ${MINUSLPAM} -lutil +LIBADD= pam util atrun.8: atrun.man @${ECHO} Making ${.TARGET:T} from ${.ALLSRC:T}; \ sed -e \ "s@_ATSPOOL_DIR@$(ATSPOOL_DIR)@g; \ s@_ATJOB_DIR@$(ATJOB_DIR)@g; \ s@_ATLIB_DIR@$(ATLIB_DIR)@g; \ s@_LOADAVG_MX@$(LOADAVG_MX)@g;" \ < ${.ALLSRC} > ${.TARGET} .include Index: head/libexec/casper/dns/Makefile =================================================================== --- head/libexec/casper/dns/Makefile (revision 275076) +++ head/libexec/casper/dns/Makefile (revision 275077) @@ -1,22 +1,21 @@ # $FreeBSD$ .PATH: ${.CURDIR} ${.CURDIR}/../../../sbin/casper PROG= dns SRCS= dns.c -DPADD= ${LIBCAPSICUM} ${LIBCASPER} ${LIBNV} ${LIBPJDLOG} ${LIBUTIL} -LDADD= -lcapsicum -lcasper -lnv -lpjdlog -lutil +LIBADD= casper nv BINDIR= /libexec/casper CFLAGS+=-I${.CURDIR} CFLAGS+=-I${.CURDIR}/../../../lib/libcapsicum CFLAGS+=-I${.CURDIR}/../../../lib/libcasper CFLAGS+=-I${.CURDIR}/../../../lib/libpjdlog CFLAGS+=-I${.CURDIR}/../../../sbin/casper MAN= .include Index: head/libexec/casper/grp/Makefile =================================================================== --- head/libexec/casper/grp/Makefile (revision 275076) +++ head/libexec/casper/grp/Makefile (revision 275077) @@ -1,22 +1,21 @@ # $FreeBSD$ .PATH: ${.CURDIR} ${.CURDIR}/../../../sbin/casper PROG= grp SRCS= grp.c -DPADD= ${LIBCAPSICUM} ${LIBCASPER} ${LIBNV} ${LIBPJDLOG} ${LIBUTIL} -LDADD= -lcapsicum -lcasper -lnv -lpjdlog -lutil +LIBADD= casper nv pjdlog BINDIR= /libexec/casper CFLAGS+=-I${.CURDIR} CFLAGS+=-I${.CURDIR}/../../../lib/libcapsicum CFLAGS+=-I${.CURDIR}/../../../lib/libcasper CFLAGS+=-I${.CURDIR}/../../../lib/libpjdlog CFLAGS+=-I${.CURDIR}/../../../sbin/casper MAN= .include Index: head/libexec/casper/pwd/Makefile =================================================================== --- head/libexec/casper/pwd/Makefile (revision 275076) +++ head/libexec/casper/pwd/Makefile (revision 275077) @@ -1,22 +1,21 @@ # $FreeBSD$ .PATH: ${.CURDIR} ${.CURDIR}/../../../sbin/casper PROG= pwd SRCS= pwd.c -DPADD= ${LIBCAPSICUM} ${LIBCASPER} ${LIBNV} ${LIBPJDLOG} ${LIBUTIL} -LDADD= -lcapsicum -lcasper -lnv -lpjdlog -lutil +LIBADD= casper nv pjdlog BINDIR= /libexec/casper CFLAGS+=-I${.CURDIR} CFLAGS+=-I${.CURDIR}/../../../lib/libcapsicum CFLAGS+=-I${.CURDIR}/../../../lib/libcasper CFLAGS+=-I${.CURDIR}/../../../lib/libpjdlog CFLAGS+=-I${.CURDIR}/../../../sbin/casper MAN= .include Index: head/libexec/casper/random/Makefile =================================================================== --- head/libexec/casper/random/Makefile (revision 275076) +++ head/libexec/casper/random/Makefile (revision 275077) @@ -1,22 +1,21 @@ # $FreeBSD$ .PATH: ${.CURDIR} ${.CURDIR}/../../../sbin/casper PROG= random SRCS= random.c -DPADD= ${LIBCAPSICUM} ${LIBCASPER} ${LIBNV} ${LIBPJDLOG} ${LIBUTIL} -LDADD= -lcapsicum -lcasper -lnv -lpjdlog -lutil +LIBADD= casper nv BINDIR= /libexec/casper CFLAGS+=-I${.CURDIR} CFLAGS+=-I${.CURDIR}/../../../lib/libcapsicum CFLAGS+=-I${.CURDIR}/../../../lib/libcasper CFLAGS+=-I${.CURDIR}/../../../lib/libpjdlog CFLAGS+=-I${.CURDIR}/../../../sbin/casper MAN= .include Index: head/libexec/casper/sysctl/Makefile =================================================================== --- head/libexec/casper/sysctl/Makefile (revision 275076) +++ head/libexec/casper/sysctl/Makefile (revision 275077) @@ -1,22 +1,21 @@ # $FreeBSD$ .PATH: ${.CURDIR} ${.CURDIR}/../../../sbin/casper PROG= sysctl SRCS= sysctl.c -DPADD= ${LIBCAPSICUM} ${LIBCASPER} ${LIBNV} ${LIBPJDLOG} ${LIBUTIL} -LDADD= -lcapsicum -lcasper -lnv -lpjdlog -lutil +LIBADD= casper nv pjdlog BINDIR= /libexec/casper CFLAGS+=-I${.CURDIR} CFLAGS+=-I${.CURDIR}/../../../lib/libcapsicum CFLAGS+=-I${.CURDIR}/../../../lib/libcasper CFLAGS+=-I${.CURDIR}/../../../lib/libpjdlog CFLAGS+=-I${.CURDIR}/../../../sbin/casper MAN= .include Index: head/libexec/dma/Makefile =================================================================== --- head/libexec/dma/Makefile (revision 275076) +++ head/libexec/dma/Makefile (revision 275077) @@ -1,40 +1,39 @@ # $FreeBSD$ .PATH: ${.CURDIR}/../../contrib/dma CFLAGS= -I${.CURDIR}/../../contrib/dma \ -DHAVE_REALLOCF -DHAVE_STRLCPY -DHAVE_GETPROGNAME \ -DCONF_PATH='"/etc/dma"' \ -DLIBEXEC_PATH='"/usr/libexec"' -DDMA_VERSION='"v0.9+"' \ -DDMA_ROOT_USER='"mailnull"' \ -DDMA_GROUP='"mail"' -DPADD= ${LIBSSL} ${LIBCRYPTO} -LDADD= -lssl -lcrypto +LIBADD= ssl crypto PROG= dma SRCS= aliases_parse.y \ aliases_scan.l \ base64.c \ conf.c \ crypto.c \ dma.c \ dns.c \ local.c \ mail.c \ net.c \ spool.c \ util.c MAN8= dma.8 YFLAGS+= -i CLEANFILES= aliases_parse.i BINGRP= mail BINMODE= 2555 .include .if ${COMPILER_TYPE} == gcc WARNS= 5 .endif .include Index: head/libexec/fingerd/Makefile =================================================================== --- head/libexec/fingerd/Makefile (revision 275076) +++ head/libexec/fingerd/Makefile (revision 275077) @@ -1,12 +1,11 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 # $FreeBSD$ PROG= fingerd -DPADD= ${LIBUTIL} -LDADD= -lutil +LIBADD= util MAN= fingerd.8 WARNS?= 2 WFORMAT=0 .include Index: head/libexec/ftpd/Makefile =================================================================== --- head/libexec/ftpd/Makefile (revision 275076) +++ head/libexec/ftpd/Makefile (revision 275077) @@ -1,40 +1,36 @@ # @(#)Makefile 8.2 (Berkeley) 4/4/94 # $FreeBSD$ .include PROG= ftpd MAN= ftpd.8 ftpchroot.5 SRCS= ftpd.c ftpcmd.y logwtmp.c popen.c CFLAGS+=-DSETPROCTITLE -DLOGIN_CAP -DVIRTUAL_HOSTING CFLAGS+=-I${.CURDIR} YFLAGS= WARNS?= 2 WFORMAT=0 -DPADD= ${LIBUTIL} ${LIBCRYPT} -LDADD= -lutil -lcrypt +LIBADD= util crypt # XXX Kluge! Conversation mechanism needs to be fixed. -DPADD+= ${LIBOPIE} ${LIBMD} -LDADD+= -lopie -lmd +LIBADD+= opie md LSDIR= ../../bin/ls .PATH: ${.CURDIR}/${LSDIR} SRCS+= ls.c cmp.c print.c util.c CFLAGS+=-Dmain=ls_main -I${.CURDIR}/${LSDIR} -DPADD+= ${LIBM} -LDADD+= -lm +LIBADD+= m .if ${MK_INET6_SUPPORT} != "no" CFLAGS+=-DINET6 .endif .if ${MK_PAM_SUPPORT} != "no" CFLAGS+=-DUSE_PAM -DPADD+= ${LIBPAM} -LDADD+= ${MINUSLPAM} +LIBADD+= pam .endif .include Index: head/libexec/getty/Makefile =================================================================== --- head/libexec/getty/Makefile (revision 275076) +++ head/libexec/getty/Makefile (revision 275077) @@ -1,14 +1,13 @@ # from: @(#)Makefile 8.1 (Berkeley) 6/4/93 # $FreeBSD$ PROG= getty SRCS= main.c init.c subr.c chat.c -DPADD= ${LIBUTIL} -LDADD= -lutil +LIBADD= util MAN= gettytab.5 ttys.5 getty.8 WARNS?= 1 WFORMAT=0 .include Index: head/libexec/mail.local/Makefile =================================================================== --- head/libexec/mail.local/Makefile (revision 275076) +++ head/libexec/mail.local/Makefile (revision 275077) @@ -1,33 +1,29 @@ # @(#)Makefile 8.1 (Berkeley) 7/19/93 # $FreeBSD$ SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail .PATH: ${SENDMAIL_DIR}/mail.local PROG= mail.local SRCS= mail.local.c MAN= mail.local.8 CFLAGS+=-I${SENDMAIL_DIR}/include -I. WARNS?= 2 WFORMAT=0 -LIBSMDIR= ${.OBJDIR}/../../lib/libsm -LIBSM= ${LIBSMDIR}/libsm.a - -DPADD= ${LIBSM} -LDADD= ${LIBSM} +LIBADD= sm SRCS+= sm_os.h CLEANFILES+=sm_os.h # User customizations to the sendmail build environment CFLAGS+=${SENDMAIL_CFLAGS} DPADD+=${SENDMAIL_DPADD} LDADD+=${SENDMAIL_LDADD} LDFLAGS+=${SENDMAIL_LDFLAGS} sm_os.h: ln -sf ${SENDMAIL_DIR}/include/sm/os/sm_os_freebsd.h sm_os.h .include Index: head/libexec/pppoed/Makefile =================================================================== --- head/libexec/pppoed/Makefile (revision 275076) +++ head/libexec/pppoed/Makefile (revision 275077) @@ -1,11 +1,10 @@ # $FreeBSD$ PROG= pppoed -DPADD= ${LIBNETGRAPH} -LDADD= -lnetgraph +LIBADD= netgraph MAN= pppoed.8 WARNS?= 1 WFORMAT=0 .include Index: head/libexec/rlogind/Makefile =================================================================== --- head/libexec/rlogind/Makefile (revision 275076) +++ head/libexec/rlogind/Makefile (revision 275077) @@ -1,16 +1,15 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 # $FreeBSD$ .include PROG= rlogind MAN= rlogind.8 -DPADD= ${LIBUTIL} -LDADD= -lutil +LIBADD= util WARNS?= 2 .if ${MK_INET6_SUPPORT} != "no" CFLAGS+= -DINET6 .endif .include Index: head/libexec/rpc.rquotad/Makefile =================================================================== --- head/libexec/rpc.rquotad/Makefile (revision 275076) +++ head/libexec/rpc.rquotad/Makefile (revision 275077) @@ -1,10 +1,9 @@ # $FreeBSD$ PROG = rpc.rquotad SRCS = rquotad.c MAN = rpc.rquotad.8 -DPADD= ${LIBRPCSVC} ${LIBUTIL} -LDADD= -lrpcsvc -lutil +LIBADD= rpcsvc util .include Index: head/libexec/rpc.rstatd/Makefile =================================================================== --- head/libexec/rpc.rstatd/Makefile (revision 275076) +++ head/libexec/rpc.rstatd/Makefile (revision 275077) @@ -1,12 +1,11 @@ # $FreeBSD$ PROG = rpc.rstatd SRCS = rstatd.c rstat_proc.c MAN = rpc.rstatd.8 -DPADD= ${LIBRPCSVC} ${LIBUTIL} ${LIBDEVSTAT} ${LIBKVM} -LDADD= -lrpcsvc -lutil -ldevstat -lkvm +LIBADD= rpcsvc devstat WARNS?= 1 .include Index: head/libexec/rpc.rusersd/Makefile =================================================================== --- head/libexec/rpc.rusersd/Makefile (revision 275076) +++ head/libexec/rpc.rusersd/Makefile (revision 275077) @@ -1,15 +1,14 @@ # $FreeBSD$ PROG = rpc.rusersd SRCS = rusersd.c rusers_proc.c extern.h MAN = rpc.rusersd.8 -DPADD= ${LIBRPCSVC} ${LIBUTIL} -LDADD= -lrpcsvc -lutil +LIBADD= rpcsvc #.if exists(/usr/X11R6/include/X11/extensions/xidle.h) #CFLAGS+= -DXIDLE #LDADD+= -L/usr/X11R6/lib -lXext -lX11 #.endif .include Index: head/libexec/rpc.rwalld/Makefile =================================================================== --- head/libexec/rpc.rwalld/Makefile (revision 275076) +++ head/libexec/rpc.rwalld/Makefile (revision 275077) @@ -1,12 +1,11 @@ # $FreeBSD$ PROG = rpc.rwalld SRCS = rwalld.c MAN = rpc.rwalld.8 -DPADD= ${LIBUTIL} -LDADD= -lutil +LIBADD= util WARNS?= 2 .include Index: head/libexec/rpc.sprayd/Makefile =================================================================== --- head/libexec/rpc.sprayd/Makefile (revision 275076) +++ head/libexec/rpc.sprayd/Makefile (revision 275077) @@ -1,12 +1,11 @@ # $FreeBSD$ PROG = rpc.sprayd SRCS = sprayd.c MAN = rpc.sprayd.8 -DPADD= ${LIBRPCSVC} -LDADD= -lrpcsvc +LIBADD= rpcsvc WARNS?= 2 .include Index: head/libexec/rshd/Makefile =================================================================== --- head/libexec/rshd/Makefile (revision 275076) +++ head/libexec/rshd/Makefile (revision 275077) @@ -1,13 +1,12 @@ # From: @(#)Makefile 8.1 (Berkeley) 6/4/93 # $FreeBSD$ PROG= rshd MAN= rshd.8 WARNS?= 3 WFORMAT=0 -DPADD= ${LIBUTIL} ${LIBPAM} -LDADD= -lutil ${MINUSLPAM} +LIBADD= util pam .include Index: head/libexec/rtld-elf/Makefile =================================================================== --- head/libexec/rtld-elf/Makefile (revision 275076) +++ head/libexec/rtld-elf/Makefile (revision 275077) @@ -1,90 +1,88 @@ # $FreeBSD$ # Use the following command to build local debug version of dynamic # linker: # make DEBUG_FLAGS=-g DEBUG=-DDEBUG MK_TESTS=no all .include MK_SSP= no PROG?= ld-elf.so.1 SRCS= rtld_start.S \ reloc.c rtld.c rtld_lock.c rtld_printf.c map_object.c \ malloc.c xmalloc.c debug.c libmap.c MAN= rtld.1 CSTD?= gnu99 TOPSRCDIR= ${.CURDIR}/../.. CFLAGS+= -Wall -DFREEBSD_ELF -DIN_RTLD CFLAGS+= -I${TOPSRCDIR}/lib/csu/common .if exists(${.CURDIR}/${MACHINE_ARCH}) RTLD_ARCH= ${MACHINE_ARCH} .else RTLD_ARCH= ${MACHINE_CPUARCH} .endif CFLAGS+= -I${.CURDIR}/${RTLD_ARCH} -I${.CURDIR} .if ${MACHINE_ARCH} == "powerpc64" CFLAGS+= -mcall-aixdesc LDFLAGS+= -nostdlib -e _rtld_start .else LDFLAGS+= -nostdlib -e .rtld_start .endif WARNS?= 2 INSTALLFLAGS= -C -b PRECIOUSPROG= BINDIR= /libexec SYMLINKS= ${BINDIR}/${PROG} /usr/libexec/${PROG} MLINKS= rtld.1 ld-elf.so.1.1 \ rtld.1 ld.so.1 .if ${MACHINE_CPUARCH} == "sparc64" CFLAGS+= -fPIC .else CFLAGS+= -fpic .endif CFLAGS+= -DPIC $(DEBUG) LDFLAGS+= -shared -Wl,-Bsymbolic -DPADD= ${LIBC_PIC} -LDADD= -lc_pic +LIBADD= c_pic .if ${MACHINE_CPUARCH} == "arm" # Some of the required math functions (div & mod) are implemented in # libcompiler_rt on ARM. The library also needs to be placed first to be # correctly linked. As some of the functions are used before we have # shared libraries. -DPADD+= ${LIBCOMPILER_RT} -LDADD+= -lcompiler_rt +LIBADD+= compiler_rt .endif .if ${MK_SYMVER} == "yes" LIBCDIR= ${TOPSRCDIR}/lib/libc VERSION_DEF= ${LIBCDIR}/Versions.def SYMBOL_MAPS= ${.CURDIR}/Symbol.map VERSION_MAP= Version.map LDFLAGS+= -Wl,--version-script=${VERSION_MAP} ${PROG}: ${VERSION_MAP} .if exists(${.CURDIR}/${RTLD_ARCH}/Symbol.map) SYMBOL_MAPS+= ${.CURDIR}/${RTLD_ARCH}/Symbol.map .endif .endif .sinclude "${.CURDIR}/${RTLD_ARCH}/Makefile.inc" # Since moving rtld-elf to /libexec, we need to create a symlink. # Fixup the existing binary that's there so we can symlink over it. beforeinstall: .if exists(${DESTDIR}/usr/libexec/${PROG}) -chflags -h noschg ${DESTDIR}/usr/libexec/${PROG} .endif .PATH: ${.CURDIR}/${RTLD_ARCH} .if ${MK_TESTS} != "no" SUBDIR+= tests .endif .include .include Index: head/libexec/smrsh/Makefile =================================================================== --- head/libexec/smrsh/Makefile (revision 275076) +++ head/libexec/smrsh/Makefile (revision 275077) @@ -1,32 +1,28 @@ # @(#)Makefile 8.1 (Berkeley) 7/2/95 # $FreeBSD$ SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail .PATH: ${SENDMAIL_DIR}/smrsh PROG= smrsh SRCS= smrsh.c MAN= smrsh.8 CFLAGS+=-I${SENDMAIL_DIR}/src -I${SENDMAIL_DIR}/include -I. -LIBSMDIR= ${.OBJDIR}/../../lib/libsm -LIBSM= ${LIBSMDIR}/libsm.a - -DPADD= ${LIBSM} -LDADD= ${LIBSM} +LIBADD= sm WARNS?= 2 SRCS+= sm_os.h CLEANFILES+=sm_os.h # User customizations to the sendmail build environment CFLAGS+=${SENDMAIL_CFLAGS} DPADD+=${SENDMAIL_DPADD} LDADD+=${SENDMAIL_LDADD} LDFLAGS+=${SENDMAIL_LDFLAGS} sm_os.h: ln -sf ${SENDMAIL_DIR}/include/sm/os/sm_os_freebsd.h sm_os.h .include Index: head/libexec/tcpd/Makefile =================================================================== --- head/libexec/tcpd/Makefile (revision 275076) +++ head/libexec/tcpd/Makefile (revision 275077) @@ -1,23 +1,22 @@ # $FreeBSD$ .include .PATH: ${.CURDIR}/../../contrib/tcp_wrappers PROG= tcpd MAN= tcpd.8 CSTD?= c89 CFLAGS+=-DREAL_DAEMON_DIR=\"/usr/libexec\" \ -DSEVERITY=LOG_INFO -DRFC931_TIMEOUT=10 \ -DHOSTS_DENY=\"/etc/hosts.deny\" -DHOSTS_ALLOW=\"/etc/hosts.allow\" \ -DFACILITY=LOG_DAEMON .if ${MK_INET6_SUPPORT} != "no" CFLAGS+=-DINET6 .endif -DPADD= ${LIBWRAP} -LDADD= -lwrap +LIBADD= wrap WARNS?= 1 .include Index: head/libexec/telnetd/Makefile =================================================================== --- head/libexec/telnetd/Makefile (revision 275076) +++ head/libexec/telnetd/Makefile (revision 275077) @@ -1,48 +1,45 @@ # $FreeBSD$ # Do not define -DKLUDGELINEMODE, as it does not interact well with many # telnet implementations. .include TELNETDIR= ${.CURDIR}/../../contrib/telnet .PATH: ${TELNETDIR}/telnetd PROG= telnetd MAN= telnetd.8 SRCS= global.c slc.c state.c sys_term.c telnetd.c \ termstat.c utility.c WARNS?= 2 WFORMAT?= 0 CFLAGS+= -DLINEMODE -DUSE_TERMIO -DDIAGNOSTICS -DOLD_ENVIRON \ -DENV_HACK -DSTREAMSPTY .if ${MK_INET6_SUPPORT} != "no" CFLAGS+= -DINET6 .endif CFLAGS+= -I${TELNETDIR} CFLAGS+= -I${TELNETDIR}/telnet LIBTELNET= ${.OBJDIR}/../../lib/libtelnet/libtelnet.a -DPADD= ${LIBUTIL} ${LIBTERMCAPW} ${LIBTELNET} -LDADD= -lutil -ltermcapw ${LIBTELNET} +LIBADD= telnet util ncursesw .if ${MK_OPENSSL} != "no" SRCS+= authenc.c CFLAGS+= -DAUTHENTICATION -DENCRYPTION -DPADD+= ${LIBMP} ${LIBCRYPTO} ${LIBCRYPT} ${LIBPAM} -LDADD+= -lmp -lcrypto -lcrypt ${MINUSLPAM} +LIBADD+= mp crypto pam .endif .if ${MK_KERBEROS_SUPPORT} != "no" CFLAGS+= -DKRB5 -DFORWARD -Dnet_write=telnet_net_write -DPADD+= ${LIBKRB5} ${LIBHX509} ${LIBASN1} ${LIBROKEN} ${LIBCOM_ERR} -LDADD+= -lkrb5 -lhx509 -lasn1 -lroken -lcom_err +LIBADD+= krb5 roken .endif .include Index: head/libexec/tftpd/Makefile =================================================================== --- head/libexec/tftpd/Makefile (revision 275076) +++ head/libexec/tftpd/Makefile (revision 275077) @@ -1,13 +1,12 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 # $FreeBSD$ PROG= tftpd MAN= tftpd.8 SRCS= tftp-file.c tftp-io.c tftp-options.c tftp-transfer.c tftp-utils.c SRCS+= tftpd.c WFORMAT=0 -DPADD= ${LIBWRAP} -LDADD= -lwrap +LIBADD= wrap .include Index: head/libexec/ulog-helper/Makefile =================================================================== --- head/libexec/ulog-helper/Makefile (revision 275076) +++ head/libexec/ulog-helper/Makefile (revision 275077) @@ -1,11 +1,10 @@ # $FreeBSD$ PROG= ulog-helper BINOWN= root BINMODE=4555 MAN= -DPADD= ${LIBULOG} -LDADD= -lulog +LIBADD= ulog .include Index: head/libexec/ypxfr/Makefile =================================================================== --- head/libexec/ypxfr/Makefile (revision 275076) +++ head/libexec/ypxfr/Makefile (revision 275077) @@ -1,47 +1,46 @@ # $FreeBSD$ PROG= ypxfr SRCS= yp_dblookup.c yp_dbwrite.c yp_error.c \ ypxfr_getmap.c ypxfr_main.c ypxfr_misc.c \ ypxfrd_getmap.c \ ${GENSRCS} GENSRCS=yp.h yp_clnt.c ypxfr_clnt.c .PATH: ${.CURDIR}/../../usr.sbin/ypserv MAN= ypxfr.8 CFLAGS+= -I. WARNS?= 2 WFORMAT=0 -DPADD= ${LIBRPCSVC} -LDADD= -lrpcsvc +LIBADD= rpcsvc CLEANFILES= ${GENSRCS} RPCDIR= ${.CURDIR}/../../include/rpcsvc RPCGEN= RPCGEN_CPP=${CPP:Q} rpcgen -I -C ypxfr_clnt.c: ${RPCDIR}/yp.x rm -f ${.TARGET} ${RPCGEN} -DYPPUSH_ONLY -l -o ${.TARGET} ${RPCDIR}/yp.x yp_clnt.c: ${RPCDIR}/yp.x rm -f ${.TARGET} ${RPCGEN} -DYPSERV_ONLY -l -o ${.TARGET} ${RPCDIR}/yp.x yp.h: ${RPCDIR}/yp.x rm -f ${.TARGET} ${RPCGEN} -h -o ${.TARGET} ${RPCDIR}/yp.x # ypxfrd_xdr.c: ${RPCDIR}/ypxfrd.x # rm -f ${.TARGET} # ${RPCGEN} -c -o ${.TARGET} ${RPCDIR}/ypxfrd.x ypxfrd.h: ${RPCDIR}/ypxfrd.x rm -f ${.TARGET} ${RPCGEN} -h -o ${.TARGET} ${RPCDIR}/ypxfrd.x .include Index: head/secure/lib/libssh/Makefile =================================================================== --- head/secure/lib/libssh/Makefile (revision 275076) +++ head/secure/lib/libssh/Makefile (revision 275077) @@ -1,66 +1,62 @@ # $FreeBSD$ .include LIB= ssh PRIVATELIB= true SHLIB_MAJOR= 5 SRCS= authfd.c authfile.c bufaux.c bufbn.c buffer.c \ canohost.c channels.c cipher.c cipher-aes.c \ cipher-bf1.c cipher-ctr.c cipher-3des1.c cleanup.c \ compat.c compress.c crc32.c deattack.c fatal.c hostfile.c \ log.c match.c md-sha256.c moduli.c nchan.c packet.c \ readpass.c rsa.c ttymodes.c xmalloc.c addrmatch.c \ atomicio.c key.c dispatch.c kex.c mac.c uidswap.c uuencode.c misc.c \ monitor_fdpass.c rijndael.c ssh-dss.c ssh-ecdsa.c ssh-rsa.c dh.c \ kexdh.c kexgex.c kexdhc.c kexgexc.c bufec.c kexecdh.c kexecdhc.c \ msg.c progressmeter.c dns.c entropy.c umac.c umac128.c \ ssh-pkcs11.c krl.c smult_curve25519_ref.c \ kexc25519.c kexc25519c.c poly1305.c chacha.c cipher-chachapoly.c \ ssh-ed25519.c digest-openssl.c hmac.c \ sc25519.c ge25519.c fe25519.c ed25519.c verify.c hash.c blocks.c # gss-genr.c should be in $SRCS but causes linking problems, so it is # compiled directly into sshd instead. # Portability layer SRCS+= bcrypt_pbkdf.c blowfish.c bsd-misc.c explicit_bzero.c fmt_scaled.c \ glob.c openssl-compat.c port-tun.c strtonum.c timingsafe_bcmp.c \ vis.c xcrypt.c xmmap.c .if ${MK_LDNS} == "no" SRCS+= getrrsetbyname.c .else LDNSDIR= ${.CURDIR}/../../../contrib/ldns CFLAGS+= -DHAVE_LDNS=1 -I${LDNSDIR} SRCS+= getrrsetbyname-ldns.c -DPADD+= ${LIBLDNS} -LDADD+= ${LDLDNS} -USEPRIVATELIB+= ldns +LIBADD+= ldns .endif CFLAGS+= -I${SSHDIR} -include ssh_namespace.h .if ${MK_KERBEROS_SUPPORT} != "no" CFLAGS+= -include krb5_config.h -DPADD+= ${LIBGSSAPI} ${LIBKRB5} ${LIBHX509} ${LIBASN1} ${LIBCOM_ERR} ${LIBMD} ${LIBROKEN} -LDADD+= -lgssapi -lkrb5 -lhx509 -lasn1 -lcom_err -lmd -lroken +LIBADD+= gssapi krb5 hx509 asn1 com_err md roken .endif .if ${MK_OPENSSH_NONE_CIPHER} != "no" CFLAGS+= -DNONE_CIPHER_ENABLED .endif NO_LINT= -DPADD+= ${LIBCRYPTO} ${LIBCRYPT} ${LIBZ} -LDADD+= -lcrypto -lcrypt -lz +LIBADD+= crypto crypt z .include .PATH: ${SSHDIR} ${SSHDIR}/openbsd-compat ${OBJS} ${POBJS} ${SOBJS}: ssh_namespace.h .if ${MK_KERBEROS_SUPPORT} != "no" ${OBJS} ${POBJS} ${SOBJS}: krb5_config.h .endif Index: head/secure/lib/libssl/Makefile =================================================================== --- head/secure/lib/libssl/Makefile (revision 275076) +++ head/secure/lib/libssl/Makefile (revision 275077) @@ -1,30 +1,29 @@ # $FreeBSD$ LIB= ssl SHLIB_MAJOR= 7 NO_LINT= .if exists(Makefile.man) .include "Makefile.man" .endif .include "../libcrypto/Makefile.inc" SRCS= bio_ssl.c d1_both.c d1_clnt.c d1_enc.c d1_lib.c d1_meth.c d1_pkt.c \ d1_srtp.c d1_srvr.c s23_clnt.c s23_lib.c s23_meth.c s23_pkt.c \ s23_srvr.c s2_clnt.c s2_enc.c s2_lib.c s2_meth.c s2_pkt.c s2_srvr.c \ s3_both.c s3_cbc.c s3_clnt.c s3_enc.c s3_lib.c s3_meth.c s3_pkt.c \ s3_srvr.c ssl_algs.c ssl_asn1.c ssl_cert.c ssl_ciph.c ssl_err.c \ ssl_err2.c ssl_lib.c ssl_rsa.c ssl_sess.c ssl_stat.c ssl_txt.c \ t1_clnt.c t1_enc.c t1_lib.c t1_meth.c t1_reneg.c t1_srvr.c tls_srp.c INCS= dtls1.h kssl.h srtp.h ssl.h ssl2.h ssl23.h ssl3.h tls1.h INCSDIR=${INCLUDEDIR}/openssl -DPADD= ${LIBCRYPTO} -LDADD= -lcrypto +LIBADD= crypto .include .PATH: ${LCRYPTO_SRC}/ssl \ ${.CURDIR}/man Index: head/secure/libexec/sftp-server/Makefile =================================================================== --- head/secure/libexec/sftp-server/Makefile (revision 275076) +++ head/secure/libexec/sftp-server/Makefile (revision 275077) @@ -1,33 +1,30 @@ # $FreeBSD$ .include PROG= sftp-server SRCS= sftp-server.c sftp-common.c sftp-server-main.c MAN= sftp-server.8 CFLAGS+=-I${SSHDIR} -include ssh_namespace.h .if !defined(NO_SHARED) # required when linking with a dynamic libssh SRCS+= roaming_dummy.c .endif -DPADD= ${LIBSSH} -LDADD= ${LDSSH} -USEPRIVATELIB= ssh +LIBADD= ssh .if ${MK_LDNS} != "no" CFLAGS+= -DHAVE_LDNS=1 #DPADD+= ${LIBLDNS} #LDADD+= -lldns #USEPRIVATELIB+= ldns .endif -DPADD+= ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ} -LDADD+= -lcrypt -lcrypto -lz +LIBADD+= crypto crypto z .include .PATH: ${SSHDIR} ${OBJS} ${POBJS} ${SOBJS}: ssh_namespace.h Index: head/secure/libexec/ssh-keysign/Makefile =================================================================== --- head/secure/libexec/ssh-keysign/Makefile (revision 275076) +++ head/secure/libexec/ssh-keysign/Makefile (revision 275077) @@ -1,29 +1,26 @@ # $FreeBSD$ .include PROG= ssh-keysign SRCS= ssh-keysign.c roaming_dummy.c readconf.c MAN= ssh-keysign.8 CFLAGS+=-I${SSHDIR} -include ssh_namespace.h BINMODE=4555 -DPADD= ${LIBSSH} -LDADD= ${LDSSH} -USEPRIVATELIB= ssh +LIBADD= ssh .if ${MK_LDNS} != "no" CFLAGS+= -DHAVE_LDNS=1 #DPADD+= ${LIBLDNS} #LDADD+= -lldns #USEPRIVATELIB+= ldns .endif -DPADD+= ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ} -LDADD+= -lcrypt -lcrypto -lz +LIBADD+= crypt crypto z .include .PATH: ${SSHDIR} ${OBJS} ${POBJS} ${SOBJS}: ssh_namespace.h Index: head/secure/libexec/ssh-pkcs11-helper/Makefile =================================================================== --- head/secure/libexec/ssh-pkcs11-helper/Makefile (revision 275076) +++ head/secure/libexec/ssh-pkcs11-helper/Makefile (revision 275077) @@ -1,33 +1,30 @@ # $FreeBSD$ .include PROG= ssh-pkcs11-helper SRCS= ssh-pkcs11.c ssh-pkcs11-helper.c MAN= ssh-pkcs11-helper.8 CFLAGS+=-I${SSHDIR} -include ssh_namespace.h .if !defined(NO_SHARED) # required when linking with a dynamic libssh SRCS+= roaming_dummy.c .endif -DPADD= ${LIBSSH} -LDADD= ${LDSSH} -USEPRIVATELIB= ssh +LIBADD= ssh .if ${MK_LDNS} != "no" CFLAGS+= -DHAVE_LDNS=1 #DPADD+= ${LIBLDNS} #LDADD+= -lldns #USEPRIVATELIB+= ldns .endif -DPADD+= ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ} -LDADD+= -lcrypt -lcrypto -lz +LIBADD+= crypt crypto z .include .PATH: ${SSHDIR} ${OBJS} ${POBJS} ${SOBJS}: ssh_namespace.h Index: head/secure/usr.bin/bdes/Makefile =================================================================== --- head/secure/usr.bin/bdes/Makefile (revision 275076) +++ head/secure/usr.bin/bdes/Makefile (revision 275077) @@ -1,11 +1,10 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ PROG= bdes WARNS?= 2 -DPADD= ${LIBCRYPTO} -LDADD= -lcrypto +LIBADD= crypto .include Index: head/secure/usr.bin/openssl/Makefile =================================================================== --- head/secure/usr.bin/openssl/Makefile (revision 275076) +++ head/secure/usr.bin/openssl/Makefile (revision 275077) @@ -1,26 +1,25 @@ # $FreeBSD$ PROG= openssl -DPADD= ${LIBSSL} ${LIBCRYPTO} -LDADD= -lssl -lcrypto +LIBADD= ssl crypto .if exists(Makefile.man) .include "Makefile.man" .endif .include "../../lib/libcrypto/Makefile.inc" CFLAGS+=-DMONOLITH -I${.CURDIR} SRCS+= app_rand.c apps.c asn1pars.c ca.c ciphers.c cms.c crl.c crl2p7.c \ dgst.c dh.c dhparam.c dsa.c dsaparam.c ec.c ecparam.c enc.c engine.c \ errstr.c gendh.c gendsa.c genpkey.c genrsa.c nseq.c ocsp.c openssl.c \ passwd.c pkcs12.c pkcs7.c pkcs8.c pkey.c pkeyparam.c pkeyutl.c \ prime.c rand.c req.c rsa.c rsautl.c s_cb.c s_client.c s_server.c \ s_socket.c s_time.c sess_id.c smime.c speed.c spkac.c srp.c ts.c \ verify.c version.c x509.c .include .PATH: ${LCRYPTO_SRC}/apps \ ${.CURDIR}/man Index: head/secure/usr.bin/scp/Makefile =================================================================== --- head/secure/usr.bin/scp/Makefile (revision 275076) +++ head/secure/usr.bin/scp/Makefile (revision 275077) @@ -1,32 +1,29 @@ # $FreeBSD$ .include PROG= scp SRCS= scp.c CFLAGS+=-I${SSHDIR} -include ssh_namespace.h .if !defined(NO_SHARED) # required when linking with a dynamic libssh SRCS+= roaming_dummy.c .endif -DPADD= ${LIBSSH} -LDADD= ${LDSSH} -USEPRIVATELIB= ssh +LIBADD= ssh .if ${MK_LDNS} != "no" CFLAGS+= -DHAVE_LDNS=1 #DPADD+= ${LIBLDNS} #LDADD+= -lldns #USEPRIVATELIB+= ldns .endif -DPADD+= ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ} -LDADD+= -lcrypt -lcrypto -lz +LIBADD+= crypt crypto z .include .PATH: ${SSHDIR} ${OBJS} ${POBJS} ${SOBJS}: ssh_namespace.h Index: head/secure/usr.bin/sftp/Makefile =================================================================== --- head/secure/usr.bin/sftp/Makefile (revision 275076) +++ head/secure/usr.bin/sftp/Makefile (revision 275077) @@ -1,32 +1,29 @@ # $FreeBSD$ .include PROG= sftp SRCS= sftp.c sftp-client.c sftp-common.c sftp-glob.c progressmeter.c CFLAGS+=-I${SSHDIR} -include ssh_namespace.h .if !defined(NO_SHARED) # required when linking with a dynamic libssh SRCS+= roaming_dummy.c .endif -DPADD= ${LIBSSH} ${LIBEDIT} ${LIBNCURSESW} -LDADD= ${LDSSH} -ledit -lncursesw -USEPRIVATELIB= ssh +LIBADD= ssh edit .if ${MK_LDNS} != "no" CFLAGS+= -DHAVE_LDNS=1 #DPADD+= ${LIBLDNS} #LDADD+= -lldns #USEPRIVATELIB+= ldns .endif -DPADD+= ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ} -LDADD+= -lcrypt -lcrypto -lz +LIABDD+= crypt crypto z .include .PATH: ${SSHDIR} ${OBJS} ${POBJS} ${SOBJS}: ssh_namespace.h Index: head/secure/usr.bin/ssh/Makefile =================================================================== --- head/secure/usr.bin/ssh/Makefile (revision 275076) +++ head/secure/usr.bin/ssh/Makefile (revision 275077) @@ -1,53 +1,47 @@ # $FreeBSD$ .include PROG= ssh CFLAGS+=-I${SSHDIR} -include ssh_namespace.h LINKS= ${BINDIR}/ssh ${BINDIR}/slogin MAN= ssh.1 ssh_config.5 MLINKS= ssh.1 slogin.1 SRCS= ssh.c readconf.c clientloop.c sshtty.c \ sshconnect.c sshconnect1.c sshconnect2.c mux.c \ roaming_common.c roaming_client.c # gss-genr.c really belongs in libssh; see src/secure/lib/libssh/Makefile SRCS+= gss-genr.c -DPADD= ${LIBSSH} ${LIBUTIL} -LDADD= ${LDSSH} -lutil -USEPRIVATELIB= ssh +LIBADD= ssh util .if ${MK_LDNS} != "no" CFLAGS+= -DHAVE_LDNS=1 -DPADD+= ${LIBLDNS} -LDADD+= ${LDLDNS} -USEPRIVATELIB+= ldns +LIBADD+= ldns .endif .if ${MK_KERBEROS_SUPPORT} != "no" CFLAGS+= -include krb5_config.h -DPADD+= ${LIBGSSAPI} -LDADD+= -lgssapi +LIBADD+= gssapi .endif .if ${MK_OPENSSH_NONE_CIPHER} != "no" CFLAGS+= -DNONE_CIPHER_ENABLED .endif -DPADD+= ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ} -LDADD+= -lcrypt -lcrypto -lz +LIBADD+= crypt crypto z .if defined(LOCALBASE) CFLAGS+= -DXAUTH_PATH=\"${LOCALBASE}/bin/xauth\" .endif .include .PATH: ${SSHDIR} ${OBJS} ${POBJS} ${SOBJS}: ssh_namespace.h .if ${MK_KERBEROS_SUPPORT} != "no" ${OBJS} ${POBJS} ${SOBJS}: krb5_config.h .endif Index: head/secure/usr.bin/ssh-add/Makefile =================================================================== --- head/secure/usr.bin/ssh-add/Makefile (revision 275076) +++ head/secure/usr.bin/ssh-add/Makefile (revision 275077) @@ -1,32 +1,29 @@ # $FreeBSD$ .include PROG= ssh-add SRCS+= ssh-add.c CFLAGS+=-I${SSHDIR} -include ssh_namespace.h .if !defined(NO_SHARED) # required when linking with a dynamic libssh SRCS+= roaming_dummy.c .endif -DPADD= ${LIBSSH} -LDADD= ${LDSSH} -USEPRIVATELIB= ssh +LIBADD= ssh .if ${MK_LDNS} != "no" CFLAGS+= -DHAVE_LDNS=1 #DPADD+= ${LIBLDNS} #LDADD+= -lldns #USEPRIVATELIB+= ldns .endif -DPADD+= ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ} -LDADD+= -lcrypt -lcrypto -lz +LIBADD+= crypt crypto z .include .PATH: ${SSHDIR} ${OBJS} ${POBJS} ${SOBJS}: ssh_namespace.h Index: head/secure/usr.bin/ssh-agent/Makefile =================================================================== --- head/secure/usr.bin/ssh-agent/Makefile (revision 275076) +++ head/secure/usr.bin/ssh-agent/Makefile (revision 275077) @@ -1,32 +1,29 @@ # $FreeBSD$ .include PROG= ssh-agent SRCS= ssh-agent.c CFLAGS+=-I${SSHDIR} -include ssh_namespace.h .if !defined(NO_SHARED) # required when linking with a dynamic libssh SRCS+= roaming_dummy.c .endif -DPADD= ${LIBSSH} -LDADD= ${LDSSH} -USEPRIVATELIB= ssh +LIBADD= ssh .if ${MK_LDNS} != "no" CFLAGS+= -DHAVE_LDNS=1 #DPADD+= ${LIBLDNS} #LDADD+= -lldns #USEPRIVATELIB+= ldns .endif -DPADD+= ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ} -LDADD+= -lcrypt -lcrypto -lz +LIBADD+= crypt crypto z .include .PATH: ${SSHDIR} ${OBJS} ${POBJS} ${SOBJS}: ssh_namespace.h Index: head/secure/usr.bin/ssh-keygen/Makefile =================================================================== --- head/secure/usr.bin/ssh-keygen/Makefile (revision 275076) +++ head/secure/usr.bin/ssh-keygen/Makefile (revision 275077) @@ -1,32 +1,27 @@ # $FreeBSD$ .include PROG= ssh-keygen SRCS= ssh-keygen.c CFLAGS+=-I${SSHDIR} -include ssh_namespace.h .if !defined(NO_SHARED) # required when linking with a dynamic libssh SRCS+= roaming_dummy.c .endif -DPADD= ${LIBSSH} -LDADD= ${LDSSH} -USEPRIVATELIB= ssh +LIBADD= ssh .if ${MK_LDNS} != "no" CFLAGS+= -DHAVE_LDNS=1 -DPADD+= ${LIBLDNS} -LDADD+= ${LDLDNS} -USEPRIVATELIB+= ldns +LIBADD+= ldns .endif -DPADD+= ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ} -LDADD+= -lcrypt -lcrypto -lz +LIBADD+= crypt crypto z .include .PATH: ${SSHDIR} ${OBJS} ${POBJS} ${SOBJS}: ssh_namespace.h Index: head/secure/usr.bin/ssh-keyscan/Makefile =================================================================== --- head/secure/usr.bin/ssh-keyscan/Makefile (revision 275076) +++ head/secure/usr.bin/ssh-keyscan/Makefile (revision 275077) @@ -1,27 +1,24 @@ # $FreeBSD$ .include PROG= ssh-keyscan SRCS= ssh-keyscan.c roaming_dummy.c CFLAGS+=-I${SSHDIR} -include ssh_namespace.h -DPADD= ${LIBSSH} -LDADD= ${LDSSH} -USEPRIVATELIB= ssh +LIBADD= ssh .if ${MK_LDNS} != "no" CFLAGS+= -DHAVE_LDNS=1 #DPADD+= ${LIBLDNS} #LDADD+= -lldns #USEPRIVATELIB+= ldns .endif -DPADD+= ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ} -LDADD+= -lcrypt -lcrypto -lz +LIBADD+= crypt crypto z .include .PATH: ${SSHDIR} ${OBJS} ${POBJS} ${SOBJS}: ssh_namespace.h Index: head/secure/usr.sbin/sshd/Makefile =================================================================== --- head/secure/usr.sbin/sshd/Makefile (revision 275076) +++ head/secure/usr.sbin/sshd/Makefile (revision 275077) @@ -1,81 +1,75 @@ # $FreeBSD$ .include PROG= sshd SRCS= sshd.c auth-rhosts.c auth-passwd.c auth-rsa.c auth-rh-rsa.c \ audit.c audit-bsm.c audit-linux.c platform.c \ sshpty.c sshlogin.c servconf.c serverloop.c \ auth.c auth1.c auth2.c auth-options.c session.c \ auth-chall.c auth2-chall.c groupaccess.c \ auth-skey.c auth-bsdauth.c auth2-hostbased.c auth2-kbdint.c \ auth2-none.c auth2-passwd.c auth2-pubkey.c \ monitor_mm.c monitor.c monitor_wrap.c kexdhs.c kexgexs.c kexecdhs.c \ kexc25519s.c auth-krb5.c \ auth2-gss.c gss-serv.c gss-serv-krb5.c \ loginrec.c auth-pam.c auth-shadow.c auth-sia.c md5crypt.c \ sftp-server.c sftp-common.c \ roaming_common.c roaming_serv.c \ sandbox-null.c sandbox-rlimit.c sandbox-systrace.c sandbox-darwin.c \ sandbox-seccomp-filter.c sandbox-capsicum.c # gss-genr.c really belongs in libssh; see src/secure/lib/libssh/Makefile SRCS+= gss-genr.c MAN= sshd.8 sshd_config.5 CFLAGS+=-I${SSHDIR} -include ssh_namespace.h -DPADD= ${LIBSSH} ${LIBUTIL} ${LIBWRAP} ${LIBPAM} -LDADD= ${LDSSH} -lutil -lwrap ${MINUSLPAM} -USEPRIVATELIB= ssh +LIBADD= ssh util wrap pam .if ${MK_LDNS} != "no" CFLAGS+= -DHAVE_LDNS=1 #DPADD+= ${LIBLDNS} #LDADD+= -lldns #USEPRIVATELIB+= ldns .endif .if ${MK_AUDIT} != "no" CFLAGS+= -DUSE_BSM_AUDIT -DHAVE_GETAUDIT_ADDR -DPADD+= ${LIBBSM} -LDADD+= -lbsm +LIBADD+= bsm .endif .if ${MK_KERBEROS_SUPPORT} != "no" CFLAGS+= -include krb5_config.h -DPADD+= ${LIBGSSAPI_KRB5} ${LIBGSSAPI} ${LIBKRB5} ${LIBHX509} ${LIBASN1} \ - ${LIBCOM_ERR} ${LIBROKEN} ${LIBWIND} ${LIBHEIMBASE} ${LIBHEIMIPCC} -LDADD+= -lgssapi_krb5 -lgssapi -lkrb5 -lhx509 -lasn1 \ - -lcom_err -lroken -lwind -lheimbase ${LDHEIMIPCC} +LIBADD+= gssapi_krb5 gssapi krb5 hx509 asn1 com_err roken wind heimbase \ + heimipcc .endif .if ${MK_OPENSSH_NONE_CIPHER} != "no" CFLAGS+= -DNONE_CIPHER_ENABLED .endif -DPADD+= ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ} -LDADD+= -lcrypt -lcrypto -lz +LIBADD+= crypt crypto z # Fix the order of NEEDED entries for libthr and libc. The libthr # needs to interpose libc symbols, leaving the libthr loading as # dependency of krb causes reversed order and broken interposing. Put # the threading library last on the linker command line, just before # the -lc added by a compiler driver. +# XXX In theory the framework now takes care of that, it needs to be checked .if ${MK_KERBEROS_SUPPORT} != "no" -DPADD+= ${LIBPTHREAD} -LDADD+= -lpthread +LIBADD+= pthread .endif .if defined(LOCALBASE) CFLAGS+= -DXAUTH_PATH=\"${LOCALBASE}/bin/xauth\" .endif .include .PATH: ${SSHDIR} ${OBJS} ${POBJS} ${SOBJS}: ssh_namespace.h .if ${MK_KERBEROS_SUPPORT} != "no" ${OBJS} ${POBJS} ${SOBJS}: krb5_config.h .endif