Index: head/bin/ps/Makefile =================================================================== --- head/bin/ps/Makefile (revision 289489) +++ head/bin/ps/Makefile (revision 289490) @@ -1,16 +1,16 @@ # $FreeBSD$ # @(#)Makefile 8.1 (Berkeley) 6/2/93 PROG= ps SRCS= fmt.c keyword.c nlist.c print.c ps.c # # To support "lazy" ps for non root/wheel users # add -DLAZY_PS to the cflags. This helps # keep ps from being an unnecessary load # on large systems. # CFLAGS+=-DLAZY_PS -LIBADD= m kvm jail xo util +LIBADD= m kvm jail xo .include Index: head/lib/libxo/Makefile =================================================================== --- head/lib/libxo/Makefile (revision 289489) +++ head/lib/libxo/Makefile (revision 289490) @@ -1,111 +1,113 @@ # $FreeBSD$ SHLIBDIR?= /lib .include LIBXOSRC= ${SRCTOP}/contrib/libxo .PATH: ${LIBXOSRC}/libxo LIB= xo SHLIB_MAJOR=0 SRCS= libxo.c xo_encoder.c xo_syslog.c CFLAGS+=-I${LIBXOSRC}/libxo CFLAGS+=-DXO_ENCODERDIR=\"/usr/lib/libxo/encoder\" INCS= xo.h xo_encoder.h INCSDIR=${INCLUDEDIR}/libxo +LIBADD= util + WARNS?= 5 MAN+= libxo.3 MAN+= xo_attr.3 \ xo_create.3 \ xo_emit.3 \ xo_emit_err.3 \ xo_err.3 \ xo_error.3 \ xo_finish.3 \ xo_flush.3 \ xo_message.3 \ xo_no_setlocale.3 \ xo_open_container.3 \ xo_open_list.3 \ xo_open_marker.3 \ xo_parse_args.3 \ xo_set_allocator.3 \ xo_set_flags.3 \ xo_set_info.3 \ xo_set_options.3 \ xo_set_style.3 \ xo_set_syslog_enterprise_id.3 \ xo_set_version.3 \ xo_set_writer.3 \ xo_syslog.3 MAN+= xo_format.5 MLINKS= xo_attr.3 xo_attr_h.3 \ xo_attr.3 xo_attr_hv.3 \ xo_create.3 xo_create_to_file.3 \ xo_create.3 xo_destroy.3 \ xo_emit.3 xo_emit_h.3 \ xo_emit.3 xo_emit_hv.3 \ xo_emit_err.3 xo_emit_errc.3 \ xo_emit_err.3 xo_emit_errx.3 \ xo_emit_err.3 xo_emit_warn.3 \ xo_emit_err.3 xo_emit_warnx.3 \ xo_emit_err.3 xo_emit_warn_c.3 \ xo_emit_err.3 xo_emit_warn_hc.3 \ xo_err.3 xo_errc.3 \ xo_err.3 xo_errx.3 \ xo_err.3 xo_warn.3 \ xo_err.3 xo_warnx.3 \ xo_err.3 xo_warn_c.3 \ xo_err.3 xo_warn_hc.3 \ xo_finish.3 xo_finish_h.3 \ xo_flush.3 xo_flush_h.3 \ xo_message.3 xo_message_c.3 \ xo_message.3 xo_message_hc.3 \ xo_message.3 xo_message_hcv.3 \ xo_open_container.3 xo_open_container_h.3 \ xo_open_container.3 xo_open_container_hd.3 \ xo_open_container.3 xo_open_container_d.3 \ xo_open_container.3 xo_close_container.3 \ xo_open_container.3 xo_close_container_h.3 \ xo_open_container.3 xo_close_container_hd.3 \ xo_open_container.3 xo_close_container_d.3 \ xo_open_list.3 xo_open_list_h.3 \ xo_open_list.3 xo_open_list_hd.3 \ xo_open_list.3 xo_open_list_d.3 \ xo_open_list.3 xo_open_instance.3 \ xo_open_list.3 xo_open_instance_h.3 \ xo_open_list.3 xo_open_instance_hd.3 \ xo_open_list.3 xo_open_instance_d.3 \ xo_open_list.3 xo_close_instance.3 \ xo_open_list.3 xo_close_instance_h.3 \ xo_open_list.3 xo_close_instance_hd.3 \ xo_open_list.3 xo_close_instance_d.3 \ xo_open_list.3 xo_close_list.3 \ xo_open_list.3 xo_close_list_h.3 \ xo_open_list.3 xo_close_list_hd.3 \ xo_open_list.3 xo_close_list_d.3 \ xo_open_marker.3 xo_open_marker_h.3 \ xo_open_marker.3 xo_close_marker.3 \ xo_open_marker.3 xo_close_marker_h.3 \ xo_parse_args.3 xo_set_program.3 \ xo_set_flags.3 xo_clear_flags.3 \ xo_set_style.3 xo_set_style_name.3 \ xo_set_version.3 xo_set_version_h.3 \ xo_syslog.3 xo_close_log.3 \ xo_syslog.3 xo_open_log.3 \ xo_syslog.3 xo_set_logmask.3 \ xo_syslog.3 xo_vsyslog.3 .if ${MK_TESTS} != "no" SUBDIR+= tests .endif .include Index: head/lib/libxo/tests/Makefile =================================================================== --- head/lib/libxo/tests/Makefile (revision 289489) +++ head/lib/libxo/tests/Makefile (revision 289490) @@ -1,250 +1,249 @@ # $FreeBSD$ .include LIBXOSRC= ${SRCTOP}/contrib/libxo # Override the default suffix transformation rules for .c/.o -> .out .SUFFIXES: .SUFFIXES: .c .err .o .out .sh .PATH: .PATH.c: ${LIBXOSRC}/libxo ${LIBXOSRC}/tests/core .PATH.err: ${LIBXOSRC}/tests/core/saved .PATH.out: ${LIBXOSRC}/tests/core/saved .c.out .o.out: TESTSDIR= ${TESTSBASE}/lib/libxo ATF_TESTS_SH+= functional_test BINDIR= ${TESTSDIR} FILES+= test_01.E.err FILES+= test_01.E.out FILES+= test_01.H.err FILES+= test_01.H.out FILES+= test_01.HIPx.err FILES+= test_01.HIPx.out FILES+= test_01.HP.err FILES+= test_01.HP.out FILES+= test_01.J.err FILES+= test_01.J.out FILES+= test_01.JP.err FILES+= test_01.JP.out FILES+= test_01.T.err FILES+= test_01.T.out FILES+= test_01.X.err FILES+= test_01.X.out FILES+= test_01.XP.err FILES+= test_01.XP.out FILES+= test_01.err FILES+= test_01.out FILES+= test_02.E.err FILES+= test_02.E.out FILES+= test_02.H.err FILES+= test_02.H.out FILES+= test_02.HIPx.err FILES+= test_02.HIPx.out FILES+= test_02.HP.err FILES+= test_02.HP.out FILES+= test_02.J.err FILES+= test_02.J.out FILES+= test_02.JP.err FILES+= test_02.JP.out FILES+= test_02.T.err FILES+= test_02.T.out FILES+= test_02.X.err FILES+= test_02.X.out FILES+= test_02.XP.err FILES+= test_02.XP.out FILES+= test_02.err FILES+= test_02.out FILES+= test_03.E.err FILES+= test_03.E.out FILES+= test_03.H.err FILES+= test_03.H.out FILES+= test_03.HIPx.err FILES+= test_03.HIPx.out FILES+= test_03.HP.err FILES+= test_03.HP.out FILES+= test_03.J.err FILES+= test_03.J.out FILES+= test_03.JP.err FILES+= test_03.JP.out FILES+= test_03.T.err FILES+= test_03.T.out FILES+= test_03.X.err FILES+= test_03.X.out FILES+= test_03.XP.err FILES+= test_03.XP.out FILES+= test_03.err FILES+= test_03.out FILES+= test_04.E.err FILES+= test_04.E.out FILES+= test_04.H.err FILES+= test_04.H.out FILES+= test_04.HIPx.err FILES+= test_04.HIPx.out FILES+= test_04.HP.err FILES+= test_04.HP.out FILES+= test_04.J.err FILES+= test_04.J.out FILES+= test_04.JP.err FILES+= test_04.JP.out FILES+= test_04.T.err FILES+= test_04.T.out FILES+= test_04.X.err FILES+= test_04.X.out FILES+= test_04.XP.err FILES+= test_04.XP.out FILES+= test_05.E.err FILES+= test_05.E.out FILES+= test_05.H.err FILES+= test_05.H.out FILES+= test_05.HIPx.err FILES+= test_05.HIPx.out FILES+= test_05.HP.err FILES+= test_05.HP.out FILES+= test_05.J.err FILES+= test_05.J.out FILES+= test_05.JP.err FILES+= test_05.JP.out FILES+= test_05.T.err FILES+= test_05.T.out FILES+= test_05.X.err FILES+= test_05.X.out FILES+= test_05.XP.err FILES+= test_05.XP.out FILES+= test_06.E.err FILES+= test_06.E.out FILES+= test_06.H.err FILES+= test_06.H.out FILES+= test_06.HIPx.err FILES+= test_06.HIPx.out FILES+= test_06.HP.err FILES+= test_06.HP.out FILES+= test_06.J.err FILES+= test_06.J.out FILES+= test_06.JP.err FILES+= test_06.JP.out FILES+= test_06.T.err FILES+= test_06.T.out FILES+= test_06.X.err FILES+= test_06.X.out FILES+= test_06.XP.err FILES+= test_06.XP.out FILES+= test_07.E.err FILES+= test_07.E.out FILES+= test_07.H.err FILES+= test_07.H.out FILES+= test_07.HIPx.err FILES+= test_07.HIPx.out FILES+= test_07.HP.err FILES+= test_07.HP.out FILES+= test_07.J.err FILES+= test_07.J.out FILES+= test_07.JP.err FILES+= test_07.JP.out FILES+= test_07.T.err FILES+= test_07.T.out FILES+= test_07.X.err FILES+= test_07.X.out FILES+= test_07.XP.err FILES+= test_07.XP.out FILES+= test_08.E.err FILES+= test_08.E.out FILES+= test_08.H.err FILES+= test_08.H.out FILES+= test_08.HIPx.err FILES+= test_08.HIPx.out FILES+= test_08.HP.err FILES+= test_08.HP.out FILES+= test_08.J.err FILES+= test_08.J.out FILES+= test_08.JP.err FILES+= test_08.JP.out FILES+= test_08.T.err FILES+= test_08.T.out FILES+= test_08.X.err FILES+= test_08.X.out FILES+= test_08.XP.err FILES+= test_08.XP.out FILES+= test_09.E.err FILES+= test_09.E.out FILES+= test_09.H.err FILES+= test_09.H.out FILES+= test_09.HIPx.err FILES+= test_09.HIPx.out FILES+= test_09.HP.err FILES+= test_09.HP.out FILES+= test_09.J.err FILES+= test_09.J.out FILES+= test_09.JP.err FILES+= test_09.JP.out FILES+= test_09.T.err FILES+= test_09.T.out FILES+= test_09.X.err FILES+= test_09.X.out FILES+= test_09.XP.err FILES+= test_09.XP.out FILES+= test_10.E.err FILES+= test_10.E.out FILES+= test_10.H.err FILES+= test_10.H.out FILES+= test_10.HIPx.err FILES+= test_10.HIPx.out FILES+= test_10.HP.err FILES+= test_10.HP.out FILES+= test_10.J.err FILES+= test_10.J.out FILES+= test_10.JP.err FILES+= test_10.JP.out FILES+= test_10.T.err FILES+= test_10.T.out FILES+= test_10.X.err FILES+= test_10.X.out FILES+= test_10.XP.err FILES+= test_10.XP.out FILES+= test_10.err FILES+= test_10.out FILES+= test_11.E.err FILES+= test_11.E.out FILES+= test_11.H.err FILES+= test_11.H.out FILES+= test_11.HIPx.err FILES+= test_11.HIPx.out FILES+= test_11.HP.err FILES+= test_11.HP.out FILES+= test_11.J.err FILES+= test_11.J.out FILES+= test_11.JP.err FILES+= test_11.JP.out FILES+= test_11.T.err FILES+= test_11.T.out FILES+= test_11.X.err FILES+= test_11.X.out FILES+= test_11.XP.err FILES+= test_11.XP.out PROGS+= test_01 PROGS+= test_02 PROGS+= test_03 PROGS+= test_04 PROGS+= test_05 PROGS+= test_06 PROGS+= test_07 PROGS+= test_08 PROGS+= test_09 PROGS+= test_10 PROGS+= test_11 CFLAGS+= -I${LIBXOSRC}/libxo -DPADD= ${LIBXO} ${LIBUTIL} -LDADD= -lxo -lutil +LIBADD= xo SUBDIR+= encoder .include Index: head/lib/libxo/tests/encoder/Makefile =================================================================== --- head/lib/libxo/tests/encoder/Makefile (revision 289489) +++ head/lib/libxo/tests/encoder/Makefile (revision 289490) @@ -1,20 +1,19 @@ # $FreeBSD$ LIBXOSRC= ${SRCTOP}/contrib/libxo .PATH: ${LIBXOSRC}/encoder/test SHLIB_NAME= libenc_test.so LIBDIR= ${TESTSBASE}/lib/libxo SYMLINKS+= ${LIBDIR}/${SHLIB_NAME} /usr/lib/libxo/encoder/test.enc SRCS= enc_test.c CFLAGS+= -I${LIBXOSRC}/libxo -DPADD+= ${LIBXO} -LDADD+= -lxo +LIBADD= xo .include Index: head/sbin/savecore/Makefile =================================================================== --- head/sbin/savecore/Makefile (revision 289489) +++ head/sbin/savecore/Makefile (revision 289490) @@ -1,7 +1,7 @@ # $FreeBSD$ PROG= savecore -LIBADD= z xo util +LIBADD= z xo MAN= savecore.8 .include Index: head/sbin =================================================================== --- head/sbin (revision 289489) +++ head/sbin (revision 289490) Property changes on: head/sbin ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /user/ngie/bug203673/sbin:r289470-289489 Index: head/share/mk/src.libnames.mk =================================================================== --- head/share/mk/src.libnames.mk (revision 289489) +++ head/share/mk/src.libnames.mk (revision 289490) @@ -1,368 +1,369 @@ # $FreeBSD$ # # The include file define library names suitable # for INTERNALLIB and PRIVATELIB definition .if !target(____) .error src.libnames.mk cannot be included directly. .endif .include .if ${.OBJDIR:S,${.CURDIR},,} != ${.OBJDIR} ROOTOBJDIR= ${.OBJDIR:S,${.CURDIR},,}${SRCTOP} .elif defined(OBJTOP) && ${.OBJDIR:M${OBJTOP}*} != "" ROOTOBJDIR= ${OBJTOP} .endif _PRIVATELIBS= \ atf_c \ atf_cxx \ bsdstat \ event \ heimipcc \ heimipcs \ ldns \ sqlite3 \ ssh \ ucl \ unbound _INTERNALLIBS= \ amu \ bsnmptools \ cron \ elftc \ fifolog \ ipf \ lpr \ netbsd \ ntp \ ntpevent \ ohash \ opts \ parse \ readline \ sl \ sm \ smdb \ smutil \ telnet \ vers _LIBRARIES= \ ${_PRIVATELIBS} \ ${_INTERNALLIBS} \ alias \ archive \ asn1 \ auditd \ begemot \ bluetooth \ bsdxml \ bsm \ bsnmp \ bz2 \ c \ c_pic \ calendar \ cam \ capsicum \ casper \ com_err \ compiler_rt \ crypt \ crypto \ ctf \ cuse \ cxxrt \ devctl \ devinfo \ devstat \ dialog \ dpv \ dtrace \ dwarf \ edit \ elf \ execinfo \ fetch \ figpar \ geom \ gnuregex \ gpio \ gssapi \ gssapi_krb5 \ hdb \ heimbase \ heimntlm \ heimsqlite \ hx509 \ ipsec \ jail \ kadm5clnt \ kadm5srv \ kafs5 \ kdc \ kiconv \ krb5 \ kvm \ l \ lzma \ m \ magic \ md \ memstat \ mp \ mt \ nandfs \ ncurses \ ncursesw \ netgraph \ ngatm \ nv \ opie \ pam \ panel \ panelw \ pcap \ pcsclite \ pjdlog \ pmc \ proc \ procstat \ pthread \ radius \ readline \ roken \ rpcsec_gss \ rpcsvc \ rt \ rtld_db \ sbuf \ sdp \ sm \ smb \ ssl \ ssp_nonshared \ stdthreads \ supcplusplus \ tacplus \ termcapw \ ufs \ ugidfw \ ulog \ usb \ usbhid \ util \ vmmapi \ wind \ wrap \ xo \ y \ ypclnt \ z _DP_archive= z bz2 lzma bsdxml .if ${MK_OPENSSL} != "no" _DP_archive+= crypto .else _DP_archive+= md .endif _DP_ssl= crypto _DP_ssh= crypto crypt .if ${MK_LDNS} != "no" _DP_ssh+= ldns z .endif _DP_edit= ncursesw .if ${MK_OPENSSL} != "no" _DP_bsnmp= crypto .endif _DP_geom= bsdxml sbuf _DP_cam= sbuf _DP_casper= capsicum nv pjdlog _DP_capsicum= nv _DP_pjdlog= util _DP_opie= md _DP_usb= pthread _DP_unbound= pthread _DP_rt= pthread .if ${MK_OPENSSL} == "no" _DP_radius= md .else _DP_radius= crypto .endif _DP_procstat= kvm util elf .if ${MK_CXX} == "yes" .if ${MK_LIBCPLUSPLUS} != "no" _DP_proc= cxxrt .else _DP_proc= supcplusplus .endif .endif .if ${MK_CDDL} != "no" _DP_proc+= ctf .endif _DP_mp= crypto _DP_memstat= kvm _DP_magic= z _DP_mt= bsdxml _DP_ldns= crypto .if ${MK_OPENSSL} != "no" _DP_fetch= ssl crypto .else _DP_fetch= md .endif _DP_execinfo= elf _DP_dwarf= elf _DP_dpv= dialog figpar util _DP_dialog= ncursesw m _DP_cuse= pthread _DP_atf_cxx= atf_c _DP_devstat= kvm _DP_pam= radius tacplus opie md util .if ${MK_KERBEROS} != "no" _DP_pam+= krb5 .endif .if ${MK_OPENSSH} != "no" _DP_pam+= ssh .endif .if ${MK_NIS} != "no" _DP_pam+= ypclnt .endif _DP_krb5+= asn1 com_err crypt crypto hx509 roken wind heimbase heimipcc \ pthread _DP_gssapi_krb5+= gssapi krb5 crypto roken asn1 com_err _DP_lzma= pthread _DP_ucl= m _DP_vmmapi= util _DP_ctf= z _DP_proc= rtld_db util _DP_dtrace= rtld_db pthread +_DP_xo= util # Define spacial cases LDADD_supcplusplus= -lsupc++ LIBATF_C= ${DESTDIR}${LIBDIR}/libprivateatf-c.a LIBATF_CXX= ${DESTDIR}${LIBDIR}/libprivateatf-c++.a LDADD_atf_c= -lprivateatf-c LDADD_atf_cxx= -lprivateatf-c++ .for _l in ${_PRIVATELIBS} LIB${_l:tu}?= ${DESTDIR}${LIBDIR}/libprivate${_l}.a .endfor .for _l in ${_LIBRARIES} .if ${_INTERNALLIBS:M${_l}} LDADD_${_l}_L+= -L${LIB${_l:tu}DIR} .endif DPADD_${_l}?= ${LIB${_l:tu}} .if ${_PRIVATELIBS:M${_l}} LDADD_${_l}?= -lprivate${_l} .else LDADD_${_l}?= ${LDADD_${_l}_L} -l${_l} .endif .if defined(_DP_${_l}) && defined(NO_SHARED) && (${NO_SHARED} != "no" && ${NO_SHARED} != "NO") .for _d in ${_DP_${_l}} DPADD_${_l}+= ${DPADD_${_d}} LDADD_${_l}+= ${LDADD_${_d}} .endfor .endif .endfor DPADD_atf_cxx+= ${DPADD_atf_c} LDADD_atf_cxx+= ${LDADD_atf_c} DPADD_sqlite3+= ${DPADD_pthread} LDADD_sqlite3+= ${LDADD_pthread} DPADD_fifolog+= ${DPADD_z} LDADD_fifolog+= ${LDADD_z} DPADD_ipf+= ${DPADD_kvm} LDADD_ipf+= ${LDADD_kvm} DPADD_mt+= ${DPADD_sbuf} LDADD_mt+= ${LDADD_sbuf} DPADD_dtrace+= ${DPADD_ctf} ${DPADD_elf} ${DPADD_proc} LDADD_dtrace+= ${LDADD_ctf} ${LDADD_elf} ${LDADD_proc} # The following depends on libraries which are using pthread DPADD_hdb+= ${DPADD_pthread} LDADD_hdb+= ${LDADD_pthread} DPADD_kadm5srv+= ${DPADD_pthread} LDADD_kadm5srv+= ${LDADD_pthread} DPADD_krb5+= ${DPADD_pthread} LDADD_krb5+= ${LDADD_pthread} DPADD_gssapi_krb5+= ${DPADD_pthread} LDADD_gssapi_krb5+= ${LDADD_pthread} .for _l in ${LIBADD} DPADD+= ${DPADD_${_l}:Umissing-dpadd_${_l}} LDADD+= ${LDADD_${_l}} .endfor .if defined(DPADD) && ${DPADD:Mmissing-dpadd_*} .error Missing ${DPADD:Mmissing-dpadd_*:S/missing-dpadd_//:S/^/DPADD_/} variable add "${DPADD:Mmissing-dpadd_*:S/missing-dpadd_//}" to _LIBRARIES, _INTERNALLIBS, or _PRIVATELIBS and define "${DPADD:Mmissing-dpadd_*:S/missing-dpadd_//:S/^/LIB/:tu}". .endif LIBELFTCDIR= ${ROOTOBJDIR}/lib/libelftc LIBELFTC?= ${LIBELFTCDIR}/libelftc.a LIBREADLINEDIR= ${ROOTOBJDIR}/gnu/lib/libreadline/readline LIBREADLINE?= ${LIBREADLINEDIR}/libreadline.a LIBOHASHDIR= ${ROOTOBJDIR}/lib/libohash LIBOHASH?= ${LIBOHASHDIR}/libohash.a LIBSMDIR= ${ROOTOBJDIR}/lib/libsm LIBSM?= ${LIBSMDIR}/libsm.a LIBSMDBDIR= ${ROOTOBJDIR}/lib/libsmdb LIBSMDB?= ${LIBSMDBDIR}/libsmdb.a LIBSMUTILDIR= ${ROOTOBJDIR}/lib/libsmutil LIBSMUTIL?= ${LIBSMDBDIR}/libsmutil.a LIBNETBSDDIR?= ${ROOTOBJDIR}/lib/libnetbsd LIBNETBSD?= ${LIBNETBSDDIR}/libnetbsd.a LIBVERSDIR?= ${ROOTOBJDIR}/kerberos5/lib/libvers LIBVERS?= ${LIBVERSDIR}/libvers.a LIBSLDIR= ${ROOTOBJDIR}/kerberos5/lib/libsl LIBSL?= ${LIBSLDIR}/libsl.a LIBIPFDIR= ${ROOTOBJDIR}/sbin/ipf/libipf LIBIPF?= ${LIBIPFDIR}/libipf.a LIBTELNETDIR= ${ROOTOBJDIR}/lib/libtelnet LIBTELNET?= ${LIBTELNETDIR}/libtelnet.a LIBCRONDIR= ${ROOTOBJDIR}/usr.sbin/cron/lib LIBCRON?= ${LIBCRONDIR}/libcron.a LIBNTPDIR= ${ROOTOBJDIR}/usr.sbin/ntp/libntp LIBNTP?= ${LIBNTPDIR}/libntp.a LIBNTPEVENTDIR= ${ROOTOBJDIR}/usr.sbin/ntp/libntpevent LIBNTPEVENT?= ${LIBNTPEVENTDIR}/libntpevent.a LIBOPTSDIR= ${ROOTOBJDIR}/usr.sbin/ntp/libopts LIBOTPS?= ${LIBOPTSDIR}/libopts.a LIBPARSEDIR= ${ROOTOBJDIR}/usr.sbin/ntp/libparse LIBPARSE?= ${LIBPARSEDIR}/libparse.a LIBLPRDIR= ${ROOTOBJDIR}/usr.sbin/lpr/common_source LIBLPR?= ${LIBOPTSDIR}/liblpr.a LIBFIFOLOGDIR= ${ROOTOBJDIR}/usr.sbin/fifolog/lib LIBFIFOLOG?= ${LIBOPTSDIR}/libfifolog.a LIBBSNMPTOOLSDIR= ${ROOTOBJDIR}/usr.sbin/bsnmpd/tools/libbsnmptools LIBBSNMPTOOLS?= ${LIBBSNMPTOOLSDIR}/libbsnmptools.a LIBAMUDIR= ${ROOTOBJDIR}/usr.sbin/amd/libamu LIBAMU?= ${LIBAMUDIR}/libamu/libamu.a Index: head/share =================================================================== --- head/share (revision 289489) +++ head/share (revision 289490) Property changes on: head/share ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /user/ngie/bug203673/share:r289470-289489 Index: head/usr.bin/iscsictl/Makefile =================================================================== --- head/usr.bin/iscsictl/Makefile (revision 289489) +++ head/usr.bin/iscsictl/Makefile (revision 289490) @@ -1,18 +1,18 @@ # $FreeBSD$ PROG= iscsictl SRCS= iscsictl.c periphs.c parse.y token.l y.tab.h CFLAGS+= -I${.CURDIR} CFLAGS+= -I${.CURDIR}/../../sys/dev/iscsi MAN= iscsi.conf.5 iscsictl.8 -LIBADD= xo util +LIBADD= xo YFLAGS+= -v LFLAGS+= -i CLEANFILES= y.tab.c y.tab.h y.output WARNS= 6 NO_WMISSING_VARIABLE_DECLARATIONS= .include Index: head/usr.bin/wc/Makefile =================================================================== --- head/usr.bin/wc/Makefile (revision 289489) +++ head/usr.bin/wc/Makefile (revision 289490) @@ -1,7 +1,7 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ PROG= wc -LIBADD= xo util +LIBADD= xo .include Index: head/usr.bin/xo/Makefile =================================================================== --- head/usr.bin/xo/Makefile (revision 289489) +++ head/usr.bin/xo/Makefile (revision 289490) @@ -1,21 +1,21 @@ # $FreeBSD$ .include LIBXOSRC= ${SRCTOP}/contrib/libxo .PATH: ${LIBXOSRC}/xo PROG= xo MAN= xo.1 # XXX For xoversion.h CFLAGS+=-I${LIBXOSRC}/libxo -LIBADD= xo util +LIBADD= xo .if ${MK_TESTS} != "no" SUBDIR+= tests .endif .include Index: head =================================================================== --- head (revision 289489) +++ head (revision 289490) Property changes on: head ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /user/ngie/bug203673:r289470-289489