Index: head/usr.sbin/acpi/acpidb/Makefile =================================================================== --- head/usr.sbin/acpi/acpidb/Makefile (revision 275053) +++ head/usr.sbin/acpi/acpidb/Makefile (revision 275054) @@ -1,80 +1,79 @@ # $FreeBSD$ PROG= acpidb SRCS= acpidb.c # common SRCS+= acgetline.c ahids.c ahuuids.c cmfsize.c # components/debugger SRCS+= dbcmds.c dbconvert.c dbdisply.c dbexec.c dbfileio.c \ dbhistry.c dbinput.c dbmethod.c dbnames.c dbstats.c \ dbtest.c dbutils.c dbxface.c # components/disassembler SRCS+= dmbuffer.c dmdeferred.c dmnames.c dmobject.c dmopcode.c \ dmresrc.c dmresrcl.c dmresrcl2.c dmresrcs.c dmutils.c \ dmwalk.c # components/dispatcher SRCS+= dsargs.c dscontrol.c dsfield.c dsinit.c dsmethod.c \ dsmthdat.c dsobject.c dsopcode.c dsutils.c dswexec.c \ dswload.c dswload2.c dswscope.c dswstate.c # components/events SRCS+= evevent.c evglock.c evgpe.c evgpeblk.c evgpeinit.c \ evgpeutil.c evhandler.c evmisc.c evregion.c evrgnini.c \ evsci.c evxface.c evxfevnt.c evxfregn.c # components/executer SRCS+= exconfig.c exconvrt.c excreate.c exdebug.c exdump.c \ exfield.c exfldio.c exmisc.c exmutex.c exnames.c \ exoparg1.c exoparg2.c exoparg3.c exoparg6.c exprep.c \ exregion.c exresnte.c exresolv.c exresop.c exstore.c \ exstoren.c exstorob.c exsystem.c exutils.c # components/hardware SRCS+= hwacpi.c hwesleep.c hwgpe.c hwpci.c hwregs.c hwsleep.c \ hwvalid.c hwxface.c hwxfsleep.c # components/namespace SRCS+= nsaccess.c nsalloc.c nsarguments.c nsconvert.c nsdump.c \ nseval.c nsinit.c nsload.c nsnames.c nsobject.c \ nsparse.c nspredef.c nsprepkg.c nsrepair.c nsrepair2.c \ nssearch.c nsutils.c nswalk.c nsxfeval.c nsxfname.c \ nsxfobj.c # components/parser SRCS+= psargs.c psloop.c psobject.c psopcode.c psopinfo.c \ psparse.c psscope.c pstree.c psutils.c pswalk.c \ psxface.c # components/resources SRCS+= rsaddr.c rscalc.c rscreate.c rsdump.c rsdumpinfo.c \ rsinfo.c rsio.c rsirq.c rslist.c rsmemory.c rsmisc.c \ rsserial.c rsutils.c rsxface.c # components/tables SRCS+= tbdata.c tbfadt.c tbfind.c tbinstal.c tbprint.c \ tbutils.c tbxface.c tbxfload.c # components/utilities SRCS+= utaddress.c utalloc.c utbuffer.c utcache.c utcopy.c \ utdebug.c utdecode.c utdelete.c uterror.c uteval.c \ utexcep.c utfileio.c utglobal.c uthex.c utids.c \ utinit.c utlock.c utmath.c utmisc.c utmutex.c \ utobject.c utosi.c utownerid.c utpredef.c utprint.c \ utresrc.c utstate.c utstring.c uttrack.c utuuid.c \ utxface.c utxferror.c utxfinit.c # os_specific/service_layers SRCS+= oslibcfs.c osunixxf.c MAN= acpidb.8 WARNS?= 3 CFLAGS+= -DACPI_EXEC_APP -fno-strict-aliasing -DPADD= ${LIBPTHREAD} -LDADD= -lpthread +LIBADD= pthread .include Index: head/usr.sbin/amd/Makefile.inc =================================================================== --- head/usr.sbin/amd/Makefile.inc (revision 275053) +++ head/usr.sbin/amd/Makefile.inc (revision 275054) @@ -1,47 +1,40 @@ # ex:ts=8 # # $FreeBSD$ # # Makefile for amd # This file is under a "BSD" copyright (c) by David O'Brien 1998. # Portions derived from # $NetBSD: Makefile.inc,v 1.10 1998/08/08 22:33:27 christos Exp $ # Portions derived from amd/libamu/Makefile # $NetBSD: Makefile,v 1.8 1998/08/08 22:33:37 christos Exp $ .include CFLAGS+= -I. -I${.CURDIR} CFLAGS+= -I${.CURDIR}/../include .if exists(${.OBJDIR}/../include) CFLAGS+= -I${.OBJDIR}/../include .endif CFLAGS+= -I${.CURDIR}/../../../contrib/amd/include CFLAGS+= -I${.CURDIR}/../../../contrib/amd CFLAGS+= -DHAVE_CONFIG_H .if ${MK_NIS} == "no" CFLAGS+= -DHAVE_LOCALCONFIG_H .endif .if ${MK_HESIOD} != "no" CFLAGS+= -DYES_HESIOD .endif CFLAGS+= -DHOST_CPU=\"${MACHINE_CPUARCH}\" -DHOST_ARCH=\"${MACHINE_ARCH}\" -.if exists(${.OBJDIR}/../libamu) -LIBAMUDIR= ${.OBJDIR}/../libamu -.else -LIBAMUDIR= ${.CURDIR}/../libamu -.endif -LIBAMU= ${LIBAMUDIR}/libamu.a - RPCCOM= RPCGEN_CPP=${CPP:Q} rpcgen MOUNT_X= ${DESTDIR}/usr/include/rpcsvc/mount.x NFS_PROT_X= ${DESTDIR}/usr/include/rpcsvc/nfs_prot.x WARNS?= 1 .if exists(${.CURDIR}/../../Makefile.inc) .include "${.CURDIR}/../../Makefile.inc" .endif Index: head/usr.sbin/amd/amd/Makefile =================================================================== --- head/usr.sbin/amd/amd/Makefile (revision 275053) +++ head/usr.sbin/amd/amd/Makefile (revision 275054) @@ -1,53 +1,52 @@ # ex:ts=8 # # Makefile for amd # This file is under a "BSD" copyright (c) by David O'Brien 1998 # # $FreeBSD$ # .include .PATH: ${.CURDIR}/../../../contrib/amd/amd PROG= amd MAN= amd.8 SRCS= conf_parse.y conf_tok.l SRCS+= am_ops.c amd.c amfs_auto.c amfs_direct.c amfs_error.c amfs_generic.c SRCS+= amfs_host.c amfs_link.c amfs_linkx.c amfs_nfsl.c SRCS+= amfs_nfsx.c amfs_program.c amfs_root.c amfs_toplvl.c SRCS+= amfs_union.c amq_subr.c amq_svc.c autil.c clock.c conf.c SRCS+= get_args.c info_exec.c info_file.c info_ndbm.c info_passwd.c SRCS+= info_union.c map.c mapc.c mntfs.c nfs_prot_svc.c nfs_start.c SRCS+= nfs_subr.c ops_cdfs.c ops_mfs.c ops_nfs.c ops_nfs3.c SRCS+= ops_nullfs.c ops_pcfs.c ops_tfs.c ops_ufs.c ops_umapfs.c SRCS+= ops_unionfs.c opts.c readdir.c restart.c rpc_fwd.c sched.c SRCS+= srvr_amfs_auto.c srvr_nfs.c CFLAGS+= -I${.CURDIR}/../../../contrib/amd/amd \ -I${DESTDIR}/usr/include/rpcsvc -DPADD= ${LIBAMU} ${LIBWRAP} -LDADD= ${LIBAMU} -lwrap +LIBADD= amu wrap CLEANFILES+= conf_parse.c conf_parse.h conf_tok.c conf_tok.o: conf_parse.h # These are generated at compile time SRCS+= mount_xdr.c CLEANFILES+= mount_xdr.c mount_xdr.c: ${MOUNT_X} ${RPCCOM} -c -DWANT_NFS3 ${MOUNT_X} -o ${.TARGET} .if ${MK_HESIOD} != "no" SRCS+= info_hesiod.c CFLAGS+= -DHAVE_MAP_HESIOD .endif .if ${MK_NIS} != "no" SRCS+= info_nis.c .endif .include Index: head/usr.sbin/amd/amq/Makefile =================================================================== --- head/usr.sbin/amd/amq/Makefile (revision 275053) +++ head/usr.sbin/amd/amq/Makefile (revision 275054) @@ -1,20 +1,19 @@ # ex:ts=8 # # Makefile for amd # This file is under a "BSD" copyright (c) by David O'Brien 1998 # # $FreeBSD$ # .PATH: ${.CURDIR}/../../../contrib/amd/amq PROG= amq MAN= amq.8 SRCS= amq.c amq_clnt.c amq_xdr.c CFLAGS+= -I${.CURDIR}/../../../contrib/amd/amq -DPADD= ${LIBAMU} -LDADD= ${LIBAMU} +LIBADD= amu .include Index: head/usr.sbin/amd/fixmount/Makefile =================================================================== --- head/usr.sbin/amd/fixmount/Makefile (revision 275053) +++ head/usr.sbin/amd/fixmount/Makefile (revision 275054) @@ -1,21 +1,20 @@ # ex:ts=8 # # Makefile for amd # This file is under a "BSD" copyright (c) by David O'Brien 1998 # # $FreeBSD$ .PATH: ${.CURDIR}/../../../contrib/amd/fixmount \ ${.CURDIR}/../../../contrib/amd/conf/checkmount PROG= fixmount MAN= fixmount.8 -SRCS= fixmount.c +SRCS= fixmount.c # These would be links created by the GNU-style configure SRCS+= checkmount_bsd44.c -DPADD= ${LIBAMU} ${LIBRPCSVC} -LDADD= ${LIBAMU} -lrpcsvc +LIBADD+= amu rpcsvc .include Index: head/usr.sbin/amd/fsinfo/Makefile =================================================================== --- head/usr.sbin/amd/fsinfo/Makefile (revision 275053) +++ head/usr.sbin/amd/fsinfo/Makefile (revision 275054) @@ -1,25 +1,24 @@ # ex:ts=8 # # Makefile for amd # This file is under a "BSD" copyright (c) by David O'Brien 1998 # # $FreeBSD$ .PATH: ${.CURDIR}/../../../contrib/amd/fsinfo PROG= fsinfo MAN= fsinfo.8 SRCS= fsi_gram.y fsi_lex.l SRCS+= fsi_analyze.c fsi_dict.c fsi_util.c fsinfo.c wr_atab.c SRCS+= wr_bparam.c wr_dumpset.c wr_exportfs.c wr_fstab.c CFLAGS+= -I${.CURDIR}/../../../contrib/amd/fsinfo -DPADD= ${LIBAMU} -LDADD= ${LIBAMU} +LIBADD= amu CLEANFILES+= fsi_gram.c fsi_gram.h fsi_lex.c fsi_lex.o: fsi_gram.h .include Index: head/usr.sbin/amd/hlfsd/Makefile =================================================================== --- head/usr.sbin/amd/hlfsd/Makefile (revision 275053) +++ head/usr.sbin/amd/hlfsd/Makefile (revision 275054) @@ -1,19 +1,18 @@ # ex:ts=8 # # Makefile for amd # This file is under a "BSD" copyright (c) by David O'Brien 1998 # # $FreeBSD$ .PATH: ${.CURDIR}/../../../contrib/amd/hlfsd PROG= hlfsd MAN= hlfsd.8 SRCS= hlfsd.c homedir.c nfs_prot_svc.c stubs.c CFLAGS+= -I${.CURDIR}/../../../contrib/amd/hlfsd -DPADD= ${LIBAMU} -LDADD= ${LIBAMU} +LIBADD= amu .include Index: head/usr.sbin/amd/mk-amd-map/Makefile =================================================================== --- head/usr.sbin/amd/mk-amd-map/Makefile (revision 275053) +++ head/usr.sbin/amd/mk-amd-map/Makefile (revision 275054) @@ -1,16 +1,15 @@ # ex:ts=8 # # Makefile for amd # This file is under a "BSD" copyright (c) by David O'Brien 1998 # # $FreeBSD$ .PATH: ${.CURDIR}/../../../contrib/amd/mk-amd-map PROG= mk-amd-map MAN= mk-amd-map.8 -DPADD= ${LIBAMU} -LDADD= ${LIBAMU} +LIBADD= amu .include Index: head/usr.sbin/amd/pawd/Makefile =================================================================== --- head/usr.sbin/amd/pawd/Makefile (revision 275053) +++ head/usr.sbin/amd/pawd/Makefile (revision 275054) @@ -1,20 +1,19 @@ # ex:ts=8 # # Makefile for amd # This file is under a "BSD" copyright (c) by David O'Brien 1998 # # $FreeBSD$ .PATH: ${.CURDIR}/../../../contrib/amd/amq BINDIR= /usr/bin PROG= pawd SRCS= pawd.c amq_clnt.c amq_xdr.c CFLAGS+= -I${.CURDIR}/../../../contrib/amd/amq -DPADD= ${LIBAMU} -LDADD= ${LIBAMU} +LIBADD= amu .include Index: head/usr.sbin/amd/wire-test/Makefile =================================================================== --- head/usr.sbin/amd/wire-test/Makefile (revision 275053) +++ head/usr.sbin/amd/wire-test/Makefile (revision 275054) @@ -1,16 +1,15 @@ # ex:ts=8 # # Makefile for amd # This file is under a "BSD" copyright (c) by David O'Brien 1998 # # $FreeBSD$ .PATH: ${.CURDIR}/../../../contrib/amd/wire-test PROG= wire-test MAN= wire-test.8 -DPADD= ${LIBAMU} -LDADD= ${LIBAMU} +LIBADD= amu .include Index: head/usr.sbin/ancontrol/Makefile =================================================================== --- head/usr.sbin/ancontrol/Makefile (revision 275053) +++ head/usr.sbin/ancontrol/Makefile (revision 275054) @@ -1,12 +1,11 @@ # $FreeBSD$ PROG= ancontrol MAN= ancontrol.8 WARNS?= 3 CFLAGS+= -DANCACHE -I${.CURDIR}/../../sys -DPADD= ${LIBMD} -LDADD= -lmd +LIBADD= md .include Index: head/usr.sbin/apmd/Makefile =================================================================== --- head/usr.sbin/apmd/Makefile (revision 275053) +++ head/usr.sbin/apmd/Makefile (revision 275054) @@ -1,18 +1,17 @@ # $FreeBSD$ PROG= apmd MAN= apmd.8 MANSUBDIR= /i386 SRCS= apmd.c apmdlex.l apmdparse.y y.tab.h WARNS?= 3 -DPADD= ${LIBL} -LDADD= -ll +LIBADD= l CFLAGS+= -I${.CURDIR} test: ./apmd -d -f etc/apmd.conf -n .include Index: head/usr.sbin/asf/Makefile =================================================================== --- head/usr.sbin/asf/Makefile (revision 275053) +++ head/usr.sbin/asf/Makefile (revision 275054) @@ -1,10 +1,9 @@ # $FreeBSD$ PROG= asf SRCS= asf.c asf_kld.c asf_kvm.c asf_prog.c MAN= asf.8 -DPADD= ${LIBKVM} -LDADD= -lkvm +LIBADD= kvm .include Index: head/usr.sbin/audit/Makefile =================================================================== --- head/usr.sbin/audit/Makefile (revision 275053) +++ head/usr.sbin/audit/Makefile (revision 275054) @@ -1,18 +1,17 @@ # # $FreeBSD$ # OPENBSMDIR=${.CURDIR}/../../contrib/openbsm .PATH: ${OPENBSMDIR}/bin/audit CFLAGS+= -I${OPENBSMDIR} PROG= audit MAN= audit.8 -DPADD= ${LIBBSM} -LDADD= -lbsm +LIBADD= bsm WARNS?= 5 .include Index: head/usr.sbin/auditd/Makefile =================================================================== --- head/usr.sbin/auditd/Makefile (revision 275053) +++ head/usr.sbin/auditd/Makefile (revision 275054) @@ -1,19 +1,18 @@ # # $FreeBSD$ # OPENBSMDIR=${.CURDIR}/../../contrib/openbsm .PATH: ${OPENBSMDIR}/bin/auditd CFLAGS+= -I${OPENBSMDIR} PROG= auditd SRCS= auditd.c audit_warn.c auditd_fbsd.c MAN= auditd.8 -DPADD= ${LIBAUDITD} ${LIBBSM} -LDADD= -lauditd -lbsm +LIBADD= auditd bsm WARNS?= 3 .include Index: head/usr.sbin/auditdistd/Makefile =================================================================== --- head/usr.sbin/auditdistd/Makefile (revision 275053) +++ head/usr.sbin/auditdistd/Makefile (revision 275054) @@ -1,37 +1,34 @@ # # $FreeBSD$ # OPENBSMDIR=${.CURDIR}/../../contrib/openbsm .PATH: ${OPENBSMDIR}/bin/auditdistd # Addition of auditdistd because otherwise generated parse.c can't find # auditdistd.h. This seems like a makefile non-feature. CFLAGS+=-I${OPENBSMDIR} -I${OPENBSMDIR}/bin/auditdistd NO_WFORMAT= NO_WMISSING_VARIABLE_DECLARATIONS= PROG= auditdistd SRCS= auditdistd.c SRCS+= parse.y pjdlog.c SRCS+= proto.c proto_common.c proto_socketpair.c proto_tcp.c proto_tls.c SRCS+= receiver.c SRCS+= sandbox.c sender.c subr.c SRCS+= token.l trail.c MAN= auditdistd.8 auditdistd.conf.5 -DPADD= ${LIBL} ${LIBPTHREAD} ${LIBUTIL} -LDADD= -ll -lpthread -lutil -DPADD+= ${LIBCRYPTO} ${LIBSSL} -LDADD+= -lcrypto -lssl +LIBADD+= l pthread util crypto ssl YFLAGS+=-v CLEANFILES=parse.c parse.h parse.output # auditdistd cannot use FreeBSD specific lock annotation macros. Disable # thread safety analysis completely. NO_WTHREAD_SAFETY= .include Index: head/usr.sbin/auditreduce/Makefile =================================================================== --- head/usr.sbin/auditreduce/Makefile (revision 275053) +++ head/usr.sbin/auditreduce/Makefile (revision 275054) @@ -1,18 +1,17 @@ # # $FreeBSD$ # OPENBSMDIR=${.CURDIR}/../../contrib/openbsm .PATH: ${OPENBSMDIR}/bin/auditreduce CFLAGS+= -I${OPENBSMDIR} PROG= auditreduce MAN= auditreduce.1 -DPADD= ${LIBBSM} -LDADD= -lbsm +LIBADD= bsm WARNS?= 3 .include Index: head/usr.sbin/authpf/Makefile =================================================================== --- head/usr.sbin/authpf/Makefile (revision 275053) +++ head/usr.sbin/authpf/Makefile (revision 275054) @@ -1,24 +1,23 @@ # $FreeBSD$ .PATH: ${.CURDIR}/../../contrib/pf/authpf PROG= authpf MAN= authpf.8 BINOWN= root BINGRP= authpf BINMODE= 6555 SRCS= authpf.c # XXX ALTQ: CFLAGS+= -DENABLE_ALTQ -LDADD+= -lm -lmd -lutil -DPADD+= ${LIBM} ${LIBMD} ${LIBUTIL} +LIBADD= m md util WARNS?= 3 LINKS= ${BINDIR}/authpf ${BINDIR}/authpf-noip MLINKS= authpf.8 authpf-noip.8 .include Index: head/usr.sbin/autofs/Makefile =================================================================== --- head/usr.sbin/autofs/Makefile (revision 275053) +++ head/usr.sbin/autofs/Makefile (revision 275054) @@ -1,33 +1,32 @@ # $FreeBSD$ PROG= automountd SRCS= automount.c SRCS+= automountd.c SRCS+= autounmountd.c SRCS+= common.c SRCS+= defined.c SRCS+= getmntopts.c SRCS+= log.c SRCS+= popen.c SRCS+= token.l CFLAGS+=-I${.CURDIR} CFLAGS+=-I${.CURDIR}/../../sys/fs/autofs MAN= automount.8 automountd.8 autounmountd.8 auto_master.5 -DPADD= ${LIBUTIL} -LDADD= -lutil +LIBADD= util # Needed for getmntopts.c MOUNT= ${.CURDIR}/../../sbin/mount CFLAGS+=-I${MOUNT} WARNS= 6 LINKS= ${BINDIR}/automountd ${BINDIR}/automount LINKS+= ${BINDIR}/automountd ${BINDIR}/autounmountd .PATH: ${MOUNT} .include Index: head/usr.sbin/bhyve/Makefile =================================================================== --- head/usr.sbin/bhyve/Makefile (revision 275053) +++ head/usr.sbin/bhyve/Makefile (revision 275054) @@ -1,51 +1,50 @@ # # $FreeBSD$ # PROG= bhyve -DEBUG_FLAGS= -g -O0 +DEBUG_FLAGS= -g -O0 MAN= bhyve.8 SRCS= \ atkbdc.c \ acpi.c \ bhyverun.c \ block_if.c \ consport.c \ dbgport.c \ inout.c \ ioapic.c \ mem.c \ mevent.c \ mptbl.c \ pci_ahci.c \ pci_emul.c \ pci_hostbridge.c \ pci_irq.c \ pci_lpc.c \ pci_passthru.c \ pci_virtio_block.c \ pci_virtio_net.c \ pci_virtio_rnd.c \ pci_uart.c \ pm.c \ post.c \ rtc.c \ smbiostbl.c \ task_switch.c \ uart_emul.c \ virtio.c \ xmsr.c \ spinup_ap.c .PATH: ${.CURDIR}/../../sys/amd64/vmm SRCS+= vmm_instruction_emul.c -DPADD= ${LIBVMMAPI} ${LIBMD} ${LIBUTIL} ${LIBPTHREAD} -LDADD= -lvmmapi -lmd -lutil -lpthread +LIBADD= vmmapi md util pthread WARNS?= 2 .include Index: head/usr.sbin/bhyvectl/Makefile =================================================================== --- head/usr.sbin/bhyvectl/Makefile (revision 275053) +++ head/usr.sbin/bhyvectl/Makefile (revision 275054) @@ -1,17 +1,16 @@ # # $FreeBSD$ # PROG= bhyvectl SRCS= bhyvectl.c MAN= -DPADD= ${LIBVMMAPI} ${LIBUTIL} -LDADD= -lvmmapi -lutil +LIBADD= vmmapi util WARNS?= 3 CFLAGS+= -I${.CURDIR}/../../sys/amd64/vmm .include Index: head/usr.sbin/bhyveload/Makefile =================================================================== --- head/usr.sbin/bhyveload/Makefile (revision 275053) +++ head/usr.sbin/bhyveload/Makefile (revision 275054) @@ -1,14 +1,13 @@ # $FreeBSD$ PROG= bhyveload SRCS= bhyveload.c MAN= bhyveload.8 -DPADD+= ${LIBVMMAPI} ${LIBUTIL} -LDADD+= -lvmmapi -lutil +LIBADD= vmmapi util WARNS?= 3 CFLAGS+=-I${.CURDIR}/../../sys/boot/userboot .include Index: head/usr.sbin/bluetooth/ath3kfw/Makefile =================================================================== --- head/usr.sbin/bluetooth/ath3kfw/Makefile (revision 275053) +++ head/usr.sbin/bluetooth/ath3kfw/Makefile (revision 275054) @@ -1,8 +1,7 @@ # $FreeBSD$ PROG= ath3kfw MAN= ath3kfw.8 -DPADD+= ${LIBUSB} -LDADD+= -lusb +LIBADD+= usb .include Index: head/usr.sbin/bluetooth/bt3cfw/Makefile =================================================================== --- head/usr.sbin/bluetooth/bt3cfw/Makefile (revision 275053) +++ head/usr.sbin/bluetooth/bt3cfw/Makefile (revision 275054) @@ -1,11 +1,10 @@ # $Id: Makefile,v 1.5 2003/08/14 20:06:00 max Exp $ # $FreeBSD$ PROG= bt3cfw MAN= bt3cfw.8 WARNS?= 2 -DPADD= ${LIBNETGRAPH} -LDADD= -lnetgraph +LIBADD+= netgraph .include Index: head/usr.sbin/bluetooth/bthidcontrol/Makefile =================================================================== --- head/usr.sbin/bluetooth/bthidcontrol/Makefile (revision 275053) +++ head/usr.sbin/bluetooth/bthidcontrol/Makefile (revision 275054) @@ -1,15 +1,14 @@ # $Id: Makefile,v 1.2 2004/02/13 21:44:41 max Exp $ # $FreeBSD$ .PATH: ${.CURDIR}/../bthidd PROG= bthidcontrol MAN= bthidcontrol.8 SRCS= bthidcontrol.c hid.c lexer.l parser.y sdp.c WARNS?= 1 CFLAGS+= -DBTHIDCONTROL=1 -I${.CURDIR}/../bthidd -DPADD= ${LIBBLUETOOTH} ${LIBSDP} ${LIBUSBHID} -LDADD= -lbluetooth -lsdp -lusbhid +LIBADD+= bluetooth sdp usbhid .include Index: head/usr.sbin/bluetooth/bthidd/Makefile =================================================================== --- head/usr.sbin/bluetooth/bthidd/Makefile (revision 275053) +++ head/usr.sbin/bluetooth/bthidd/Makefile (revision 275054) @@ -1,18 +1,17 @@ # $Id: Makefile,v 1.6 2006/09/07 21:36:55 max Exp $ # $FreeBSD$ PROG= bthidd MAN= bthidd.8 # bthidd.conf.5 SRCS= bthidd.c client.c hid.c kbd.c lexer.l parser.y server.c \ session.c CFLAGS+= -I${.CURDIR} DEBUG_FLAGS= -g -DPADD= ${LIBBLUETOOTH} ${LIBUSBHID} -LDADD= -lbluetooth -lusbhid +LIBADD+= bluetooth usbhid NO_WMISSING_VARIABLE_DECLARATIONS= .include Index: head/usr.sbin/bluetooth/btpand/Makefile =================================================================== --- head/usr.sbin/bluetooth/btpand/Makefile (revision 275053) +++ head/usr.sbin/bluetooth/btpand/Makefile (revision 275054) @@ -1,13 +1,12 @@ # $NetBSD: Makefile,v 1.2 2008/08/18 08:25:32 plunky Exp $ # $FreeBSD$ PROG= btpand MAN= btpand.8 SRCS= btpand.c bnep.c channel.c client.c event.c packet.c server.c sdp.c tap.c WARNS?= 3 -DPADD+= ${LIBBLUETOOTH} ${LIBSDP} ${LIBUTIL} -LDADD+= -lbluetooth -lsdp -lutil +LIBADD= bluetooth sdp util .include Index: head/usr.sbin/bluetooth/hccontrol/Makefile =================================================================== --- head/usr.sbin/bluetooth/hccontrol/Makefile (revision 275053) +++ head/usr.sbin/bluetooth/hccontrol/Makefile (revision 275054) @@ -1,14 +1,13 @@ # $Id: Makefile,v 1.7 2003/08/14 20:06:17 max Exp $ # $FreeBSD$ PROG= hccontrol MAN= hccontrol.8 SRCS= send_recv.c link_policy.c link_control.c \ host_controller_baseband.c info.c status.c node.c hccontrol.c \ util.c WARNS?= 2 -DPADD= ${LIBBLUETOOTH} -LDADD= -lbluetooth +LIBADD= bluetooth .include Index: head/usr.sbin/bluetooth/hcsecd/Makefile =================================================================== --- head/usr.sbin/bluetooth/hcsecd/Makefile (revision 275053) +++ head/usr.sbin/bluetooth/hcsecd/Makefile (revision 275054) @@ -1,13 +1,12 @@ # $Id: Makefile,v 1.8 2003/08/14 20:06:20 max Exp $ # $FreeBSD$ PROG= hcsecd MAN= hcsecd.8 hcsecd.conf.5 SRCS= hcsecd.c lexer.l parser.y WARNS?= 2 CFLAGS+= -I${.CURDIR} -DPADD= ${LIBBLUETOOTH} -LDADD= -lbluetooth +LIBADD= bluetooth .include Index: head/usr.sbin/bluetooth/hcseriald/Makefile =================================================================== --- head/usr.sbin/bluetooth/hcseriald/Makefile (revision 275053) +++ head/usr.sbin/bluetooth/hcseriald/Makefile (revision 275054) @@ -1,11 +1,10 @@ # $Id: Makefile,v 1.5 2003/08/14 20:06:21 max Exp $ # $FreeBSD$ PROG= hcseriald MAN= hcseriald.8 WARNS?= 2 -DPADD= ${LIBNETGRAPH} -LDADD= -lnetgraph +LIBADD= netgraph .include Index: head/usr.sbin/bluetooth/l2control/Makefile =================================================================== --- head/usr.sbin/bluetooth/l2control/Makefile (revision 275053) +++ head/usr.sbin/bluetooth/l2control/Makefile (revision 275054) @@ -1,12 +1,11 @@ # $Id: Makefile,v 1.7 2003/08/14 20:06:22 max Exp $ # $FreeBSD$ PROG= l2control MAN= l2control.8 SRCS= l2cap.c l2control.c WARNS?= 2 -DPADD= ${LIBBLUETOOTH} -LDADD= -lbluetooth +LIBADD= bluetooth .include Index: head/usr.sbin/bluetooth/l2ping/Makefile =================================================================== --- head/usr.sbin/bluetooth/l2ping/Makefile (revision 275053) +++ head/usr.sbin/bluetooth/l2ping/Makefile (revision 275054) @@ -1,11 +1,10 @@ # $Id: Makefile,v 1.6 2003/08/14 20:06:24 max Exp $ # $FreeBSD$ PROG= l2ping MAN= l2ping.8 WARNS?= 2 -DPADD= ${LIBBLUETOOTH} -LDADD= -lbluetooth +LIBADD= bluetooth .include Index: head/usr.sbin/bluetooth/rfcomm_pppd/Makefile =================================================================== --- head/usr.sbin/bluetooth/rfcomm_pppd/Makefile (revision 275053) +++ head/usr.sbin/bluetooth/rfcomm_pppd/Makefile (revision 275054) @@ -1,14 +1,13 @@ # $Id: Makefile,v 1.7 2003/09/07 18:32:11 max Exp $ # $FreeBSD$ .PATH: ${.CURDIR}/../../../usr.bin/bluetooth/rfcomm_sppd PROG= rfcomm_pppd MAN= rfcomm_pppd.8 SRCS= rfcomm_pppd.c rfcomm_sdp.c WARNS?= 2 -DPADD= ${LIBBLUETOOTH} ${LIBSDP} -LDADD= -lbluetooth -lsdp +LIBADD= bluetooth sdp .include Index: head/usr.sbin/bluetooth/sdpcontrol/Makefile =================================================================== --- head/usr.sbin/bluetooth/sdpcontrol/Makefile (revision 275053) +++ head/usr.sbin/bluetooth/sdpcontrol/Makefile (revision 275054) @@ -1,12 +1,11 @@ # $Id: Makefile,v 1.1 2003/09/08 02:27:27 max Exp $ # $FreeBSD$ PROG= sdpcontrol MAN= sdpcontrol.8 SRCS= sdpcontrol.c search.c WARNS?= 2 -DPADD= ${LIBBLUETOOTH} ${LIBSDP} -LDADD= -lbluetooth -lsdp +LIBADD= bluetooth sdp .include Index: head/usr.sbin/boot0cfg/Makefile =================================================================== --- head/usr.sbin/boot0cfg/Makefile (revision 275053) +++ head/usr.sbin/boot0cfg/Makefile (revision 275054) @@ -1,11 +1,10 @@ # $FreeBSD$ PROG= boot0cfg MAN= boot0cfg.8 -DPADD= ${LIBGEOM} ${LIBBSDXML} ${LIBSBUF} -LDADD= -lgeom -lbsdxml -lsbuf +LIBADD= geom NO_WCAST_ALIGN= .include Index: head/usr.sbin/boot98cfg/Makefile =================================================================== --- head/usr.sbin/boot98cfg/Makefile (revision 275053) +++ head/usr.sbin/boot98cfg/Makefile (revision 275054) @@ -1,11 +1,10 @@ # $FreeBSD$ PROG= boot98cfg MAN= boot98cfg.8 WARNS?= 2 -DPADD= ${LIBGEOM} -LDADD= -lgeom +LIBADD= geom .include Index: head/usr.sbin/bsdinstall/distextract/Makefile =================================================================== --- head/usr.sbin/bsdinstall/distextract/Makefile (revision 275053) +++ head/usr.sbin/bsdinstall/distextract/Makefile (revision 275054) @@ -1,11 +1,10 @@ # $FreeBSD$ BINDIR= /usr/libexec/bsdinstall PROG= distextract -DPADD= ${LIBARCHIVE} ${LIBNCURSESW} ${LIBDIALOG} ${LIBM} -LDADD= -larchive -lncursesw -ldialog -lm +LIBADD= archive ncursesw dialog m WARNS?= 6 MAN= .include Index: head/usr.sbin/bsdinstall/distfetch/Makefile =================================================================== --- head/usr.sbin/bsdinstall/distfetch/Makefile (revision 275053) +++ head/usr.sbin/bsdinstall/distfetch/Makefile (revision 275054) @@ -1,11 +1,10 @@ # $FreeBSD$ BINDIR= /usr/libexec/bsdinstall PROG= distfetch -DPADD= ${LIBFETCH} ${LIBNCURSESW} ${LIBDIALOG} ${LIBM} -LDADD= -lfetch -lncursesw -ldialog -lm +LIBADD= fetch ncursesw dialog m WARNS?= 6 MAN= .include Index: head/usr.sbin/bsdinstall/partedit/Makefile =================================================================== --- head/usr.sbin/bsdinstall/partedit/Makefile (revision 275053) +++ head/usr.sbin/bsdinstall/partedit/Makefile (revision 275054) @@ -1,25 +1,24 @@ # $FreeBSD$ BINDIR= /usr/libexec/bsdinstall PROG= partedit LINKS= ${BINDIR}/partedit ${BINDIR}/autopart \ ${BINDIR}/partedit ${BINDIR}/scriptedpart SYMLINKS= ${BINDIR}/partedit /usr/sbin/sade -DPADD= ${LIBGEOM} ${LIBNCURSESW} ${LIBUTIL} ${LIBDIALOG} ${LIBM} -LDADD= -lgeom -lncursesw -lutil -ldialog -lm +LIBADD+= geom ncursesw util dialog m PARTEDIT_ARCH= ${MACHINE} .if ${MACHINE} == "i386" || ${MACHINE} == "amd64" PARTEDIT_ARCH= x86 .endif .if !exists(partedit_${PARTEDIT_ARCH}.c) PARTEDIT_ARCH= generic .endif SRCS= diskeditor.c partedit.c gpart_ops.c partedit_${PARTEDIT_ARCH}.c \ part_wizard.c scripted.c WARNS?= 3 MAN= sade.8 .include Index: head/usr.sbin/bsnmpd/bsnmpd/Makefile =================================================================== --- head/usr.sbin/bsnmpd/bsnmpd/Makefile (revision 275053) +++ head/usr.sbin/bsnmpd/bsnmpd/Makefile (revision 275054) @@ -1,52 +1,51 @@ # $FreeBSD$ # # Author: Harti Brandt .include CONTRIB=${.CURDIR}/../../../contrib/bsnmp .PATH: ${CONTRIB}/snmpd PROG= bsnmpd SRCS= main.c action.c config.c export.c trap.c trans_udp.c trans_lsock.c SRCS+= oid.h tree.c tree.h XSYM= snmpMIB begemotSnmpdModuleTable begemotSnmpd begemotTrapSinkTable \ sysUpTime snmpTrapOID coldStart authenticationFailure \ begemotSnmpdTransUdp begemotSnmpdTransLsock begemotSnmpdLocalPortTable \ freeBSD freeBSDVersion CLEANFILES= oid.h tree.c tree.h MAN= bsnmpd.1 snmpmod.3 NO_WERROR= FILESGROUPS= BMIBS DEFS BMIBS= FOKUS-MIB.txt BEGEMOT-MIB.txt BEGEMOT-SNMPD.txt BMIBSDIR= ${SHAREDIR}/snmp/mibs DEFS= tree.def DEFSDIR= ${SHAREDIR}/snmp/defs CFLAGS+= -DSNMPTREE_TYPES CFLAGS+= -I${CONTRIB}/lib -I${CONTRIB}/snmpd -I. -DUSE_LIBBEGEMOT CFLAGS+= -DUSE_TCPWRAPPERS -DQUADFMT='"llu"' -DQUADXFMT='"llx"' CFLAGS+= -DHAVE_STDINT_H -DHAVE_INTTYPES_H -DHAVE_ERR_H -DHAVE_STRLCPY -DPADD= ${LIBBEGEMOT} ${LIBBSNMP} ${LIBWRAP} -LDADD= -lbegemot -lbsnmp -lwrap +LIBADD= begemot bsnmp wrap LDFLAGS= -Wl,-export-dynamic .if ${MK_OPENSSL} != "no" CFLAGS+= -DHAVE_LIBCRYPTO .endif oid.h: tree.def Makefile gensnmptree -e ${XSYM} < ${.ALLSRC:M*.def} > ${.TARGET} .ORDER: tree.c tree.h tree.c tree.h: tree.def gensnmptree -l < ${.ALLSRC} MANFILTER= sed -e 's%@MODPATH@%${LIBDIR}/%g' \ -e 's%@DEFPATH@%${DEFSDIR}/%g' \ -e 's%@MIBSPATH@%${BMIBSDIR}/%g' .include Index: head/usr.sbin/bsnmpd/modules/snmp_hast/Makefile =================================================================== --- head/usr.sbin/bsnmpd/modules/snmp_hast/Makefile (revision 275053) +++ head/usr.sbin/bsnmpd/modules/snmp_hast/Makefile (revision 275054) @@ -1,43 +1,42 @@ # $FreeBSD$ .include .PATH: ${.CURDIR}/../../../../sbin/hastd MOD= hast SRCS= ebuf.c SRCS+= hast_compression.c hast_proto.c hast_snmp.c SRCS+= lzf.c SRCS+= nv.c SRCS+= parse.y pjdlog.c SRCS+= proto.c proto_common.c proto_uds.c SRCS+= token.l SRCS+= y.tab.h MAN= snmp_hast.3 NO_WFORMAT= NO_WCAST_ALIGN= NO_WMISSING_VARIABLE_DECLARATIONS= CFLAGS+=-I${.CURDIR}/../../../../sbin/hastd CFLAGS+=-DHAVE_CAPSICUM CFLAGS+=-DINET .if ${MK_INET6_SUPPORT} != "no" CFLAGS+=-DINET6 .endif # This is needed to have WARNS > 1. CFLAGS+=-DYY_NO_UNPUT CFLAGS+=-DYY_NO_INPUT CFLAGS+= -DSNMPTREE_TYPES -DPADD= ${LIBUTIL} -LDADD= -lutil +LIBADD= util XSYM= begemotHast DEFS= ${MOD}_tree.def BMIBS= BEGEMOT-HAST-MIB.txt YFLAGS+=-v CLEANFILES=y.tab.c y.tab.h y.output .include Index: head/usr.sbin/bsnmpd/modules/snmp_hostres/Makefile =================================================================== --- head/usr.sbin/bsnmpd/modules/snmp_hostres/Makefile (revision 275053) +++ head/usr.sbin/bsnmpd/modules/snmp_hostres/Makefile (revision 275054) @@ -1,82 +1,81 @@ # # Copyright (c) 2005-2006 The FreeBSD Project # All rights reserved. # Author: Victor Cruceru # # Redistribution of this software and documentation 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 or documentation 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$ # LPRSRC= ${.CURDIR}/../../../lpr/common_source .PATH: ${LPRSRC} MOD= hostres SRCS= hostres_begemot.c \ hostres_device_tbl.c \ hostres_diskstorage_tbl.c \ hostres_fs_tbl.c \ hostres_network_tbl.c \ hostres_partition_tbl.c \ hostres_printer_tbl.c \ hostres_processor_tbl.c \ hostres_scalars.c \ hostres_snmp.c \ hostres_storage_tbl.c \ hostres_swinstalled_tbl.c \ hostres_swrun_tbl.c \ printcap.c #Not having NDEBUG defined will enable assertions and a lot of output on stderr CFLAGS+= -DNDEBUG -I${LPRSRC} XSYM= host hrStorageOther hrStorageRam hrStorageVirtualMemory \ hrStorageFixedDisk hrStorageRemovableDisk hrStorageFloppyDisk \ hrStorageCompactDisc hrStorageRamDisk hrStorageFlashMemory \ hrStorageNetworkDisk hrDeviceOther hrDeviceUnknown \ hrDeviceProcessor hrDeviceNetwork hrDevicePrinter \ hrDeviceDiskStorage hrDeviceVideo hrDeviceAudio \ hrDeviceCoprocessor hrDeviceKeyboard hrDeviceModem \ hrDeviceParallelPort hrDevicePointing \ hrDeviceSerialPort hrDeviceTape hrDeviceClock \ hrDeviceVolatileMemory hrDeviceNonVolatileMemory \ hrFSOther hrFSUnknown hrFSBerkeleyFFS hrFSSys5FS hrFSFat\ hrFSHPFS hrFSHFS hrFSMFS hrFSNTFS hrFSVNode hrFSJournaled \ hrFSiso9660 hrFSRockRidge hrFSNFS hrFSNetware hrFSAFS hrFSDFS \ hrFSAppleshare hrFSRFS hrFSDGCFS hrFSBFS hrFSFAT32 hrFSLinuxExt2 MAN= snmp_hostres.3 DEFS= ${MOD}_tree.def BMIBS= BEGEMOT-HOSTRES-MIB.txt -DPADD= ${LIBKVM} ${LIBDEVINFO} ${LIBM} ${LIBGEOM} ${LIBMEMSTAT} -LDADD= -lkvm -ldevinfo -lm -lgeom -lmemstat +LIBADD= kvm devinfo m geom memstat .include printcap.So: printcap.c ${CC} ${PICFLAG} -DPIC ${CFLAGS:C/^-W.*//} -c ${.IMPSRC} -o ${.TARGET} smilint: env SMIPATH=.:/usr/share/snmp/mibs:/usr/local/share/snmp/mibs \ smilint -c /dev/null -l6 -i group-membership BEGEMOT-HOSTRES-MIB Index: head/usr.sbin/bsnmpd/modules/snmp_netgraph/Makefile =================================================================== --- head/usr.sbin/bsnmpd/modules/snmp_netgraph/Makefile (revision 275053) +++ head/usr.sbin/bsnmpd/modules/snmp_netgraph/Makefile (revision 275054) @@ -1,17 +1,16 @@ # $FreeBSD$ # # Author: Harti Brandt MOD= netgraph SRCS= snmp_netgraph.c XSYM= begemotNg MAN= snmp_netgraph.3 BMIBS= BEGEMOT-NETGRAPH.txt DEFS= ${MOD}_tree.def INCS= snmp_${MOD}.h -DPADD= ${LIBNETGRAPH} -LDADD= -lnetgraph +LIBADD= netgraph .include Index: head/usr.sbin/bsnmpd/tools/bsnmptools/Makefile =================================================================== --- head/usr.sbin/bsnmpd/tools/bsnmptools/Makefile (revision 275053) +++ head/usr.sbin/bsnmpd/tools/bsnmptools/Makefile (revision 275054) @@ -1,28 +1,25 @@ # $FreeBSD$ # Author: Shteryana Shopova .include .PATH: ${.CURDIR} PROG= bsnmpget -DPADD+= ${LIBBSNMP} ${LIBBSNMPTOOLS} -LDADD+= -lbsnmp -lbsnmptools +LIBADD= bsnmp bsnmptools CFLAGS+= -I${.CURDIR}/../libbsnmptools -LDFLAGS+= -L${LIBBSNMPTOOLSDIR} .if ${MK_OPENSSL} != "no" -DPADD+= ${LIBCRYPTO} -LDADD+= -lcrypto +LIBADD+= crypto .endif LINKS= ${BINDIR}/bsnmpget ${BINDIR}/bsnmpwalk LINKS+= ${BINDIR}/bsnmpget ${BINDIR}/bsnmpset MAN= bsnmpget.1 MLINKS= bsnmpget.1 bsnmpwalk.1 MLINKS+= bsnmpget.1 bsnmpset.1 .include Index: head/usr.sbin/cdcontrol/Makefile =================================================================== --- head/usr.sbin/cdcontrol/Makefile (revision 275053) +++ head/usr.sbin/cdcontrol/Makefile (revision 275054) @@ -1,8 +1,7 @@ # $FreeBSD$ PROG= cdcontrol -DPADD= ${LIBEDIT} ${LIBTERMCAPW} -LDADD= -ledit -ltermcapw +LIBADD= edit .include Index: head/usr.sbin/ckdist/Makefile =================================================================== --- head/usr.sbin/ckdist/Makefile (revision 275053) +++ head/usr.sbin/ckdist/Makefile (revision 275054) @@ -1,11 +1,10 @@ # $FreeBSD$ .PATH: ${.CURDIR}/../../usr.bin/cksum PROG= ckdist SRCS= ckdist.c crc.c -DPADD= ${LIBMD} -LDADD= -lmd +LIBADD= md .include Index: head/usr.sbin/clear_locks/Makefile =================================================================== --- head/usr.sbin/clear_locks/Makefile (revision 275053) +++ head/usr.sbin/clear_locks/Makefile (revision 275054) @@ -1,8 +1,7 @@ # $FreeBSD$ PROG= clear_locks MAN= clear_locks.8 -DPADD= ${LIBRPCSVC} -LDADD= -lrpcsvc +LIBADD= rpcsvc .include Index: head/usr.sbin/config/Makefile =================================================================== --- head/usr.sbin/config/Makefile (revision 275053) +++ head/usr.sbin/config/Makefile (revision 275054) @@ -1,23 +1,22 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ PROG= config MAN= config.5 config.8 SRCS= config.y main.c lang.l mkmakefile.c mkheaders.c \ mkoptions.c y.tab.h kernconf.c kernconf.c: kernconf.tmpl file2c 'char kernconfstr[] = {' ',0};' < ${.CURDIR}/kernconf.tmpl > kernconf.c CFLAGS+= -I. -I${.CURDIR} NO_WMISSING_VARIABLE_DECLARATIONS= -DPADD= ${LIBL} ${LIBSBUF} -LDADD= -ll -lsbuf +LIBADD= l sbuf CLEANFILES+= kernconf.c mkmakefile.o: configvers.h .include Index: head/usr.sbin/cron/Makefile.inc =================================================================== --- head/usr.sbin/cron/Makefile.inc (revision 275053) +++ head/usr.sbin/cron/Makefile.inc (nonexistent) @@ -1,5 +0,0 @@ -# $FreeBSD$ - -LIBCRON= ${.OBJDIR}/../lib/libcron.a - -.include "../Makefile.inc" Property changes on: head/usr.sbin/cron/Makefile.inc ___________________________________________________________________ Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/usr.sbin/cron/cron/Makefile =================================================================== --- head/usr.sbin/cron/cron/Makefile (revision 275053) +++ head/usr.sbin/cron/cron/Makefile (revision 275054) @@ -1,14 +1,13 @@ # $FreeBSD$ PROG= cron MAN= cron.8 SRCS= cron.c database.c do_command.c job.c user.c popen.c CFLAGS+= -DLOGIN_CAP -DPAM -DPADD= ${LIBCRON} ${LIBPAM} ${LIBUTIL} -LDADD= ${LIBCRON} ${MINUSLPAM} -lutil +LIBADD= cron pam util WARNS?= 2 .include Index: head/usr.sbin/cron/crontab/Makefile =================================================================== --- head/usr.sbin/cron/crontab/Makefile (revision 275053) +++ head/usr.sbin/cron/crontab/Makefile (revision 275054) @@ -1,18 +1,17 @@ # $FreeBSD$ BINDIR= /usr/bin PROG= crontab MAN= crontab.1 crontab.5 BINOWN= root BINMODE=4555 PRECIOUSPROG= WARNS?= 3 CFLAGS+= -I${.CURDIR}/../cron -DPADD= ${LIBCRON} ${LIBMD} ${LIBUTIL} -LDADD= ${LIBCRON} -lmd -lutil +LIBADD= cron md util .include Index: head/usr.sbin/ctladm/Makefile =================================================================== --- head/usr.sbin/ctladm/Makefile (revision 275053) +++ head/usr.sbin/ctladm/Makefile (revision 275054) @@ -1,21 +1,20 @@ # $FreeBSD$ PROG= ctladm SRCS= ctladm.c util.c ctl_util.c ctl_scsi_all.c .PATH: ${.CURDIR}/../../sys/cam/ctl SDIR= ${.CURDIR}/../../sys CFLAGS+= -I${SDIR} # This is necessary because of these warnings: # warning: cast increases required alignment of target type # The solution is to either upgrade the compiler (preferred), or do void # pointer gymnastics to get around the warning. For now, disable the # warning instead of doing the void pointer workaround. .if ${MACHINE_CPUARCH} == "arm" WARNS?= 3 .endif -DPADD= ${LIBCAM} ${LIBSBUF} ${LIBBSDXML} ${LIBUTIL} -LDADD= -lcam -lsbuf -lbsdxml -lutil +LIBADD= cam sbuf bsdxml util MAN= ctladm.8 .include Index: head/usr.sbin/ctld/Makefile =================================================================== --- head/usr.sbin/ctld/Makefile (revision 275053) +++ head/usr.sbin/ctld/Makefile (revision 275054) @@ -1,22 +1,21 @@ # $FreeBSD$ PROG= ctld SRCS= chap.c ctld.c discovery.c isns.c kernel.c keys.c log.c SRCS+= login.c parse.y pdu.c token.l y.tab.h CFLAGS+= -I${.CURDIR} CFLAGS+= -I${.CURDIR}/../../sys CFLAGS+= -I${.CURDIR}/../../sys/cam/ctl CFLAGS+= -I${.CURDIR}/../../sys/dev/iscsi #CFLAGS+= -DICL_KERNEL_PROXY MAN= ctld.8 ctl.conf.5 -DPADD= ${LIBBSDXML} ${LIBCRYPTO} ${LIBL} ${LIBSBUF} ${LIBUTIL} -LDADD= -lbsdxml -lcrypto -ll -lsbuf -lutil +LIBADD= bsdxml crypto l sbuf util YFLAGS+= -v CLEANFILES= y.tab.c y.tab.h y.output WARNS= 6 NO_WMISSING_VARIABLE_DECLARATIONS= .include Index: head/usr.sbin/ctm/ctm/Makefile =================================================================== --- head/usr.sbin/ctm/ctm/Makefile (revision 275053) +++ head/usr.sbin/ctm/ctm/Makefile (revision 275054) @@ -1,25 +1,24 @@ # ---------------------------------------------------------------------------- # "THE BEER-WARE LICENSE" (Revision 42): # wrote this file. As long as you retain this notice you # can do whatever you want with this stuff. If we meet some day, and you think # this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp # ---------------------------------------------------------------------------- # # $FreeBSD$ PROG= ctm MAN= ctm.1 ctm.5 SRCS= ctm.c ctm_input.c ctm_pass1.c ctm_pass2.c ctm_pass3.c \ ctm_passb.c ctm_syntax.c ctm_ed.c NOTYET= ctm_ed.c -LDADD= -lmd -DPADD= ${LIBMD} +LIBADD= md WARNS?= 2 .if exists(${.CURDIR}/../../Makefile.inc) .include "${.CURDIR}/../../Makefile.inc" .endif .include Index: head/usr.sbin/ctm/mkCTM/Makefile =================================================================== --- head/usr.sbin/ctm/mkCTM/Makefile (revision 275053) +++ head/usr.sbin/ctm/mkCTM/Makefile (revision 275054) @@ -1,26 +1,25 @@ # $FreeBSD$ PROG= mkctm MAN= -DPADD= ${LIBMD} -LDADD= -lmd +LIBADD= md test: mkctm rm -f tst.out* time ./mkctm -v -v /3c/210src /a/r1/usr/src \ 2>a | md5 -p > /a/tst.out ls -l /a/tst.out gzip -9 -v /a/tst.out ls -l /a/tst.out.gz # cd /usr/src/release && ctm -c -v -v ${.CURDIR}/tst.out test1: mkctm rm -f tst.out* time ./mkctm -v -v /3c/210src /home/ncvs/src \ 2> b | md5 -p > /a/tst2.out ls -l /a/tst2.out gzip -9 -v /a/tst2.out ls -l /a/tst2.out.gz .include Index: head/usr.sbin/daemon/Makefile =================================================================== --- head/usr.sbin/daemon/Makefile (revision 275053) +++ head/usr.sbin/daemon/Makefile (revision 275054) @@ -1,9 +1,8 @@ # $FreeBSD$ PROG= daemon MAN= daemon.8 -DPADD= ${LIBUTIL} -LDADD= -lutil +LIBADD= util .include Index: head/usr.sbin/dconschat/Makefile =================================================================== --- head/usr.sbin/dconschat/Makefile (revision 275053) +++ head/usr.sbin/dconschat/Makefile (revision 275054) @@ -1,13 +1,12 @@ # $FreeBSD$ PROG= dconschat MAN= dconschat.8 CFLAGS+= -I${.CURDIR}/../../sys -DPADD= ${LIBKVM} -LDADD= -lkvm +LIBADD= kvm WARNS?= 1 .include Index: head/usr.sbin/devinfo/Makefile =================================================================== --- head/usr.sbin/devinfo/Makefile (revision 275053) +++ head/usr.sbin/devinfo/Makefile (revision 275054) @@ -1,9 +1,8 @@ # $FreeBSD$ PROG= devinfo MAN= devinfo.8 -DPADD= ${LIBDEVINFO} -LDADD= -ldevinfo +LIBADD= devinfo .include Index: head/usr.sbin/diskinfo/Makefile =================================================================== --- head/usr.sbin/diskinfo/Makefile (revision 275053) +++ head/usr.sbin/diskinfo/Makefile (revision 275054) @@ -1,14 +1,13 @@ # $FreeBSD$ PROG= diskinfo MAN= diskinfo.8 -DPADD= ${LIBUTIL} -LDADD= -lutil +LIBADD= util .include test: ${PROG} ./${PROG} /dev/ad4 md50 ./${PROG} -v /dev/ad4 md50 ./${PROG} -t /dev/ad4 Index: head/usr.sbin/editmap/Makefile =================================================================== --- head/usr.sbin/editmap/Makefile (revision 275053) +++ head/usr.sbin/editmap/Makefile (revision 275054) @@ -1,39 +1,29 @@ # $FreeBSD$ SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail .PATH: ${SENDMAIL_DIR}/editmap PROG= editmap SRCS= editmap.c MAN= editmap.8 CFLAGS+= -I${SENDMAIL_DIR}/src -I${SENDMAIL_DIR}/include -I. CFLAGS+= -DNEWDB -DNOT_SENDMAIL WARNS?= 2 -LIBSMDIR= ${.OBJDIR}/../../lib/libsm -LIBSM= ${LIBSMDIR}/libsm.a - -LIBSMDBDIR= ${.OBJDIR}/../../lib/libsmdb -LIBSMDB= ${LIBSMDBDIR}/libsmdb.a - -LIBSMUTILDIR= ${.OBJDIR}/../../lib/libsmutil -LIBSMUTIL= ${LIBSMUTILDIR}/libsmutil.a - -DPADD= ${LIBSMDB} ${LIBSMUTIL} ${LIBSM} -LDADD= ${LIBSMDB} ${LIBSMUTIL} ${LIBSM} +LIBADD= smdb smutil 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/usr.sbin/edquota/Makefile =================================================================== --- head/usr.sbin/edquota/Makefile (revision 275053) +++ head/usr.sbin/edquota/Makefile (revision 275054) @@ -1,13 +1,12 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ PROG= edquota MAN= edquota.8 CSTD= gnu99 WARNS?= 4 -DPADD= ${LIBUTIL} -LDADD= -lutil +LIBADD= util .include Index: head/usr.sbin/fifolog/Makefile.inc =================================================================== --- head/usr.sbin/fifolog/Makefile.inc (revision 275053) +++ head/usr.sbin/fifolog/Makefile.inc (nonexistent) @@ -1,8 +0,0 @@ -# $FreeBSD$ - -LIBFIFOLOG= ${.OBJDIR}/../lib/libfifolog.a - -#LINT= flint -#LINTFLAGS= ${.CURDIR}/../flint.lnt -I/usr/include - -.include "../Makefile.inc" Property changes on: head/usr.sbin/fifolog/Makefile.inc ___________________________________________________________________ Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/usr.sbin/fifolog/fifolog_create/Makefile =================================================================== --- head/usr.sbin/fifolog/fifolog_create/Makefile (revision 275053) +++ head/usr.sbin/fifolog/fifolog_create/Makefile (revision 275054) @@ -1,22 +1,21 @@ # $FreeBSD$ PROG= fifolog_create CFLAGS+= -I${.CURDIR}/../lib -DPADD= ${LIBFIFOLOG} ${LIBUTIL} -LDADD= ${LIBFIFOLOG} -lutil +LIBADD= util fifolog MAN= fifolog.1 MLINKS= fifolog.1 fifolog_create.1 \ fifolog.1 fifolog_reader.1 \ fifolog.1 fifolog_writer.1 regress: rm -f /tmp/fifolog.? ./${PROG} /tmp/fifolog.0 ./${PROG} -s 10m /tmp/fifolog.1 ./${PROG} -l 1k /tmp/fifolog.2 ./${PROG} -r 1k /tmp/fifolog.3 .include Index: head/usr.sbin/fifolog/fifolog_reader/Makefile =================================================================== --- head/usr.sbin/fifolog/fifolog_reader/Makefile (revision 275053) +++ head/usr.sbin/fifolog/fifolog_reader/Makefile (revision 275054) @@ -1,20 +1,19 @@ # $FreeBSD$ PROG= fifolog_reader CFLAGS+= -I${.CURDIR}/../lib MAN= -DPADD= ${LIBFIFOLOG} ${LIBZ} -LDADD= ${LIBFIFOLOG} -lz +LIBADD= z fifolog regress: ./${PROG} /tmp/fifolog.0 ./${PROG} -t /tmp/fifolog.0 ./${PROG} /tmp/fifolog.1 ./${PROG} -B "00:00" /tmp/fifolog.1 ./${PROG} -T "%y%m%d-%H%M%S" /tmp/fifolog.1 ./${PROG} -T "" /tmp/fifolog.1 .include Index: head/usr.sbin/fifolog/fifolog_writer/Makefile =================================================================== --- head/usr.sbin/fifolog/fifolog_writer/Makefile (revision 275053) +++ head/usr.sbin/fifolog/fifolog_writer/Makefile (revision 275054) @@ -1,16 +1,15 @@ # $FreeBSD$ PROG= fifolog_writer CFLAGS+= -I${.CURDIR}/../lib MAN= -DPADD= ${LIBFIFOLOG} ${LIBZ} -LDADD= ${LIBFIFOLOG} -lz +LIBADD= z fifolog regress: date | ./${PROG} -z 0 /tmp/fifolog.0 lptest 65 | ./${PROG} -z 9 /tmp/fifolog.1 .include Index: head/usr.sbin/flowctl/Makefile =================================================================== --- head/usr.sbin/flowctl/Makefile (revision 275053) +++ head/usr.sbin/flowctl/Makefile (revision 275054) @@ -1,21 +1,20 @@ # # $FreeBSD$ # .include PROG= flowctl MAN= flowctl.8 WARNS?= 2 -DPADD= ${LIBNETGRAPH} -LDADD= -lnetgraph +LIBADD= netgraph .if ${MK_INET6_SUPPORT} != "no" CFLAGS+= -DINET6 .endif .if ${MK_INET_SUPPORT} != "no" CFLAGS+= -DINET .endif .include Index: head/usr.sbin/ftp-proxy/Makefile =================================================================== --- head/usr.sbin/ftp-proxy/Makefile (revision 275053) +++ head/usr.sbin/ftp-proxy/Makefile (revision 275054) @@ -1,17 +1,16 @@ # $FreeBSD$ .PATH: ${.CURDIR}/../../contrib/pf/ftp-proxy PROG= ftp-proxy MAN= ftp-proxy.8 SRCS= ftp-proxy.c filter.c CFLAGS+=-I${.CURDIR}/../../contrib/pf/libevent -LDADD+= ${LIBEVENT} -DPADD+= ${LIBEVENT} +LIBADD= event WARNS?= 3 .include Index: head/usr.sbin/gssd/Makefile =================================================================== --- head/usr.sbin/gssd/Makefile (revision 275053) +++ head/usr.sbin/gssd/Makefile (revision 275054) @@ -1,37 +1,35 @@ # $FreeBSD$ .include PROG= gssd MAN= gssd.8 SRCS= gssd.c gssd.h gssd_svc.c gssd_xdr.c gssd_prot.c CFLAGS+= -I. WARNS?= 1 -DPADD= ${LIBGSSAPI} -LDADD= -lgssapi +LIBADD= gssapi .if ${MK_KERBEROS_SUPPORT} != "no" -DPADD+= ${LIBKRB5} ${LIBHX509} ${LIBASN1} ${LIBROKEN} ${LIBCOM_ERR} ${LIBCRYPT} ${LIBCRYPTO} -LDADD+= -lkrb5 -lhx509 -lasn1 -lroken -lcom_err -lcrypt -lcrypto +LIBADD+= krb5 roken .else CFLAGS+= -DWITHOUT_KERBEROS .endif CLEANFILES= gssd_svc.c gssd.h RPCSRC= ${.CURDIR}/../../sys/kgssapi/gssd.x RPCGEN= RPCGEN_CPP=${CPP:Q} rpcgen -L -C -M gssd_svc.c: ${RPCSRC} gssd.h ${RPCGEN} -m -o ${.TARGET} ${RPCSRC} gssd_xdr.c: ${RPCSRC} gssd.h ${RPCGEN} -c -o ${.TARGET} ${RPCSRC} gssd.h: ${RPCSRC} ${RPCGEN} -h -o ${.TARGET} ${RPCSRC} .PATH: ${.CURDIR}/../../sys/kgssapi .include Index: head/usr.sbin/gstat/Makefile =================================================================== --- head/usr.sbin/gstat/Makefile (revision 275053) +++ head/usr.sbin/gstat/Makefile (revision 275054) @@ -1,8 +1,7 @@ # $FreeBSD$ PROG= gstat MAN= gstat.8 -DPADD= ${LIBDEVSTAT} ${LIBKVM} ${LIBGEOM} ${LIBBSDXML} ${LIBSBUF} ${LIBEDIT} ${LIBNCURSESW} -LDADD= -ldevstat -lkvm -lgeom -lbsdxml -lsbuf -ledit -lncursesw +LIBADD= devstat geom edit ncursesw .include Index: head/usr.sbin/ifmcstat/Makefile =================================================================== --- head/usr.sbin/ifmcstat/Makefile (revision 275053) +++ head/usr.sbin/ifmcstat/Makefile (revision 275054) @@ -1,24 +1,23 @@ # @(#)Makefile 8.1 (Berkeley) 6/5/93 # $FreeBSD$ .include PROG= ifmcstat SRCS= ifmcstat.c printb.c MAN= ifmcstat.8 BINMODE= 555 WARNS?= 2 .if ${MK_INET6_SUPPORT} != "no" CFLAGS+=-DINET6 .endif .if ${MK_KVM_SUPPORT} != "no" CFLAGS+=-DWITH_KVM -DPADD= ${LIBKVM} -LDADD= -lkvm +LIBADD= kvm .endif .include Index: head/usr.sbin/inetd/Makefile =================================================================== --- head/usr.sbin/inetd/Makefile (revision 275053) +++ head/usr.sbin/inetd/Makefile (revision 275054) @@ -1,29 +1,27 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ .include PROG= inetd MAN= inetd.8 MLINKS= inetd.8 inetd.conf.5 SRCS= inetd.c builtins.c WARNS?= 3 CFLAGS+= -DLOGIN_CAP #CFLAGS+= -DSANITY_CHECK .if ${MK_INET6_SUPPORT} != "no" CFLAGS+= -DINET6 .endif -DPADD= ${LIBUTIL} ${LIBWRAP} -LDADD= -lutil -lwrap +LIBADD= util wrap # XXX for src/release/picobsd .if !defined(RELEASE_CRUNCH) CFLAGS+= -DIPSEC -DPADD+= ${LIBIPSEC} -LDADD+= -lipsec +LIBADD+= ipsec .endif .include Index: head/usr.sbin/iostat/Makefile =================================================================== --- head/usr.sbin/iostat/Makefile (revision 275053) +++ head/usr.sbin/iostat/Makefile (revision 275054) @@ -1,12 +1,11 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ PROG= iostat MAN= iostat.8 -DPADD= ${LIBDEVSTAT} ${LIBKVM} ${LIBM} -LDADD= -ldevstat -lkvm -lm +LIBADD= devstat kvm m WARNS?= 1 .include Index: head/usr.sbin/ipfwpcap/Makefile =================================================================== --- head/usr.sbin/ipfwpcap/Makefile (revision 275053) +++ head/usr.sbin/ipfwpcap/Makefile (revision 275054) @@ -1,19 +1,18 @@ # # From: Id: Makefile,v 1.2 2004/01/15 16:20:56 pkern Exp # # $FreeBSD$ # PROG= ipfwpcap -LDADD= -lpcap -DPADD= ${LIBPCAP} +LIBADD= pcap MAN= ipfwpcap.8 .include test: $(CMD) -rm /var/run/ipfwpcap.2000.pid ./ipfwpcap -d 2000 - | tcpdump -r - -n -s 2000 -X Index: head/usr.sbin/iscsid/Makefile =================================================================== --- head/usr.sbin/iscsid/Makefile (revision 275053) +++ head/usr.sbin/iscsid/Makefile (revision 275054) @@ -1,16 +1,15 @@ # $FreeBSD$ PROG= iscsid SRCS= chap.c discovery.c iscsid.c keys.c log.c login.c pdu.c CFLAGS+= -I${.CURDIR} CFLAGS+= -I${.CURDIR}/../../sys/cam CFLAGS+= -I${.CURDIR}/../../sys/dev/iscsi #CFLAGS+= -DICL_KERNEL_PROXY MAN= iscsid.8 -DPADD= ${LIBCRYPTO} ${LIBUTIL} -LDADD= -lcrypto -lutil +LIBADD= crypto util WARNS= 6 .include Index: head/usr.sbin/jail/Makefile =================================================================== --- head/usr.sbin/jail/Makefile (revision 275053) +++ head/usr.sbin/jail/Makefile (revision 275054) @@ -1,26 +1,25 @@ # $FreeBSD$ .include PROG= jail MAN= jail.8 jail.conf.5 SRCS= jail.c command.c config.c state.c jailp.h jaillex.l jailparse.y y.tab.h -DPADD= ${LIBJAIL} ${LIBKVM} ${LIBUTIL} ${LIBL} -LDADD= -ljail -lkvm -lutil -ll +LIBADD= jail kvm util l NO_WMISSING_VARIABLE_DECLARATIONS= YFLAGS+=-v CFLAGS+=-I. -I${.CURDIR} .if ${MK_INET6_SUPPORT} != "no" CFLAGS+= -DINET6 .endif .if ${MK_INET_SUPPORT} != "no" CFLAGS+= -DINET .endif CLEANFILES= y.output .include Index: head/usr.sbin/jexec/Makefile =================================================================== --- head/usr.sbin/jexec/Makefile (revision 275053) +++ head/usr.sbin/jexec/Makefile (revision 275054) @@ -1,8 +1,7 @@ # $FreeBSD$ PROG= jexec MAN= jexec.8 -DPADD= ${LIBJAIL} ${LIBUTIL} -LDADD= -ljail -lutil +LIBADD= jail util .include Index: head/usr.sbin/jls/Makefile =================================================================== --- head/usr.sbin/jls/Makefile (revision 275053) +++ head/usr.sbin/jls/Makefile (revision 275054) @@ -1,17 +1,16 @@ # $FreeBSD$ .include PROG= jls MAN= jls.8 -DPADD= ${LIBJAIL} -LDADD= -ljail +LIBADD= jail .if ${MK_INET6_SUPPORT} != "no" CFLAGS+= -DINET6 .endif .if ${MK_INET_SUPPORT} != "no" CFLAGS+= -DINET .endif .include Index: head/usr.sbin/kbdcontrol/Makefile =================================================================== --- head/usr.sbin/kbdcontrol/Makefile (revision 275053) +++ head/usr.sbin/kbdcontrol/Makefile (revision 275054) @@ -1,14 +1,13 @@ # $FreeBSD$ PROG= kbdcontrol MAN= kbdcontrol.1 kbdmap.5 MLINKS= kbdmap.5 keymap.5 SRCS= kbdcontrol.c lex.l WARNS?= 4 CFLAGS+= -I${.CURDIR} -DPADD= ${LIBL} -LDADD= -ll +LIBADD= l .include Index: head/usr.sbin/keyserv/Makefile =================================================================== --- head/usr.sbin/keyserv/Makefile (revision 275053) +++ head/usr.sbin/keyserv/Makefile (revision 275054) @@ -1,26 +1,25 @@ # $FreeBSD$ PROG= keyserv MAN= keyserv.8 SRCS= keyserv.c setkey.c crypt_svc.c crypt_server.c crypt.h CFLAGS+= -DKEYSERV_RANDOM -DBROKEN_DES -I. -DPADD= ${LIBMP} ${LIBCRYPTO} ${LIBRPCSVC} -LDADD= -lmp -lcrypto -lrpcsvc +LIBADD= mp rpcsvc WARNS?= 1 RPCDIR= ${DESTDIR}/usr/include/rpcsvc CLEANFILES= crypt_svc.c crypt.h RPCGEN= RPCGEN_CPP=${CPP:Q} rpcgen -C crypt_svc.c: ${RPCDIR}/crypt.x ${RPCGEN} -m -o ${.TARGET} ${RPCDIR}/crypt.x crypt.h: ${RPCDIR}/crypt.x ${RPCGEN} -h -o ${.TARGET} ${RPCDIR}/crypt.x .include Index: head/usr.sbin/kgmon/Makefile =================================================================== --- head/usr.sbin/kgmon/Makefile (revision 275053) +++ head/usr.sbin/kgmon/Makefile (revision 275054) @@ -1,17 +1,16 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ PROG= kgmon MAN= kgmon.8 WARNS?= 2 # This program may safely be run setuid-root to allow non-root # users to start, stop, and reset profiling buffers. # #BINOWN=root #BINMODE=4555 -DPADD= ${LIBKVM} -LDADD= -lkvm +LIBADD= kvm .include Index: head/usr.sbin/lmcconfig/Makefile =================================================================== --- head/usr.sbin/lmcconfig/Makefile (revision 275053) +++ head/usr.sbin/lmcconfig/Makefile (revision 275054) @@ -1,11 +1,10 @@ # $FreeBSD$ PROG= lmcconfig MAN= lmcconfig.8 -DPADD= ${LIBNETGRAPH} -LDADD= -lnetgraph +LIBADD= netgraph WARNS?= 3 .include Index: head/usr.sbin/lpr/Makefile.inc =================================================================== --- head/usr.sbin/lpr/Makefile.inc (revision 275053) +++ head/usr.sbin/lpr/Makefile.inc (revision 275054) @@ -1,11 +1,9 @@ # $FreeBSD$ .include .if ${MK_INET6_SUPPORT} != "no" CFLAGS+= -DINET6 .endif -LIBLPR= ${.OBJDIR}/../common_source/liblpr.a - .include "../Makefile.inc" Index: head/usr.sbin/lpr/chkprintcap/Makefile =================================================================== --- head/usr.sbin/lpr/chkprintcap/Makefile (revision 275053) +++ head/usr.sbin/lpr/chkprintcap/Makefile (revision 275054) @@ -1,14 +1,13 @@ # $FreeBSD$ .PATH: ${.CURDIR}/../common_source PROG= chkprintcap MAN= chkprintcap.8 SRCS= chkprintcap.c skimprintcap.c CFLAGS+= -I${.CURDIR}/../common_source -DPADD= ${LIBLPR} -LDADD= ${LIBLPR} +LIBADD= lpr .include Index: head/usr.sbin/lpr/lpc/Makefile =================================================================== --- head/usr.sbin/lpr/lpc/Makefile (revision 275053) +++ head/usr.sbin/lpr/lpc/Makefile (revision 275054) @@ -1,19 +1,18 @@ # From: @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ .PATH: ${.CURDIR}/../common_source PROG= lpc MAN= lpc.8 -SRCS= lpc.c cmds.c cmdtab.c movejobs.c +SRCS= lpc.c cmds.c cmdtab.c movejobs.c BINGRP= daemon BINMODE= 2555 CFLAGS+= -I${.CURDIR}/../common_source WARNS?= 0 -DPADD= ${LIBLPR} ${LIBEDIT} ${LIBTERMCAPW} -LDADD= ${LIBLPR} -ledit -ltermcapw +LIBADD= lpr edit .include Index: head/usr.sbin/lpr/lpd/Makefile =================================================================== --- head/usr.sbin/lpr/lpd/Makefile (revision 275053) +++ head/usr.sbin/lpr/lpd/Makefile (revision 275054) @@ -1,15 +1,14 @@ # From: @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ PROG= lpd MAN= lpd.8 SRCS= lpd.c printjob.c recvjob.c lpdchar.c modes.c CFLAGS+= -I${.CURDIR}/../common_source WARNS?= 1 -DPADD= ${LIBLPR} -LDADD= ${LIBLPR} +LIBADD= lpr .include Index: head/usr.sbin/lpr/lpq/Makefile =================================================================== --- head/usr.sbin/lpr/lpq/Makefile (revision 275053) +++ head/usr.sbin/lpr/lpq/Makefile (revision 275054) @@ -1,16 +1,15 @@ # From: @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ BINDIR= /usr/bin PROG= lpq BINOWN= root BINGRP= daemon BINMODE= 6555 CFLAGS+= -I${.CURDIR}/../common_source -DPADD= ${LIBLPR} -LDADD= ${LIBLPR} +LIBADD= lpr .include Index: head/usr.sbin/lpr/lpr/Makefile =================================================================== --- head/usr.sbin/lpr/lpr/Makefile (revision 275053) +++ head/usr.sbin/lpr/lpr/Makefile (revision 275054) @@ -1,21 +1,20 @@ # From: @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ .PATH: ${.CURDIR}/../common_source BINDIR= /usr/bin PROG= lpr MAN= lpr.1 printcap.5 BINOWN= root BINGRP= daemon BINMODE= 6555 CFLAGS+= -I${.CURDIR}/../common_source WARNS?= 2 -DPADD= ${LIBLPR} -LDADD= ${LIBLPR} +LIBADD= lpr .include Index: head/usr.sbin/lpr/lprm/Makefile =================================================================== --- head/usr.sbin/lpr/lprm/Makefile (revision 275053) +++ head/usr.sbin/lpr/lprm/Makefile (revision 275054) @@ -1,18 +1,17 @@ # From: @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ .PATH: ${.CURDIR}/../common_source BINDIR= /usr/bin PROG= lprm BINOWN= root BINGRP= daemon BINMODE= 6555 CFLAGS+= -I${.CURDIR}/../common_source -DPADD= ${LIBLPR} -LDADD= ${LIBLPR} +LIBADD= lpr .include Index: head/usr.sbin/lpr/pac/Makefile =================================================================== --- head/usr.sbin/lpr/pac/Makefile (revision 275053) +++ head/usr.sbin/lpr/pac/Makefile (revision 275054) @@ -1,14 +1,13 @@ # From: @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ .PATH: ${.CURDIR}/../common_source PROG= pac MAN= pac.8 CFLAGS+= -I${.CURDIR}/../common_source -DPADD= ${LIBLPR} -LDADD= ${LIBLPR} +LIBADD= lpr .include Index: head/usr.sbin/mailstats/Makefile =================================================================== --- head/usr.sbin/mailstats/Makefile (revision 275053) +++ head/usr.sbin/mailstats/Makefile (revision 275054) @@ -1,37 +1,30 @@ # @(#)Makefile 8.2 (Berkeley) 9/21/96 # $FreeBSD$ SENDMAIL_DIR= ${.CURDIR}/../../contrib/sendmail .PATH: ${SENDMAIL_DIR}/mailstats PROG= mailstats SRCS= mailstats.c MAN= mailstats.8 CFLAGS+= -I${SENDMAIL_DIR}/src -I${SENDMAIL_DIR}/include -I. CFLAGS+= -DNOT_SENDMAIL WARNS?= 2 -LIBSMDIR= ${.OBJDIR}/../../lib/libsm -LIBSM= ${LIBSMDIR}/libsm.a - -LIBSMUTILDIR= ${.OBJDIR}/../../lib/libsmutil -LIBSMUTIL= ${LIBSMUTILDIR}/libsmutil.a - -DPADD= ${LIBSMUTIL} ${LIBSM} -LDADD= ${LIBSMUTIL} ${LIBSM} +LIBADD= sm smutil 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/usr.sbin/mailwrapper/Makefile =================================================================== --- head/usr.sbin/mailwrapper/Makefile (revision 275053) +++ head/usr.sbin/mailwrapper/Makefile (revision 275054) @@ -1,37 +1,36 @@ # $FreeBSD$ .include .if ${MK_MAILWRAPPER} != "no" PROG= mailwrapper MAN= mailwrapper.8 -DPADD= ${LIBUTIL} -LDADD= -lutil +LIBADD= util .endif .if ${MK_MAILWRAPPER} != "no" || ${MK_SENDMAIL} != "no" SYMLINKS= ${BINDIR}/mailwrapper /usr/sbin/sendmail \ ${BINDIR}/mailwrapper /usr/sbin/hoststat \ ${BINDIR}/mailwrapper /usr/sbin/purgestat \ ${BINDIR}/mailwrapper /usr/bin/newaliases \ ${BINDIR}/mailwrapper /usr/bin/mailq .if ${MK_MAILWRAPPER} == "no" && ${MK_SENDMAIL} != "no" SYMLINKS+= /usr/libexec/sendmail/sendmail ${BINDIR}/mailwrapper .endif .endif .if ${MK_MAILWRAPPER} != "no" && ${MK_SENDMAIL} == "no" SYMLINKS+= ${BINDIR}/mailwrapper /bin/rmail .endif .if ${MK_MAILWRAPPER} != "no" .if !exists(${DESTDIR}/etc/mail/mailer.conf) FILES= ${.CURDIR}/../../etc/mail/mailer.conf FILESDIR= /etc/mail FILESMODE= 644 .endif .endif .include Index: head/usr.sbin/makemap/Makefile =================================================================== --- head/usr.sbin/makemap/Makefile (revision 275053) +++ head/usr.sbin/makemap/Makefile (revision 275054) @@ -1,40 +1,30 @@ # @(#)Makefile 8.4 (Berkeley) 6/10/97 # $FreeBSD$ SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail .PATH: ${SENDMAIL_DIR}/makemap PROG= makemap SRCS= makemap.c MAN= makemap.8 CFLAGS+= -I${SENDMAIL_DIR}/src -I${SENDMAIL_DIR}/include -I. CFLAGS+= -DNEWDB -DNOT_SENDMAIL WARNS?= 2 -LIBSMDIR= ${.OBJDIR}/../../lib/libsm -LIBSM= ${LIBSMDIR}/libsm.a - -LIBSMDBDIR= ${.OBJDIR}/../../lib/libsmdb -LIBSMDB= ${LIBSMDBDIR}/libsmdb.a - -LIBSMUTILDIR= ${.OBJDIR}/../../lib/libsmutil -LIBSMUTIL= ${LIBSMUTILDIR}/libsmutil.a - -DPADD= ${LIBSMDB} ${LIBSMUTIL} ${LIBSM} -LDADD= ${LIBSMDB} ${LIBSMUTIL} ${LIBSM} +LIBADD= sm smdb smutil 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/usr.sbin/mfiutil/Makefile =================================================================== --- head/usr.sbin/mfiutil/Makefile (revision 275053) +++ head/usr.sbin/mfiutil/Makefile (revision 275054) @@ -1,19 +1,18 @@ # $FreeBSD$ PROG= mfiutil SRCS= mfiutil.c mfi_bbu.c mfi_cmd.c mfi_config.c mfi_drive.c mfi_evt.c \ mfi_flash.c mfi_patrol.c mfi_show.c mfi_volume.c mfi_foreign.c \ mfi_properties.c MAN8= mfiutil.8 CFLAGS.gcc+= -fno-builtin-strftime -DPADD= ${LIBUTIL} -LDADD= -lutil +LIBADD= util # Here be dragons .ifdef DEBUG CFLAGS+= -DDEBUG .endif .include Index: head/usr.sbin/mount_smbfs/Makefile =================================================================== --- head/usr.sbin/mount_smbfs/Makefile (revision 275053) +++ head/usr.sbin/mount_smbfs/Makefile (revision 275054) @@ -1,17 +1,16 @@ # $FreeBSD$ PROG= mount_smbfs SRCS= mount_smbfs.c getmntopts.c MAN= mount_smbfs.8 MOUNTDIR= ${.CURDIR}/../../sbin/mount CONTRIBDIR= ${.CURDIR}/../../contrib/smbfs CFLAGS+= -DSMBFS -I${MOUNTDIR} -I${CONTRIBDIR}/include -LDADD= -lsmb -lkiconv -DPADD= ${LIBSMB} ${LIBKICONV} +LIBADD= smb .PATH: ${CONTRIBDIR}/mount_smbfs .PATH: ${MOUNTDIR} .include Index: head/usr.sbin/mountd/Makefile =================================================================== --- head/usr.sbin/mountd/Makefile (revision 275053) +++ head/usr.sbin/mountd/Makefile (revision 275054) @@ -1,17 +1,16 @@ # From: @(#)Makefile 8.3 (Berkeley) 1/25/94 # $FreeBSD$ PROG= mountd SRCS= mountd.c getmntopts.c MAN= exports.5 netgroup.5 mountd.8 MOUNT= ${.CURDIR}/../../sbin/mount CFLAGS+= -I${MOUNT} WARNS?= 2 .PATH: ${MOUNT} -DPADD= ${LIBUTIL} -LDADD= -lutil +LIBADD= util .include Index: head/usr.sbin/moused/Makefile =================================================================== --- head/usr.sbin/moused/Makefile (revision 275053) +++ head/usr.sbin/moused/Makefile (revision 275054) @@ -1,12 +1,11 @@ # $FreeBSD$ PROG= moused MAN= moused.8 -DPADD= ${LIBUTIL} ${LIBM} -LDADD= -lutil -lm +LIBADD= m util #BINMODE=4555 #PRECIOUSPROG= .include Index: head/usr.sbin/mptutil/Makefile =================================================================== --- head/usr.sbin/mptutil/Makefile (revision 275053) +++ head/usr.sbin/mptutil/Makefile (revision 275054) @@ -1,19 +1,18 @@ # $FreeBSD$ PROG= mptutil SRCS= mptutil.c mpt_cam.c mpt_cmd.c mpt_config.c mpt_drive.c mpt_evt.c \ mpt_show.c mpt_volume.c # mpt_flash.c MAN= mptutil.8 WARNS?= 3 -DPADD= ${LIBCAM} ${LIBSBUF} ${LIBUTIL} -LDADD= -lcam -lsbuf -lutil +LIBADD= cam util # Here be dragons .ifdef DEBUG CFLAGS+= -DDEBUG .endif .include Index: head/usr.sbin/mtree/Makefile =================================================================== --- head/usr.sbin/mtree/Makefile (revision 275053) +++ head/usr.sbin/mtree/Makefile (revision 275054) @@ -1,22 +1,21 @@ # From: @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ .include .PATH: ${.CURDIR}/../../usr.bin/cksum PROG= fmtree MAN= fmtree.8 SRCS= compare.c crc.c create.c excludes.c misc.c mtree.c spec.c verify.c SRCS+= specspec.c CFLAGS+= -DMD5 -DSHA1 -DRMD160 -DSHA256 -DPADD= ${LIBMD} -LDADD= -lmd +LIBADD= md CLEANFILES+= fmtree.8 fmtree.8: mtree.8 cp -f ${.ALLSRC} ${.TARGET} .include Index: head/usr.sbin/nandtool/Makefile =================================================================== --- head/usr.sbin/nandtool/Makefile (revision 275053) +++ head/usr.sbin/nandtool/Makefile (revision 275054) @@ -1,11 +1,10 @@ # $FreeBSD$ PROG= nandtool SRCS= nandtool.c nand_read.c nand_write.c nand_erase.c nand_info.c SRCS+= nand_readoob.c nand_writeoob.c BINDIR= /usr/sbin -DPADD= ${LIBGEOM} -LDADD= -lgeom +LIBADD= geom MAN= nandtool.8 .include Index: head/usr.sbin/ndiscvt/Makefile =================================================================== --- head/usr.sbin/ndiscvt/Makefile (revision 275053) +++ head/usr.sbin/ndiscvt/Makefile (revision 275054) @@ -1,31 +1,30 @@ # $FreeBSD$ .PATH: ${.CURDIR}/../../sys/compat/ndis PROG= ndiscvt SRCS= ndiscvt.c SRCS+= subr_pe.c SRCS+= inf.c inf-token.l inf-parse.y y.tab.h MAN= ndiscvt.8 MAN+= ndisgen.8 WARNS?= 4 NO_WCAST_ALIGN= -DPADD= ${LIBL} -LDADD= -ll +LIBADD= l YFLAGS+=-v CFLAGS+=-I. -I${.CURDIR} -I${.CURDIR}/../../sys CLEANFILES= y.output FILES= windrv_stub.c FILESNAME= windrv_stub.c FILESDIR= /usr/share/misc SCRIPTS= ndisgen.sh .include Index: head/usr.sbin/ngctl/Makefile =================================================================== --- head/usr.sbin/ngctl/Makefile (revision 275053) +++ head/usr.sbin/ngctl/Makefile (revision 275054) @@ -1,29 +1,27 @@ # $FreeBSD$ # $Whistle: Makefile,v 1.3 1999/01/16 00:10:11 archie Exp $ .include PROG= ngctl MAN= ngctl.8 SRCS= main.c mkpeer.c config.c connect.c dot.c name.c show.c list.c \ msg.c debug.c shutdown.c rmhook.c status.c types.c write.c WARNS?= 3 .if defined(RELEASE_CRUNCH) NGCTL_NO_LIBEDIT= .endif .if ${MK_LIBTHR} == "no" NGCTL_NO_LIBEDIT= .endif -DPADD= ${LIBNETGRAPH} -LDADD= -lnetgraph +LIBADD= netgraph .if !defined(NGCTL_NO_LIBEDIT) CFLAGS+= -DEDITLINE -DPADD+= ${LIBPTHREAD} ${LIBEDIT} ${LIBTERMCAPW} -LDADD+= -lpthread -ledit -ltermcapw +LIBADD+= edit pthread .endif .include Index: head/usr.sbin/nghook/Makefile =================================================================== --- head/usr.sbin/nghook/Makefile (revision 275053) +++ head/usr.sbin/nghook/Makefile (revision 275054) @@ -1,11 +1,10 @@ # $FreeBSD$ # $Whistle: Makefile,v 1.4 1999/01/16 04:44:33 archie Exp $ PROG= nghook MAN= nghook.8 SRCS= main.c -DPADD= ${LIBNETGRAPH} -LDADD= -lnetgraph +LIBADD= netgraph .include Index: head/usr.sbin/nmtree/Makefile =================================================================== --- head/usr.sbin/nmtree/Makefile (revision 275053) +++ head/usr.sbin/nmtree/Makefile (revision 275054) @@ -1,28 +1,26 @@ # $FreeBSD$ .include .PATH: ${.CURDIR}/../../contrib/mtree PROG= mtree MAN= mtree.5 mtree.8 SRCS= compare.c crc.c create.c excludes.c getid.c misc.c mtree.c \ only.c spec.c specspec.c verify.c -DPADD+= ${LIBMD} ${LIBUTIL} -LDADD+= -lmd -lutil CFLAGS+= -I${.CURDIR}/../../contrib/mknod .PATH: ${.CURDIR}/../../contrib/mknod SRCS+= pack_dev.c CFLAGS+= -I${.CURDIR}/../../lib/libnetbsd -LIBADD= netbsd +LIBADD= netbsd md util LINKS= ${BINDIR}/mtree ${BINDIR}/nmtree MLINKS= mtree.8 nmtree.8 .if ${MK_TESTS} != "no" SUBDIR+= tests .endif .include Index: head/usr.sbin/nscd/Makefile =================================================================== --- head/usr.sbin/nscd/Makefile (revision 275053) +++ head/usr.sbin/nscd/Makefile (revision 275054) @@ -1,16 +1,16 @@ # $FreeBSD$ PROG= nscd MAN= nscd.conf.5 nscd.8 WARNS?= 3 SRCS= agent.c nscd.c nscdcli.c cachelib.c cacheplcs.c debug.c log.c \ config.c query.c mp_ws_query.c mp_rs_query.c singletons.c protocol.c \ parser.c CFLAGS+= -DCONFIG_PATH="\"${PREFIX}/etc/nscd.conf\"" -DPADD= ${LIBM} ${LIBPTHREAD} ${LIBUTIL} -LDADD= -lm -lpthread -lutil + +LIBADD= util pthread .PATH: ${.CURDIR}/agents .include "${.CURDIR}/agents/Makefile.inc" .include Index: head/usr.sbin/ntp/Makefile.inc =================================================================== --- head/usr.sbin/ntp/Makefile.inc (revision 275053) +++ head/usr.sbin/ntp/Makefile.inc (revision 275054) @@ -1,23 +1,19 @@ # $FreeBSD$ .include DEFS_LOCAL= -DPARSE -DHAVE_CONFIG_H NTPDEFS= -DSYS_FREEBSD # CLOCKDEFS= # -DLOCAL_CLOCK -DPST -DWWVB -DAS2201 -DGOES -DGPSTM -DOMEGA \ # -DLEITCH -DTRAK -DACTS -DATOM -DDATUM -DHEATH -DMSFEES \ # -DMX4200 -DNMEA -DBOEDER CFLAGS+= ${NTPDEFS} ${DEFS_LOCAL} ${CLOCKDEFS} .if ${MK_OPENSSL} != "no" && !defined(RELEASE_CRUNCH) CFLAGS+= -DOPENSSL .endif -LIBOPTS= ${.OBJDIR}/../libopts/libopts.a -LIBPARSE= ${.OBJDIR}/../libparse/libparse.a -LIBNTP= ${.OBJDIR}/../libntp/libntp.a - WARNS?= 0 .include "../Makefile.inc" Index: head/usr.sbin/ntp/ntp-keygen/Makefile =================================================================== --- head/usr.sbin/ntp/ntp-keygen/Makefile (revision 275053) +++ head/usr.sbin/ntp/ntp-keygen/Makefile (revision 275054) @@ -1,24 +1,22 @@ # $FreeBSD$ MAN= .include .PATH: ${.CURDIR}/../../../contrib/ntp/util \ ${.CURDIR}/../../../contrib/ntp/ntpd PROG= ntp-keygen SRCS= ntp-keygen.c ntp-keygen-opts.c CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../ \ -I${.CURDIR}/../../../contrib/ntp/libopts -DPADD= ${LIBNTP} ${LIBOPTS} -LDADD= ${LIBNTP} ${LIBOPTS} +LIBADD+= ntp opts .if ${MK_OPENSSL} != "no" -DPADD+= ${LIBMD} ${LIBCRYPTO} -LDADD+= -lmd -lcrypto +LIBADD+= md crypto .endif .include Index: head/usr.sbin/ntp/ntpd/Makefile =================================================================== --- head/usr.sbin/ntp/ntpd/Makefile (revision 275053) +++ head/usr.sbin/ntp/ntpd/Makefile (revision 275054) @@ -1,48 +1,46 @@ # $FreeBSD$ MAN= .include .PATH: ${.CURDIR}/../../../contrib/ntp/ntpd PROG= ntpd SRCS= cmd_args.c ntp_config.c \ ntp_control.c ntp_crypto.c ntp_filegen.c \ ntp_intres.c ntp_io.c ntp_loopfilter.c \ ntp_monitor.c ntp_peer.c ntp_proto.c \ ntp_refclock.c ntp_request.c \ ntp_restrict.c ntp_timer.c ntp_util.c \ ntpd.c refclock_acts.c refclock_arbiter.c \ refclock_arc.c refclock_as2201.c refclock_atom.c \ refclock_bancomm.c refclock_chronolog.c refclock_chu.c \ refclock_conf.c refclock_datum.c refclock_dumbclock.c \ refclock_fg.c refclock_gpsvme.c refclock_heath.c \ refclock_hopfpci.c refclock_hopfser.c refclock_hpgps.c \ refclock_irig.c refclock_jupiter.c refclock_leitch.c \ refclock_local.c refclock_msfees.c refclock_mx4200.c \ refclock_neoclock4x.c refclock_nmea.c refclock_oncore.c \ refclock_palisade.c refclock_parse.c refclock_pcf.c \ refclock_pst.c refclock_ripencc.c \ refclock_shm.c refclock_tpro.c refclock_trak.c refclock_true.c \ refclock_ulink.c refclock_wwv.c \ refclock_wwvb.c ntpd-opts.c \ version.c CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../ \ -I${.CURDIR}/../../../contrib/ntp/libopts -I${.CURDIR} -DPADD= ${LIBPARSE} ${LIBNTP} ${LIBM} ${LIBMD} ${LIBRT} ${LIBOPTS} -LDADD= ${LIBPARSE} ${LIBNTP} -lm -lmd -lrt ${LIBOPTS} +LIBADD= parse ntp m rt opts md .if ${MK_OPENSSL} != "no" -DPADD+= ${LIBCRYPTO} -LDADD+= -lcrypto +LIBADD+= crypto .endif CLEANFILES+= .version version.c version.c: sh -e ${.CURDIR}/../scripts/mkver ntpd .include Index: head/usr.sbin/ntp/ntpdate/Makefile =================================================================== --- head/usr.sbin/ntp/ntpdate/Makefile (revision 275053) +++ head/usr.sbin/ntp/ntpdate/Makefile (revision 275054) @@ -1,19 +1,18 @@ # $FreeBSD$ .PATH: ${.CURDIR}/../../../contrib/ntp/ntpdate PROG= ntpdate MAN= SRCS= ntpdate.c version.c CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../ -DPADD= ${LIBNTP} ${LIBM} ${LIBMD} ${LIBRT} -LDADD= ${LIBNTP} -lm -lmd -lrt +LIBADD= md rt ntp CLEANFILES+= .version version.c version.c: sh -e ${.CURDIR}/../scripts/mkver ntpdate .include Index: head/usr.sbin/ntp/ntpdc/Makefile =================================================================== --- head/usr.sbin/ntp/ntpdc/Makefile (revision 275053) +++ head/usr.sbin/ntp/ntpdc/Makefile (revision 275054) @@ -1,31 +1,27 @@ # $FreeBSD$ MAN= .include .PATH: ${.CURDIR}/../../../contrib/ntp/ntpdc PROG= ntpdc SRCS= ntpdc.c ntpdc_ops.c ntpdc-opts.c version.c CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../ \ -I${.CURDIR}/../../../contrib/ntp/libopts -DPADD= ${LIBNTP} ${LIBM} ${LIBMD} ${LIBOPTS} -LDADD= ${LIBNTP} -lm -lmd ${LIBOPTS} - -DPADD+= ${LIBEDIT} ${LIBTERMCAPW} -LDADD+= -ledit -ltermcapw +LIBADD= edit md ntp opts CFLAGS+= -DHAVE_LIBEDIT -DHAVE_READLINE_READLINE_H \ -I${DESTDIR}/${INCLUDEDIR}/edit CLEANFILES+= .version version.c version.c: sh -e ${.CURDIR}/../scripts/mkver ntpdc afterinstall: rm -f ${DESTDIR}/usr/sbin/xntpdc .include Index: head/usr.sbin/ntp/ntpq/Makefile =================================================================== --- head/usr.sbin/ntp/ntpq/Makefile (revision 275053) +++ head/usr.sbin/ntp/ntpq/Makefile (revision 275054) @@ -1,30 +1,26 @@ # $FreeBSD$ MAN= .include .PATH: ${.CURDIR}/../../../contrib/ntp/ntpq BINDIR= /usr/bin PROG= ntpq SRCS= ntpq.c ntpq-opts.c ntpq-subs.c version.c CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../ \ -I${.CURDIR}/../../../contrib/ntp/libopts -DPADD= ${LIBNTP} ${LIBM} ${LIBMD} ${LIBOPTS} -LDADD= ${LIBNTP} -lm -lmd ${LIBOPTS} - -DPADD+= ${LIBEDIT} ${LIBTERMCAPW} -LDADD+= -ledit -ltermcapw +LIBADD+= edit md ntp opts CFLAGS+= -DHAVE_LIBEDIT -DHAVE_READLINE_READLINE_H \ -I${DESTDIR}/${INCLUDEDIR}/edit CLEANFILES+= .version version.c version.c: sh -e ${.CURDIR}/../scripts/mkver ntpq .include Index: head/usr.sbin/ntp/ntptime/Makefile =================================================================== --- head/usr.sbin/ntp/ntptime/Makefile (revision 275053) +++ head/usr.sbin/ntp/ntptime/Makefile (revision 275054) @@ -1,13 +1,12 @@ # $FreeBSD$ .PATH: ${.CURDIR}/../../../contrib/ntp/util PROG= ntptime MAN= CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../ -DPADD= ${LIBNTP} -LDADD= ${LIBNTP} +LIBADD= ntp .include Index: head/usr.sbin/ntp/sntp/Makefile =================================================================== --- head/usr.sbin/ntp/sntp/Makefile (revision 275053) +++ head/usr.sbin/ntp/sntp/Makefile (revision 275054) @@ -1,16 +1,15 @@ # $FreeBSD$ .PATH: ${.CURDIR}/../../../contrib/ntp/sntp PROG= sntp MAN= sntp.1 SRCS= internet.c main.c socket.c timing.c unix.c CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../ \ -DPACKAGE=\"sntp\" -DVERSION=\"1.6\" \ -I${.CURDIR}/../../../contrib/ntp/libopts -DPADD= ${LIBM} ${LIBOPTS} -LDADD= -lm ${LIBOPTS} +LIBADD= m opts .include Index: head/usr.sbin/pkg/Makefile =================================================================== --- head/usr.sbin/pkg/Makefile (revision 275053) +++ head/usr.sbin/pkg/Makefile (revision 275054) @@ -1,14 +1,11 @@ # $FreeBSD$ PROG= pkg SRCS= pkg.c dns_utils.c config.c MAN= pkg.7 CFLAGS+=-I${.CURDIR}/../../contrib/libucl/include .PATH: ${.CURDIR}/../../contrib/libucl/include -DPADD= ${LIBARCHIVE} ${LIBFETCH} ${LIBUCL} ${LIBSBUF} ${LIBSSL} \ - ${LIBCRYPTO} ${LIBM} -LDADD= -larchive -lfetch ${LDUCL} -lsbuf -lssl -lcrypto -lm -USEPRIVATELIB= ucl +LIBADD= archive fetch ucl sbuf crypto .include Index: head/usr.sbin/pmccontrol/Makefile =================================================================== --- head/usr.sbin/pmccontrol/Makefile (revision 275053) +++ head/usr.sbin/pmccontrol/Makefile (revision 275054) @@ -1,13 +1,12 @@ # # $FreeBSD$ # PROG= pmccontrol MAN= pmccontrol.8 -DPADD= ${LIBPMC} -LDADD= -lpmc +LIBADD+= pmc SRCS= pmccontrol.c .include Index: head/usr.sbin/pmcstat/Makefile =================================================================== --- head/usr.sbin/pmcstat/Makefile (revision 275053) +++ head/usr.sbin/pmcstat/Makefile (revision 275054) @@ -1,15 +1,14 @@ # # $FreeBSD$ # PROG= pmcstat MAN= pmcstat.8 -DPADD= ${LIBELF} ${LIBKVM} ${LIBPMC} ${LIBM} ${LIBNCURSESW} -LDADD= -lelf -lkvm -lpmc -lm -lncursesw +LIBADD= elf kvm pmc m ncursesw SRCS= pmcstat.c pmcstat.h pmcstat_log.c \ pmcpl_callgraph.c pmcpl_gprof.c pmcpl_annotate.c \ pmcpl_annotate_cg.c pmcpl_calltree.c .include Index: head/usr.sbin/powerd/Makefile =================================================================== --- head/usr.sbin/powerd/Makefile (revision 275053) +++ head/usr.sbin/powerd/Makefile (revision 275054) @@ -1,9 +1,8 @@ # $FreeBSD$ PROG= powerd MAN= powerd.8 -DPADD= ${LIBUTIL} -LDADD= -lutil +LIBADD= util .include Index: head/usr.sbin/ppp/Makefile =================================================================== --- head/usr.sbin/ppp/Makefile (revision 275053) +++ head/usr.sbin/ppp/Makefile (revision 275054) @@ -1,114 +1,108 @@ # $FreeBSD$ .include PROG= ppp MAN= ppp.8 SRCS= acf.c arp.c async.c auth.c bundle.c cbcp.c ccp.c chap.c chat.c \ command.c datalink.c deflate.c defs.c exec.c filter.c fsm.c hdlc.c \ iface.c ip.c ipcp.c ipv6cp.c iplist.c lcp.c link.c log.c lqr.c main.c \ mbuf.c mp.c ncp.c ncpaddr.c pap.c physical.c pred.c probe.c prompt.c \ proto.c route.c server.c sig.c slcompress.c sync.c systems.c tcp.c \ tcpmss.c throughput.c timer.c tty.c tun.c udp.c vjcomp.c WARNS?= 3 .if defined(RELEASE_CRUNCH) CFLAGS+=-DRELEASE_CRUNCH PPP_NO_ATM= PPP_NO_DES= PPP_NO_KLDLOAD= PPP_NO_NAT= PPP_NO_PAM= PPP_NO_RADIUS= PPP_NO_SUID= .endif .if ${MK_ATM} == "no" PPP_NO_ATM= .endif .if ${MK_NETGRAPH} == "no" PPP_NO_NETGRAPH= .endif .if ${MK_PAM_SUPPORT} == "no" PPP_NO_PAM= .endif .if defined(PPP_NO_SUID) BINMODE=554 .else BINMODE=4554 BINOWN= root .endif BINGRP= network M4FLAGS= -LDADD= -lcrypt -lmd -lutil -lz -DPADD= ${LIBCRYPT} ${LIBMD} ${LIBUTIL} ${LIBZ} +LIBADD= md util z .if defined(PPP_CONFDIR) && !empty(PPP_CONFDIR) CFLAGS+=-DPPP_CONFDIR=\"${PPP_CONFDIR}\" .endif .if defined(PPP_NO_KLDLOAD) CFLAGS+=-DNOKLDLOAD .endif .if ${MK_INET6_SUPPORT} == "no" CFLAGS+=-DNOINET6 .endif .if defined(PPP_NO_NAT) CFLAGS+=-DNONAT .else SRCS+= nat_cmd.c -LDADD+= -lalias -DPADD+= ${LIBALIAS} +LIBADD+= alias .endif .if defined(PPP_NO_ATM) CFLAGS+=-DNOATM .else SRCS+= atm.c .endif .if defined(PPP_NO_SUID) CFLAGS+=-DNOSUID .else SRCS+= id.c .endif .if ${MK_OPENSSL} == "no" || defined(PPP_NO_DES) CFLAGS+=-DNODES .else SRCS+= chap_ms.c mppe.c -LDADD+= -lcrypto -DPADD+= ${LIBCRYPTO} +LIBADD+= crypto .endif .if defined(PPP_NO_RADIUS) CFLAGS+=-DNORADIUS .else SRCS+= radius.c -LDADD+= -lradius -DPADD+= ${LIBRADIUS} +LIBADD+= radius .endif .if defined(PPP_NO_NETGRAPH) CFLAGS+=-DNONETGRAPH .else SRCS+= ether.c -LDADD+= -lnetgraph -DPADD+= ${LIBNETGRAPH} +LIBADD+= netgraph .if defined(EXPERIMENTAL_NETGRAPH) CFLAGS+=-DEXPERIMENTAL_NETGRAPH SRCS+= netgraph.c .endif .endif .if defined(PPP_NO_PAM) CFLAGS+=-DNOPAM .else -LDADD+= ${MINUSLPAM} -DPADD+= ${LIBPAM} +LIBADD+= pam .endif .include Index: head/usr.sbin/pppctl/Makefile =================================================================== --- head/usr.sbin/pppctl/Makefile (revision 275053) +++ head/usr.sbin/pppctl/Makefile (revision 275054) @@ -1,11 +1,10 @@ # $FreeBSD$ PROG= pppctl MAN= pppctl.8 WARNS?= 2 -DPADD= ${LIBPTHREAD} ${LIBEDIT} ${LIBTERMCAPW} -LDADD= -lpthread -ledit -ltermcapw +LIBADD= edit pthread .include Index: head/usr.sbin/praliases/Makefile =================================================================== --- head/usr.sbin/praliases/Makefile (revision 275053) +++ head/usr.sbin/praliases/Makefile (revision 275054) @@ -1,40 +1,30 @@ # @(#)Makefile 8.2 (Berkeley) 9/21/96 # $FreeBSD$ SENDMAIL_DIR= ${.CURDIR}/../../contrib/sendmail .PATH: ${SENDMAIL_DIR}/praliases PROG= praliases SRCS= praliases.c MAN= praliases.8 CFLAGS+= -I${SENDMAIL_DIR}/src -I${SENDMAIL_DIR}/include -I. CFLAGS+= -DNEWDB -DNOT_SENDMAIL WARNS?= 2 -LIBSMDIR= ${.OBJDIR}/../../lib/libsm -LIBSM= ${LIBSMDIR}/libsm.a - -LIBSMDBDIR= ${.OBJDIR}/../../lib/libsmdb -LIBSMDB= ${LIBSMDBDIR}/libsmdb.a - -LIBSMUTILDIR= ${.OBJDIR}/../../lib/libsmutil -LIBSMUTIL= ${LIBSMUTILDIR}/libsmutil.a - -DPADD= ${LIBSMDB} ${LIBSMUTIL} ${LIBSM} -LDADD= ${LIBSMDB} ${LIBSMUTIL} ${LIBSM} +LIBADD= sm smdb smutil SRCS+= sm_os.h CLEANFILES+=sm_os.h # User customizations to the sendmail build environment CFLAGS+= ${SENDMAIL_CFLAGS} LDFLAGS+=${SENDMAIL_LDFLAGS} DPADD+= ${SENDMAIL_DPADD} LDADD+= ${SENDMAIL_LDADD} sm_os.h: ln -sf ${SENDMAIL_DIR}/include/sm/os/sm_os_freebsd.h sm_os.h .include Index: head/usr.sbin/praudit/Makefile =================================================================== --- head/usr.sbin/praudit/Makefile (revision 275053) +++ head/usr.sbin/praudit/Makefile (revision 275054) @@ -1,16 +1,15 @@ # # $FreeBSD$ # OPENBSMDIR=${.CURDIR}/../../contrib/openbsm .PATH: ${OPENBSMDIR}/bin/praudit PROG= praudit MAN= praudit.1 WARNS?= 3 -DPADD= ${LIBBSM} -LDADD= -lbsm +LIBADD= bsm .include Index: head/usr.sbin/pstat/Makefile =================================================================== --- head/usr.sbin/pstat/Makefile (revision 275053) +++ head/usr.sbin/pstat/Makefile (revision 275054) @@ -1,12 +1,11 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ PROG= pstat LINKS= ${BINDIR}/pstat ${BINDIR}/swapinfo MAN= pstat.8 MLINKS= pstat.8 swapinfo.8 -DPADD= ${LIBKVM} ${LIBUTIL} -LDADD= -lkvm -lutil +LIBADD= kvm util .include Index: head/usr.sbin/quotaon/Makefile =================================================================== --- head/usr.sbin/quotaon/Makefile (revision 275053) +++ head/usr.sbin/quotaon/Makefile (revision 275054) @@ -1,12 +1,11 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ PROG= quotaon LINKS= ${BINDIR}/quotaon ${BINDIR}/quotaoff MAN= quotaon.8 MLINKS= quotaon.8 quotaoff.8 -DPADD= ${LIBUTIL} -LDADD= -lutil +LIBADD= util .include Index: head/usr.sbin/rarpd/Makefile =================================================================== --- head/usr.sbin/rarpd/Makefile (revision 275053) +++ head/usr.sbin/rarpd/Makefile (revision 275054) @@ -1,14 +1,13 @@ # from: @(#)Makefile 5.8 (Berkeley) 7/28/90 # $FreeBSD$ PROG= rarpd MAN= rarpd.8 -DPADD= ${LIBUTIL} -LDADD= -lutil +LIBADD= util WARNS?= 3 # This breaks with format strings returned by expand_syslog_m().. argh! #FORMAT_AUDIT?= 1 .include Index: head/usr.sbin/repquota/Makefile =================================================================== --- head/usr.sbin/repquota/Makefile (revision 275053) +++ head/usr.sbin/repquota/Makefile (revision 275054) @@ -1,9 +1,8 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ PROG= repquota MAN= repquota.8 -DPADD= ${LIBUTIL} -LDADD= -lutil +LIBADD= util .include Index: head/usr.sbin/rpc.lockd/Makefile =================================================================== --- head/usr.sbin/rpc.lockd/Makefile (revision 275053) +++ head/usr.sbin/rpc.lockd/Makefile (revision 275054) @@ -1,29 +1,28 @@ # $NetBSD: Makefile,v 1.12 2000/08/07 16:23:31 thorpej Exp $ # $FreeBSD$ PROG= rpc.lockd MAN= rpc.lockd.8 MLINKS= rpc.lockd.8 lockd.8 SRCS= kern.c nlm_prot_svc.c lockd.c lock_proc.c lockd_lock.c CFLAGS+= -I. -I${DESTDIR}/usr/include/rpcsvc WARNS?= 3 -DPADD= ${LIBRPCSVC} ${LIBUTIL} -LDADD= -lrpcsvc -lutil +LIBADD= rpcsvc util CLEANFILES= nlm_prot_svc.c nlm_prot.h test RPCSRC= ${DESTDIR}/usr/include/rpcsvc/nlm_prot.x RPCGEN= RPCGEN_CPP=${CPP:Q} rpcgen -L -C nlm_prot_svc.c: ${RPCSRC} ${RPCGEN} -m -o ${.TARGET} ${RPCSRC} nlm_prot.h: ${RPCSRC} ${RPCGEN} -h -o ${.TARGET} ${RPCSRC} test: ${.CURDIR}/test.c cc -o test ${.CURDIR}/test.c -lrpcsvc .include Index: head/usr.sbin/rpc.statd/Makefile =================================================================== --- head/usr.sbin/rpc.statd/Makefile (revision 275053) +++ head/usr.sbin/rpc.statd/Makefile (revision 275054) @@ -1,27 +1,26 @@ # $FreeBSD$ PROG= rpc.statd MAN= rpc.statd.8 SRCS= file.c sm_inter_svc.c sm_inter.h statd.c procs.c CFLAGS+= -I. WARNS?= 2 -DPADD= ${LIBRPCSVC} -LDADD= -lrpcsvc +LIBADD= rpcsvc CLEANFILES= sm_inter_svc.c sm_inter.h RPCSRC= ${DESTDIR}/usr/include/rpcsvc/sm_inter.x RPCGEN= RPCGEN_CPP=${CPP:Q} rpcgen -L -C sm_inter_svc.c: ${RPCSRC} ${RPCGEN} -m -o ${.TARGET} ${RPCSRC} sm_inter.h: ${RPCSRC} ${RPCGEN} -h -o ${.TARGET} ${RPCSRC} test: test.c cc -o test test.c -lrpcsvc .include Index: head/usr.sbin/rpc.yppasswdd/Makefile =================================================================== --- head/usr.sbin/rpc.yppasswdd/Makefile (revision 275053) +++ head/usr.sbin/rpc.yppasswdd/Makefile (revision 275054) @@ -1,62 +1,61 @@ # $FreeBSD$ RPCDIR= ${DESTDIR}/usr/include/rpcsvc .PATH: ${.CURDIR}/../../usr.sbin/ypserv ${.CURDIR}/../../usr.bin/chpass \ ${.CURDIR}/../../libexec/ypxfr ${RPCDIR} PROG= rpc.yppasswdd SCRIPTS=yppwupdate SCRIPTSDIR= /usr/libexec MAN= rpc.yppasswdd.8 SRCS= util.c yp_access.c yp_dblookup.c yp_dbwrite.c \ yp_error.c yppasswdd_main.c yppasswdd_server.c ypxfr_misc.c ${GENSRCS} GENSRCS=yp.h yp_clnt.c yppasswd.h yppasswd_private.h yppasswd_private_svc.c \ yppasswd_private_xdr.c yppasswd_svc.c WARNS?= 5 CFLAGS+= -fno-strict-aliasing CFLAGS+= -I${.CURDIR}/../../usr.sbin/vipw \ -I${.CURDIR}/../../usr.sbin/ypserv \ -I${.CURDIR}/../../libexec/ypxfr \ -I${.CURDIR} -I. -DPADD= ${LIBRPCSVC} ${LIBCRYPT} ${LIBUTIL} -LDADD= -lrpcsvc -lcrypt -lutil +LIBADD= rpcsvc crypt util CLEANFILES= ${GENSRCS} RPCGEN= RPCGEN_CPP=${CPP:Q} rpcgen -I -C # We need to remove the 'static' keyword from _rpcsvcstate so that # yppasswdd_main.c can see it. yppasswd_svc.c: yppasswd.x rm -f ${.TARGET} ${RPCGEN} -m ${RPCDIR}/yppasswd.x | \ sed s/"static int _rpcsvcstate"/"int _rpcsvcstate"/g > ${.TARGET} yppasswd.h: yppasswd.x rm -f ${.TARGET} ${RPCGEN} -h -o ${.TARGET} ${RPCDIR}/yppasswd.x yp.h: yp.x rm -f ${.TARGET} ${RPCGEN} -h -o ${.TARGET} ${RPCDIR}/yp.x yp_clnt.c: yp.x rm -f ${.TARGET} ${RPCGEN} -DYPSERV_ONLY -l -o ${.TARGET} ${RPCDIR}/yp.x yppasswd_private.h: yppasswd_private.x rm -f ${.TARGET} ${RPCGEN} -h -o ${.TARGET} ${.CURDIR}/yppasswd_private.x yppasswd_private_xdr.c: yppasswd_private.x rm -f ${.TARGET} ${RPCGEN} -c -o ${.TARGET} ${.CURDIR}/yppasswd_private.x yppasswd_private_svc.c: yppasswd_private.x rm -f ${.TARGET} ${RPCGEN} -m ${.CURDIR}/yppasswd_private.x | \ sed s/"static int _rpcsvcstate = _IDLE"/"extern int _rpcsvcstate"/g > ${.TARGET} .include Index: head/usr.sbin/rpc.ypupdated/Makefile =================================================================== --- head/usr.sbin/rpc.ypupdated/Makefile (revision 275053) +++ head/usr.sbin/rpc.ypupdated/Makefile (revision 275054) @@ -1,34 +1,33 @@ # $FreeBSD$ .PATH: ${.CURDIR}/../ypserv ${.CURDIR}/../../libexec/ypxfr PROG= rpc.ypupdated MAN= SRCS= ypupdate_prot_svc.c ypupdate_prot.h ypupdated_main.c \ yp_error.c update.c ypupdated_server.c \ yp_dblookup.c yp_dbwrite.c yp_dbdelete.c yp_dbupdate.c #CFLAGS+= -DYP CFLAGS+= -I${.CURDIR}/../ypserv -I. -I${.CURDIR}/../../libexec/ypxfr WARNS?= 1 -DPADD= ${LIBRPCSVC} -LDADD= -lrpcsvc +LIBADD= rpcsvc CLEANFILES= ypupdate_prot_svc.c ypupdate_prot.h RPCDIR= ${DESTDIR}/usr/include/rpcsvc RPCGEN= RPCGEN_CPP=${CPP:Q} rpcgen -I -C # We need to remove the 'static' keyword from _rpcsvcstate so that # ypupdated_main.c can see it. ypupdate_prot_svc.c: ${RPCDIR}/ypupdate_prot.x rm -f ${.TARGET} ${RPCGEN} -m ${RPCDIR}/ypupdate_prot.x | \ sed s/"static int _rpcsvcstate"/"int _rpcsvcstate"/g > ${.TARGET} ypupdate_prot.h: ${RPCDIR}/ypupdate_prot.x ${RPCGEN} -h -o ${.TARGET} ${RPCDIR}/ypupdate_prot.x .include Index: head/usr.sbin/rpc.ypxfrd/Makefile =================================================================== --- head/usr.sbin/rpc.ypxfrd/Makefile (revision 275053) +++ head/usr.sbin/rpc.ypxfrd/Makefile (revision 275054) @@ -1,37 +1,36 @@ # $FreeBSD$ .PATH: ${.CURDIR}/../../usr.sbin/ypserv PROG= rpc.ypxfrd MAN= rpc.ypxfrd.8 SRCS= ypxfrd_svc.c ypxfrd.h ypxfrd_server.c yp_error.c \ yp_access.c ypxfrd_main.c CFLAGS+= -I. -DXFRBLOCKSIZE=65535 WARNS?= 2 -DPADD= ${LIBRPCSVC} -LDADD= -lrpcsvc +LIBADD= rpcsvc CLEANFILES= ypxfrd_svc.c ypxfrd.h RPCDIR= ${.CURDIR}/../../include/rpcsvc RPCGEN= RPCGEN_CPP=${CPP:Q} rpcgen -I -C # We need to remove the 'static' keyword from _rpcsvcstate so that # ypxfrd_main.c can see it. ypxfrd_svc.c: ${RPCDIR}/ypxfrd.x rm -f ${.TARGET} ${RPCGEN} -m ${RPCDIR}/ypxfrd.x | \ sed s/"static int _rpcsvcstate"/"int _rpcsvcstate"/g > ${.TARGET} # 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/usr.sbin/rpcbind/Makefile =================================================================== --- head/usr.sbin/rpcbind/Makefile (revision 275053) +++ head/usr.sbin/rpcbind/Makefile (revision 275054) @@ -1,22 +1,21 @@ # $NetBSD: Makefile,v 1.3 2000/06/20 13:56:43 fvdl Exp $ # $FreeBSD$ .include PROG= rpcbind MAN= rpcbind.8 SRCS= check_bound.c rpcb_stat.c rpcb_svc_4.c rpcbind.c pmap_svc.c \ rpcb_svc.c rpcb_svc_com.c security.c warmstart.c util.c CFLAGS+= -DPORTMAP -DLIBWRAP .if ${MK_INET6_SUPPORT} != "no" CFLAGS+= -DINET6 .endif WARNS?= 1 -DPADD= ${LIBWRAP} -LDADD= -lwrap +LIBADD= wrap .include Index: head/usr.sbin/rrenumd/Makefile =================================================================== --- head/usr.sbin/rrenumd/Makefile (revision 275053) +++ head/usr.sbin/rrenumd/Makefile (revision 275054) @@ -1,38 +1,37 @@ # Copyright (c) 1996 WIDE Project. All rights reserved. # # Redistribution and use in source and binary forms, with or without # modifications, are permitted provided that the above copyright notice # and this paragraph are duplicated in all such forms and that any # documentation, advertising materials, and other materials related to # such distribution and use acknowledge that the software was developed # by the WIDE Project, Japan. The name of the Project may not be used to # endorse or promote products derived from this software without # specific prior written permission. THIS SOFTWARE IS PROVIDED ``AS IS'' # AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, WITHOUT # LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR # A PARTICULAR PURPOSE. # # $FreeBSD$ PROG= rrenumd MAN= rrenumd.conf.5 rrenumd.8 SRCS= rrenumd.c parser.y lexer.l CFLAGS+= -DIPSEC -I. -I${.CURDIR} YFLAGS= -d WARNS?= 2 -LDADD= -lipsec -ll -ly -DPADD= ${LIBIPSEC} ${LIBL} ${LIBY} +LIBADD= ipsec l y CLEANFILES= y.tab.h SRCS+= y.tab.h y.tab.h: parser.y .if defined(YACCDEBUG) CFLAGS+= -DYYDEBUG YFLAGS+= -t -v .endif .include Index: head/usr.sbin/rtadvd/Makefile =================================================================== --- head/usr.sbin/rtadvd/Makefile (revision 275053) +++ head/usr.sbin/rtadvd/Makefile (revision 275054) @@ -1,29 +1,28 @@ # Copyright (c) 1996 WIDE Project. All rights reserved. # # Redistribution and use in source and binary forms, with or without # modifications, are permitted provided that the above copyright notice # and this paragraph are duplicated in all such forms and that any # documentation, advertising materials, and other materials related to # such distribution and use acknowledge that the software was developed # by the WIDE Project, Japan. The name of the Project may not be used to # endorse or promote products derived from this software without # specific prior written permission. THIS SOFTWARE IS PROVIDED ``AS IS'' # AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, WITHOUT # LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR # A PARTICULAR PURPOSE. # # $FreeBSD$ PROG= rtadvd MAN= rtadvd.conf.5 rtadvd.8 SRCS= rtadvd.c rrenum.c advcap.c if.c config.c timer.c timer_subr.c \ control.c control_server.c -DPADD= ${LIBUTIL} -LDADD= -lutil +LIBADD= util CFLAGS+= -DHAVE_ARC4RANDOM WARNS?= 1 .include Index: head/usr.sbin/rtsold/Makefile =================================================================== --- head/usr.sbin/rtsold/Makefile (revision 275053) +++ head/usr.sbin/rtsold/Makefile (revision 275054) @@ -1,27 +1,26 @@ # Copyright (c) 1996 WIDE Project. All rights reserved. # # Redistribution and use in source and binary forms, with or without # modifications, are permitted provided that the above copyright notice # and this paragraph are duplicated in all such forms and that any # documentation, advertising materials, and other materials related to # such distribution and use acknowledge that the software was developed # by the WIDE Project, Japan. The name of the Project may not be used to # endorse or promote products derived from this software without # specific prior written permission. THIS SOFTWARE IS PROVIDED ``AS IS'' # AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, WITHOUT # LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR # A PARTICULAR PURPOSE. # # $FreeBSD$ PROG= rtsold MAN= rtsold.8 MLINKS= rtsold.8 rtsol.8 SRCS= rtsold.c rtsol.c if.c probe.c dump.c rtsock.c WARNS?= 3 CFLAGS+= -DHAVE_ARC4RANDOM -DHAVE_POLL_H -DPADD= ${LIBKVM} -LDADD= -lkvm +LIBADD= kvm .include Index: head/usr.sbin/sendmail/Makefile =================================================================== --- head/usr.sbin/sendmail/Makefile (revision 275053) +++ head/usr.sbin/sendmail/Makefile (revision 275054) @@ -1,79 +1,68 @@ # @(#)Makefile 8.8 (Berkeley) 3/28/97 # $FreeBSD$ .include SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail SMDIR= ${SENDMAIL_DIR}/src .PATH: ${SMDIR} BINDIR= /usr/libexec/sendmail PROG= sendmail MAN= mailq.1 newaliases.1 aliases.5 sendmail.8 MLINKS+=sendmail.8 hoststat.8 MLINKS+=sendmail.8 purgestat.8 SRCS= alias.c arpadate.c bf.c collect.c conf.c control.c \ convtime.c daemon.c deliver.c domain.c envelope.c err.c headers.c \ macro.c main.c map.c mci.c milter.c mime.c parseaddr.c queue.c \ ratectrl.c readcf.c recipient.c savemail.c sasl.c sfsasl.c \ shmticklib.c sm_resolve.c srvrsmtp.c stab.c stats.c sysexits.c \ timers.c tls.c trace.c udb.c usersmtp.c util.c version.c BINOWN= root BINGRP= smmsp .ifdef SENDMAIL_SET_USER_ID BINMODE=4555 .else BINMODE=2555 .endif # Define the database format to use for aliases et al. DBMDEF= -DNEWDB # If you don't want NIS alias/map support, comment out this line .if ${MK_NIS} != "no" NIS= -DNIS .endif # Map extensions MAPS= -DMAP_REGEX -DDNSMAP CFLAGS+= -I${SMDIR} -I${SENDMAIL_DIR}/include -I. CFLAGS+= ${DBMDEF} ${NIS} -DTCPWRAPPERS ${MAPS} .if ${MK_INET6_SUPPORT} != "no" CFLAGS+= -DNETINET6 .endif WARNS?= 1 -DPADD= ${LIBUTIL} ${LIBWRAP} -LDADD= -lutil -lwrap +LIBADD= util wrap sm smutil -LIBSMDIR= ${.OBJDIR}/../../lib/libsm -LIBSM= ${LIBSMDIR}/libsm.a - -LIBSMUTILDIR= ${.OBJDIR}/../../lib/libsmutil -LIBSMUTIL= ${LIBSMUTILDIR}/libsmutil.a - -DPADD+= ${LIBSMUTIL} ${LIBSM} -LDADD+= ${LIBSMUTIL} ${LIBSM} - SRCS+= sm_os.h CLEANFILES+=sm_os.h .if ${MK_OPENSSL} != "no" # STARTTLS support CFLAGS+= -DSTARTTLS -D_FFR_TLS_1 -DPADD+= ${LIBSSL} ${LIBCRYPTO} -LDADD+= -lssl -lcrypto +LIBADD+= ssl crypto .endif # 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/usr.sbin/services_mkdb/Makefile =================================================================== --- head/usr.sbin/services_mkdb/Makefile (revision 275053) +++ head/usr.sbin/services_mkdb/Makefile (revision 275054) @@ -1,10 +1,9 @@ # $FreeBSD$ PROG= services_mkdb MAN= services_mkdb.8 SRCS= services_mkdb.c uniq.c extern.h -DPADD+= ${LIBUTIL} -LDADD+= -lutil +LIBADD= util .include Index: head/usr.sbin/snapinfo/Makefile =================================================================== --- head/usr.sbin/snapinfo/Makefile (revision 275053) +++ head/usr.sbin/snapinfo/Makefile (revision 275054) @@ -1,10 +1,9 @@ # $FreeBSD$ # PROG= snapinfo MAN= snapinfo.8 -DPADD= ${LIBUFS} -LDADD= -lufs +LIBADD= ufs -.include +.include Index: head/usr.sbin/spray/Makefile =================================================================== --- head/usr.sbin/spray/Makefile (revision 275053) +++ head/usr.sbin/spray/Makefile (revision 275054) @@ -1,9 +1,8 @@ # $FreeBSD$ PROG= spray MAN= spray.8 -DPADD= ${LIBRPCSVC} -LDADD= -lrpcsvc +LIBADD= rpcsvc .include Index: head/usr.sbin/syslogd/Makefile =================================================================== --- head/usr.sbin/syslogd/Makefile (revision 275053) +++ head/usr.sbin/syslogd/Makefile (revision 275054) @@ -1,23 +1,22 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ .include .PATH: ${.CURDIR}/../../usr.bin/wall PROG= syslogd MAN= syslog.conf.5 syslogd.8 SRCS= syslogd.c ttymsg.c -DPADD= ${LIBUTIL} -LDADD= -lutil +LIBADD= util WARNS?= 3 .if ${MK_INET6_SUPPORT} != "no" CFLAGS+= -DINET6 .endif CFLAGS+= -I${.CURDIR}/../../usr.bin/wall .include Index: head/usr.sbin/tcpdchk/Makefile =================================================================== --- head/usr.sbin/tcpdchk/Makefile (revision 275053) +++ head/usr.sbin/tcpdchk/Makefile (revision 275054) @@ -1,23 +1,22 @@ # $FreeBSD$ .include .PATH: ${.CURDIR}/../../contrib/tcp_wrappers PROG= tcpdchk MAN= tcpdchk.8 SRCS= tcpdchk.c fakelog.c inetcf.c scaffold.c CFLAGS+=-DREAL_DAEMON_DIR=\"/usr/libexec\" \ -DSEVERITY=LOG_INFO -DRFC931_TIMEOUT=10 -DPROCESS_OPTIONS \ -DHOSTS_DENY=\"/etc/hosts.deny\" -DHOSTS_ALLOW=\"/etc/hosts.allow\" .if ${MK_INET6_SUPPORT} != "no" CFLAGS+=-DINET6 .endif WARNS?= 0 -DPADD= ${LIBWRAP} -LDADD= -lwrap +LIBADD= wrap .include Index: head/usr.sbin/tcpdmatch/Makefile =================================================================== --- head/usr.sbin/tcpdmatch/Makefile (revision 275053) +++ head/usr.sbin/tcpdmatch/Makefile (revision 275054) @@ -1,22 +1,21 @@ # $FreeBSD$ .include .PATH: ${.CURDIR}/../../contrib/tcp_wrappers PROG= tcpdmatch MAN= tcpdmatch.8 SRCS= tcpdmatch.c fakelog.c inetcf.c scaffold.c CFLAGS+=-DREAL_DAEMON_DIR=\"/usr/libexec\" \ -DSEVERITY=LOG_INFO -DRFC931_TIMEOUT=10 .if ${MK_INET6_SUPPORT} != "no" CFLAGS+=-DINET6 .endif WARNS?= 0 -DPADD= ${LIBWRAP} -LDADD= -lwrap +LIBADD= wrap .include Index: head/usr.sbin/tcpdump/tcpdump/Makefile =================================================================== --- head/usr.sbin/tcpdump/tcpdump/Makefile (revision 275053) +++ head/usr.sbin/tcpdump/tcpdump/Makefile (revision 275054) @@ -1,188 +1,185 @@ # $FreeBSD$ .include TCPDUMP_DISTDIR?= ${.CURDIR}/../../../contrib/tcpdump .PATH: ${TCPDUMP_DISTDIR} PROG= tcpdump SRCS= addrtoname.c \ af.c \ checksum.c \ cpack.c \ gmpls.c \ gmt2local.c \ in_cksum.c \ ipproto.c \ l2vpn.c \ machdep.c \ nlpid.c \ oui.c \ parsenfsfh.c \ print-802_11.c \ print-802_15_4.c \ print-ah.c \ print-aodv.c \ print-ap1394.c \ print-arcnet.c \ print-arp.c \ print-ascii.c \ print-atalk.c \ print-atm.c \ print-beep.c \ print-bfd.c \ print-bgp.c \ print-bootp.c \ print-bt.c \ print-carp.c \ print-cdp.c \ print-cfm.c \ print-chdlc.c \ print-cip.c \ print-cnfp.c \ print-dccp.c \ print-decnet.c \ print-domain.c \ print-dtp.c \ print-dvmrp.c \ print-eap.c \ print-egp.c \ print-eigrp.c \ print-enc.c \ print-esp.c \ print-ether.c \ print-fddi.c \ print-forces.c \ print-fr.c \ print-gre.c \ print-hsrp.c \ print-icmp.c \ print-igmp.c \ print-igrp.c \ print-ip.c \ print-ipcomp.c \ print-ipfc.c \ print-ipnet.c \ print-ipx.c \ print-isakmp.c \ print-isoclns.c \ print-juniper.c \ print-krb.c \ print-l2tp.c \ print-lane.c \ print-ldp.c \ print-llc.c \ print-lldp.c \ print-lmp.c \ print-lspping.c \ print-lwapp.c \ print-lwres.c \ print-mobile.c \ print-mpcp.c \ print-mpls.c \ print-msdp.c \ print-msnlb.c \ print-nfs.c \ print-ntp.c \ print-null.c \ print-olsr.c \ print-ospf.c \ print-otv.c \ print-pgm.c \ print-pim.c \ print-ppi.c \ print-ppp.c \ print-pppoe.c \ print-pptp.c \ print-radius.c \ print-raw.c \ print-rip.c \ print-rpki-rtr.c \ print-rrcp.c \ print-rsvp.c \ print-rx.c \ print-sctp.c \ print-sflow.c \ print-sip.c \ print-sl.c \ print-sll.c \ print-slow.c \ print-smb.c \ print-snmp.c \ print-stp.c \ print-sunatm.c \ print-sunrpc.c \ print-symantec.c \ print-syslog.c \ print-tcp.c \ print-telnet.c \ print-tftp.c \ print-timed.c \ print-tipc.c \ print-token.c \ print-udld.c \ print-udp.c \ print-vjc.c \ print-vqp.c \ print-vrrp.c \ print-vtp.c \ print-vxlan.c \ print-wb.c \ print-zephyr.c \ print-zeromq.c \ setsignal.c \ signature.c \ smbutil.c \ tcpdump.c \ util.c \ version.c CLEANFILES+= version.c CFLAGS+= -I${.CURDIR} -I${TCPDUMP_DISTDIR} CFLAGS+= -DHAVE_CONFIG_H CFLAGS+= -D_U_="__attribute__((unused))" .if ${MK_INET6_SUPPORT} != "no" SRCS+= print-babel.c \ print-dhcp6.c \ print-frag6.c \ print-icmp6.c \ print-ip6.c \ print-ip6opts.c \ print-mobility.c \ print-ospf6.c \ print-ripng.c \ print-rt6.c CFLAGS+= -DINET6 .endif .if ${MACHINE_CPUARCH} != "i386" CFLAGS+= -DLBL_ALIGN .endif -DPADD= ${LIBL} ${LIBPCAP} -LDADD= -ll -lpcap +LIBADD= l pcap .if ${MK_CASPER} != "no" -DPADD+= ${LIBCAPSICUM} ${LIBNV} -LDADD+= -lcapsicum -lnv +LIBADD+= capsicum CFLAGS+=-DHAVE_LIBCAPSICUM .endif .if ${MK_OPENSSL} != "no" -DPADD+= ${LIBCRYPTO} -LDADD+= -lcrypto +LIBADD+= crypto CFLAGS+= -I${DESTDIR}/usr/include/openssl CFLAGS+= -DHAVE_LIBCRYPTO -DHAVE_OPENSSL_EVP_H .endif .if ${MK_PF} != "no" SRCS+= print-pflog.c \ print-pfsync.c CFLAGS+= -DHAVE_NET_PFVAR_H .endif version.c: ${TCPDUMP_DISTDIR}/VERSION rm -f version.c ; \ sed 's/.*/char version[] = "&";/' ${TCPDUMP_DISTDIR}/VERSION \ > version.c .include Index: head/usr.sbin/timed/timed/Makefile =================================================================== --- head/usr.sbin/timed/timed/Makefile (revision 275053) +++ head/usr.sbin/timed/timed/Makefile (revision 275054) @@ -1,17 +1,16 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ # # optional flags are: MEASURE TESTING DEBUG PROG= timed MAN= timed.8 SRCS= acksend.c candidate.c correct.c master.c networkdelta.c readmsg.c \ slave.c timed.c byteorder.c measure.c cksum.c -DPADD= ${LIBUTIL} -LDADD= -lutil +LIBADD= util WARNS?= 1 .include "../../Makefile.inc" .include Index: head/usr.sbin/traceroute/Makefile =================================================================== --- head/usr.sbin/traceroute/Makefile (revision 275053) +++ head/usr.sbin/traceroute/Makefile (revision 275054) @@ -1,42 +1,41 @@ # $FreeBSD$ TRACEROUTE_DISTDIR?= ${.CURDIR}/../../contrib/traceroute .PATH: ${TRACEROUTE_DISTDIR} PROG= traceroute MAN= traceroute.8 SRCS= as.c version.c traceroute.c ifaddrlist.c findsaddr-udp.c BINOWN= root BINMODE=4555 CLEANFILES= version.c CFLAGS+= -DHAVE_SYS_SELECT_H=1 -DHAVE_SYS_SOCKIO_H=1 \ -DHAVE_NET_ROUTE_H=1 -DHAVE_NET_IF_DL_H=1 \ -DHAVE_STRERROR=1 -DHAVE_USLEEP=1 \ -DHAVE_SYS_SYSCTL_H=1 -DBYTESWAP_IP_HDR=1 \ -DHAVE_SETLINEBUF=1 -DHAVE_RAW_OPTIONS=1 \ -DHAVE_SOCKADDR_SA_LEN=1 -DHAVE_ICMP_NEXTMTU=1 .if !defined(TRACEROUTE_NO_IPSEC) CFLAGS+= -DIPSEC .endif # RTT Jitter on the internet these days means printing 3 decimal places on # > 1000ms times is plain useless. Uncomment this to enable variable precision # reporting, ie: print a variable precision from 0.001ms through 1000ms # CFLAGS+= -DSANE_PRECISION .if !defined(TRACEROUTE_NO_IPSEC) -DPADD= ${LIBIPSEC} -LDADD= -lipsec +LIBADD+= ipsec .endif CFLAGS+= -I${TRACEROUTE_DISTDIR} WARNS?= 3 version.c: ${TRACEROUTE_DISTDIR}/VERSION @rm -f ${.TARGET} head -1 ${TRACEROUTE_DISTDIR}/VERSION | \ sed -e 's/.*/char version[] = "&";/' \ > ${.TARGET} .include Index: head/usr.sbin/traceroute6/Makefile =================================================================== --- head/usr.sbin/traceroute6/Makefile (revision 275053) +++ head/usr.sbin/traceroute6/Makefile (revision 275054) @@ -1,33 +1,32 @@ # Copyright (c) 1996 WIDE Project. All rights reserved. # # Redistribution and use in source and binary forms, with or without # modifications, are permitted provided that the above copyright notice # and this paragraph are duplicated in all such forms and that any # documentation, advertising materials, and other materials related to # such distribution and use acknowledge that the software was developed # by the WIDE Project, Japan. The name of the Project may not be used to # endorse or promote products derived from this software without # specific prior written permission. THIS SOFTWARE IS PROVIDED ``AS IS'' # AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, WITHOUT # LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR # A PARTICULAR PURPOSE. # $FreeBSD$ TRACEROUTE_DISTDIR?= ${.CURDIR}/../../contrib/traceroute .PATH: ${TRACEROUTE_DISTDIR} PROG= traceroute6 MAN= traceroute6.8 SRCS= as.c traceroute6.c BINOWN= root BINMODE= 4555 CFLAGS+= -DIPSEC -DUSE_RFC2292BIS -DHAVE_POLL CFLAGS+= -I${.CURDIR} -I${TRACEROUTE_DISTDIR} -I. WARNS?= 3 -DPADD= ${LIBIPSEC} -LDADD= -lipsec +LIBADD= ipsec .include Index: head/usr.sbin/tzsetup/Makefile =================================================================== --- head/usr.sbin/tzsetup/Makefile (revision 275053) +++ head/usr.sbin/tzsetup/Makefile (revision 275054) @@ -1,13 +1,12 @@ # $FreeBSD$ PROG= tzsetup MAN= tzsetup.8 CFLAGS+= -I${.CURDIR}/../../contrib/dialog -I. WARNS?= 3 -DPADD= ${LIBDIALOG} ${LIBNCURSESW} ${LIBM} -LDADD= -ldialog -lncursesw -lm +LIBADD= dialog ncursesw .include Index: head/usr.sbin/ugidfw/Makefile =================================================================== --- head/usr.sbin/ugidfw/Makefile (revision 275053) +++ head/usr.sbin/ugidfw/Makefile (revision 275054) @@ -1,9 +1,8 @@ # $FreeBSD$ PROG= ugidfw MAN= ugidfw.8 -DPADD= ${LIBUGIDFW} -LDADD= -lugidfw +LIBADD= ugidfw .include Index: head/usr.sbin/uhsoctl/Makefile =================================================================== --- head/usr.sbin/uhsoctl/Makefile (revision 275053) +++ head/usr.sbin/uhsoctl/Makefile (revision 275054) @@ -1,10 +1,9 @@ # $FreeBSD$ PROG= uhsoctl MAN= uhsoctl.1 WARNS?= 1 -DPADD= ${LIBUTIL} -LDADD= -lutil +LIBADD= util .include Index: head/usr.sbin/unbound/anchor/Makefile =================================================================== --- head/usr.sbin/unbound/anchor/Makefile (revision 275053) +++ head/usr.sbin/unbound/anchor/Makefile (revision 275054) @@ -1,18 +1,16 @@ # $FreeBSD$ # Vendor sources and generated files LDNSDIR= ${.CURDIR}/../../../contrib/ldns UNBOUNDDIR= ${.CURDIR}/../../../contrib/unbound EXPATDIR= ${.CURDIR}/../../../contrib/expat .PATH: ${UNBOUNDDIR} ${UNBOUNDDIR}/smallapp ${UNBOUNDDIR}/doc PROG= unbound-anchor SRCS= unbound-anchor.c CFLAGS= -I${UNBOUNDDIR} -I${LDNSDIR} -I${EXPATDIR}/lib -DPADD= ${LIBUNBOUND} ${LIBLDNS} ${LIBUTIL} ${LIBBSDXML} ${LIBSSL} ${LIBCRYPTO} ${LIBPTHREAD} -LDADD= ${LDUNBOUND} ${LDLDNS} -lutil -lbsdxml -lssl -lcrypto -lpthread -USEPRIVATELIB= ldns +LIBADD= unbound bsdxml ssl crypto pthread MAN= unbound-anchor.8 .include Index: head/usr.sbin/unbound/checkconf/Makefile =================================================================== --- head/usr.sbin/unbound/checkconf/Makefile (revision 275053) +++ head/usr.sbin/unbound/checkconf/Makefile (revision 275054) @@ -1,17 +1,15 @@ # $FreeBSD$ # Vendor sources and generated files LDNSDIR= ${.CURDIR}/../../../contrib/ldns UNBOUNDDIR= ${.CURDIR}/../../../contrib/unbound .PATH: ${UNBOUNDDIR} ${UNBOUNDDIR}/smallapp ${UNBOUNDDIR}/doc PROG= unbound-checkconf SRCS= unbound-checkconf.c worker_cb.c CFLAGS= -I${UNBOUNDDIR} -I${LDNSDIR} -DPADD= ${LIBUNBOUND} ${LIBLDNS} ${LIBUTIL} ${LIBSSL} ${LIBCRYPTO} ${LIBPTHREAD} -LDADD= ${LDUNBOUND} ${LDLDNS} -lutil -lssl -lcrypto -lpthread -USEPRIVATELIB= ldns +LIBADD= unbound pthread MAN= unbound-checkconf.8 .include Index: head/usr.sbin/unbound/control/Makefile =================================================================== --- head/usr.sbin/unbound/control/Makefile (revision 275053) +++ head/usr.sbin/unbound/control/Makefile (revision 275054) @@ -1,18 +1,16 @@ # $FreeBSD$ # Vendor sources and generated files LDNSDIR= ${.CURDIR}/../../../contrib/ldns UNBOUNDDIR= ${.CURDIR}/../../../contrib/unbound .PATH: ${UNBOUNDDIR} ${UNBOUNDDIR}/smallapp ${UNBOUNDDIR}/doc PROG= unbound-control SCRIPTS= unbound-control-setup.sh SRCS= unbound-control.c worker_cb.c CFLAGS= -I${UNBOUNDDIR} -I${LDNSDIR} -DPADD= ${LIBUNBOUND} ${LIBLDNS} ${LIBUTIL} ${LIBSSL} ${LIBCRYPTO} ${LIBPTHREAD} -LDADD= ${LDUNBOUND} ${LDLDNS} -lutil -lssl -lcrypto -lpthread -USEPRIVATELIB= ldns +LIBADD= unbound crypto ssl pthread MAN= unbound-control.8 .include Index: head/usr.sbin/unbound/daemon/Makefile =================================================================== --- head/usr.sbin/unbound/daemon/Makefile (revision 275053) +++ head/usr.sbin/unbound/daemon/Makefile (revision 275054) @@ -1,17 +1,15 @@ # $FreeBSD$ # Vendor sources and generated files LDNSDIR= ${.CURDIR}/../../../contrib/ldns UNBOUNDDIR= ${.CURDIR}/../../../contrib/unbound .PATH: ${UNBOUNDDIR} ${UNBOUNDDIR}/daemon ${UNBOUNDDIR}/doc PROG= unbound SRCS= acl_list.c cachedump.c daemon.c remote.c stats.c unbound.c worker.c CFLAGS= -I${UNBOUNDDIR} -I${LDNSDIR} -DPADD= ${LIBUNBOUND} ${LIBLDNS} ${LIBUTIL} ${LIBSSL} ${LIBCRYPTO} ${LIBPTHREAD} -LDADD= ${LDUNBOUND} ${LDLDNS} -lutil -lssl -lcrypto -lpthread -USEPRIVATELIB= ldns +LIBADD= unbound util ssl crypto pthread MAN= unbound.8 unbound.conf.5 .include Index: head/usr.sbin/usbconfig/Makefile =================================================================== --- head/usr.sbin/usbconfig/Makefile (revision 275053) +++ head/usr.sbin/usbconfig/Makefile (revision 275054) @@ -1,10 +1,9 @@ # # $FreeBSD$ # PROG= usbconfig MAN= usbconfig.8 SRCS= usbconfig.c dump.c -DPADD+= ${LIBUSB} -LDADD+= -lusb +LIBADD= usb .include Index: head/usr.sbin/vipw/Makefile =================================================================== --- head/usr.sbin/vipw/Makefile (revision 275053) +++ head/usr.sbin/vipw/Makefile (revision 275054) @@ -1,10 +1,9 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ PROG= vipw MAN= vipw.8 -DPADD= ${LIBUTIL} -LDADD= -lutil +LIBADD= util .include Index: head/usr.sbin/watch/Makefile =================================================================== --- head/usr.sbin/watch/Makefile (revision 275053) +++ head/usr.sbin/watch/Makefile (revision 275054) @@ -1,11 +1,10 @@ # $FreeBSD$ PROG= watch MAN= watch.8 WARNS?= 2 -DPADD= ${LIBTERMCAPW} -LDADD= -ltermcapw +LIBADD= ncursesw .include Index: head/usr.sbin/watchdogd/Makefile =================================================================== --- head/usr.sbin/watchdogd/Makefile (revision 275053) +++ head/usr.sbin/watchdogd/Makefile (revision 275054) @@ -1,13 +1,12 @@ # $FreeBSD$ PROG= watchdogd LINKS= ${BINDIR}/watchdogd ${BINDIR}/watchdog MAN= watchdogd.8 watchdog.8 -LDADD= -lutil -DPADD= ${LIBUTIL} +LIBADD= util .include test: ${PROG} ./${PROG} -t 1.0 Index: head/usr.sbin/wpa/Makefile.crypto =================================================================== --- head/usr.sbin/wpa/Makefile.crypto (revision 275053) +++ head/usr.sbin/wpa/Makefile.crypto (revision 275054) @@ -1,133 +1,132 @@ # $FreeBSD$ .if ${MK_OPENSSL} != "no" && !defined(RELEASE_CRUNCH) SRCS+= crypto_openssl.c random.c sha1-prf.c sha256-prf.c -DPADD+= ${LIBSSL} ${LIBCRYPTO} -LDADD+= -lssl -lcrypto +LIBADD+= ssl crypto CFLAGS+= -DCONFIG_SHA256 .else CFLAGS+=-DCONFIG_CRYPTO_INTERNAL SRCS+= crypto_internal.c random.c CONFIG_INTERNAL_AES=y CONFIG_INTERNAL_DES=y CONFIG_INTERNAL_MD4=y CONFIG_INTERNAL_MD5=y CONFIG_INTERNAL_RC4=y CONFIG_INTERNAL_SHA1=y NEED_SHA256=y CONFIG_INTERNAL_SHA256=y CONFIG_INTERNAL_TLS=y CONFIG_INTERNAL_DH5=y CONFIG_INTERNAL_DH=y NEED_AES_ENC=true .endif .if defined(TLS_FUNCS) NEED_TLS_PRF=y .if defined(CONFIG_INTERNAL_TLS) CFLAGS+=-DCONFIG_INTERNAL_LIBTOMMATH \ -DCONFIG_TLS_INTERNAL_CLIENT SRCS+= asn1.c \ bignum.c \ crypto_internal-cipher.c \ crypto_internal-modexp.c \ crypto_internal-rsa.c \ pkcs1.c \ pkcs5.c \ pkcs8.c \ rsa.c \ tls_internal.c \ tlsv1_common.c \ tlsv1_record.c \ tlsv1_cred.c \ tlsv1_client.c \ tlsv1_client_write.c \ tlsv1_client_read.c \ x509v3.c NEED_DES=y NEED_MD4=y NEED_RC4=y .else CFLAGS+=-DEAP_TLS_OPENSSL SRCS+= tls_openssl.c .endif .endif .if defined(CONFIG_INTERNAL_AES) SRCS+= aes-internal.c \ aes-internal-dec.c \ aes-internal-enc.c .endif .if defined(NEED_AES_CBC) SRCS+= aes-cbc.c .endif .if defined(NEED_AES_EAX) SRCS+= aes-eax.c NEED_AES_CTR=y .endif .if defined(NEED_AES_CTR) SRCS+= aes-ctr.c .endif .if defined(NEED_AES_ENCBLOCK) SRCS+= aes-encblock.c .endif .if defined(NEED_AES_OMAC1) SRCS+= aes-omac1.c .endif .if defined(NEED_DES) .if defined(CONFIG_INTERNAL_DES) SRCS+= des-internal.c .endif .endif .if defined(NEED_MD4) .if defined(CONFIG_INTERNAL_MD4) SRCS+= md4-internal.c .endif .endif .if defined(CONFIG_INTERNAL_MD5) SRCS+= md5-internal.c .endif .if defined(NEED_FIPS186_2_PRF) .if defined(CONFIG_INTERNAL_SHA1) SRCS+= fips_prf_internal.c .else SRCS+= fips_prf_openssl.c .endif .endif .if defined(CONFIG_INTERNAL_RC4) SRCS+= rc4.c .endif .if defined(CONFIG_INTERNAL_SHA1) SRCS+= sha1-internal.c sha1-pbkdf2.c sha1.c sha1-prf.c .endif .if defined(NEED_SHA256) CFLAGS+=-DCONFIG_SHA256 SRCS+= sha256.c .if defined(CONFIG_INTERNAL_SHA256) SRCS+= sha256-internal.c sha256-prf.c .endif .endif .if defined(NEED_TLS_PRF) SRCS+= sha1-tlsprf.c .endif .if defined(CONFIG_INTERNAL_DH5) SRCS+= dh_group5.c .endif .if defined(CONFIG_INTERNAL_DH) SRCS+= dh_groups.c .endif Index: head/usr.sbin/wpa/hostapd/Makefile =================================================================== --- head/usr.sbin/wpa/hostapd/Makefile (revision 275053) +++ head/usr.sbin/wpa/hostapd/Makefile (revision 275054) @@ -1,123 +1,122 @@ # $FreeBSD$ .include .include "${.CURDIR}/../Makefile.inc" .PATH.c:${HOSTAPD_DISTDIR} \ ${WPA_DISTDIR}/src/drivers PROG= hostapd SRCS= accounting.c aes-wrap.c ap_config.c ap_drv_ops.c ap_mlme.c authsrv.c \ base64.c beacon.c chap.c common.c config_file.c ctrl_iface.c \ ctrl_iface_ap.c driver_common.c l2_packet_freebsd.c driver_bsd.c \ drivers.c drv_callbacks.c eap_common.c eap_peap_common.c \ eap_register.c eap_server.c eap_server_methods.c eap_user_db.c \ eapol_auth_dump.c eapol_auth_sm.c eloop.c gas.c gas_serv.c hostapd.c \ hs20.c http_client.c http_server.c httpread.c ieee802_11_auth.c \ ieee802_11_common.c ieee802_11_shared.c ieee802_1x.c ip_addr.c \ main.c md5.c ms_funcs.c os_unix.c peerkey_auth.c pmksa_cache_auth.c \ preauth_auth.c radius.c radius_client.c radius_das.c sta_info.c \ tkip_countermeasures.c upnp_xml.c utils.c uuid.c vlan_init.c \ wpa_auth.c wpa_auth_glue.c wpa_auth_ie.c wpa_common.c wpa_debug.c \ wpabuf.c wps.c wps_attr_build.c wps_attr_parse.c wps_attr_process.c \ wps_common.c wps_dev_attr.c wps_enrollee.c wps_hostapd.c \ wps_registrar.c wps_upnp.c wps_upnp_ap.c wps_upnp_event.c \ wps_upnp_ssdp.c wps_upnp_web.c MAN= hostapd.8 hostapd.conf.5 .if ${MK_EXAMPLES} != "no" FILESDIR= ${SHAREDIR}/examples/hostapd .PATH: ${HOSTAPD_DISTDIR} FILES= hostapd.conf hostapd.eap_user hostapd.wpa_psk .endif CFLAGS+=-DCONFIG_DRIVER_BSD \ -DHOSTAPD \ -DCONFIG_DRIVER_RADIUS_ACL \ -DCONFIG_RSN_PREAUTH \ -DCONFIG_PEERKEY \ -DCONFIG_WPS \ -DCONFIG_WPS2 \ -DCONFIG_WPS_UPNP \ -DCONFIG_INTERWORKING \ -DCONFIG_HS20 .if ${MK_INET6} != "no" CFLAGS+= -DCONFIG_IPV6 .endif #CFLAGS+= -g -DPADD+= ${LIBPCAP} ${LIBUTIL} -LDADD+= -lpcap -lutil +LIBADD+= pcap util # User customizations for wpa_supplicant/hostapd build environment CFLAGS+=${HOSTAPD_CFLAGS} #DPADD+=${HOSTAPD_DPADD} LDADD+=${HOSTAPD_LDADD} #LDFLAGS+=${HOSTAPD_LDFLAGS} CFLAGS+=-DDPKCS12_FUNCS \ -DEAP_SERVER \ -DEAP_SERVER_GTC \ -DEAP_SERVER_IDENTITY \ -DEAP_SERVER_MD5 \ -DEAP_SERVER_MSCHAPV2 \ -DEAP_SERVER_PEAP \ -DEAP_SERVER_TLS \ -DEAP_SERVER_TTLS \ -DEAP_TLS_FUNCS \ -DEAP_SERVER_WSC \ -DCONFIG_NO_DUMP_STATE SRCS+= dump_state.c \ eap_server_gtc.c \ eap_server_identity.c \ eap_server_md5.c \ eap_server_mschapv2.c \ eap_server_peap.c \ eap_server_tls.c \ eap_server_tls_common.c \ eap_server_ttls.c \ eap_server_wsc.c \ eap_wsc_common.c TLS_FUNCS=y .if !empty(CFLAGS:M*-DCONFIG_WPS) NEED_SIM_COMMON=y .endif .if !empty(CFLAGS:M*-DEAP_SERVER_AKA) SRCS+= eap_server_aka.c NEED_SIM_COMMON=y .endif .if !empty(CFLAGS:M*-DEAP_SERVER_SIM) SRCS+= eap_server_sim.c NEED_SIM_COMMON=y .endif .if defined(NEED_SIM_COMMON) SRCS+= eap_sim_common.c \ eap_sim_db.c NEED_AES_CBC=y NEED_FIPS186_2_PRF=y .endif .if !empty(CFLAGS:M*-DEAP_SERVER_GPSK) CFLAGS+=-DEAP_GPSK_SHA256 SRCS+= eap_server_gpsk.c \ eap_gpsk_common.c NEED_AES_OMAC1=y .endif .if !empty(CFLAGS:M*-DEAP_SERVER_PAX) SRCS+= eap_server_pax.c \ eap_pax_common.c .endif .if !empty(CFLAGS:M*-DEAP_SERVER_SAKE) SRCS+= eap_server_sake.c \ eap_sake_common.c .endif .include "${.CURDIR}/../Makefile.crypto" .include Index: head/usr.sbin/wpa/hostapd_cli/Makefile =================================================================== --- head/usr.sbin/wpa/hostapd_cli/Makefile (revision 275053) +++ head/usr.sbin/wpa/hostapd_cli/Makefile (revision 275054) @@ -1,18 +1,17 @@ # $FreeBSD$ .include "${.CURDIR}/../Makefile.inc" .PATH.c:${HOSTAPD_DISTDIR} PROG= hostapd_cli SRCS= common.c edit.c eloop.c hostapd_cli.c os_unix.c wpa_ctrl.c wpa_debug.c CFLAGS+= -DCONFIG_CTRL_IFACE CFLAGS+= -DCONFIG_CTRL_IFACE_UNIX -DPADD+= ${LIBUTIL} -LDADD+= -lutil +LIBADD+= util MAN= hostapd_cli.8 .include Index: head/usr.sbin/wpa/wpa_cli/Makefile =================================================================== --- head/usr.sbin/wpa/wpa_cli/Makefile (revision 275053) +++ head/usr.sbin/wpa/wpa_cli/Makefile (revision 275054) @@ -1,21 +1,20 @@ # $FreeBSD$ .include "${.CURDIR}/../Makefile.inc" .PATH.c:${WPA_SUPPLICANT_DISTDIR} PROG= wpa_cli SRCS= common.c edit.c eloop.c os_unix.c wpa_cli.c wpa_ctrl.c wpa_debug.c MAN= wpa_cli.8 CFLAGS+= -DCONFIG_CTRL_IFACE CFLAGS+= -DCONFIG_CTRL_IFACE_UNIX # enable use of d_type to identify unix domain sockets CFLAGS+= -D_DIRENT_HAVE_D_TYPE CFLAGS+= -DCONFIG_WPA_CLI_EDIT=y -LDADD+= -lutil -DPADD+= ${LIBUTIL} +LIBADD+= util .include Index: head/usr.sbin/wpa/wpa_passphrase/Makefile =================================================================== --- head/usr.sbin/wpa/wpa_passphrase/Makefile (revision 275053) +++ head/usr.sbin/wpa/wpa_passphrase/Makefile (revision 275054) @@ -1,19 +1,18 @@ # $FreeBSD$ .include "${.CURDIR}/../Makefile.inc" .PATH.c:${WPA_SUPPLICANT_DISTDIR} PROG= wpa_passphrase SRCS= common.c md5-internal.c md5.c os_unix.c sha1-internal.c sha1-pbkdf2.c sha1.c \ wpa_passphrase.c CFLAGS+= -DINTERNAL_SHA1 CFLAGS+= -DINTERNAL_MD5 -DPADD+= ${LIBUTIL} -LDADD+= -lutil +LIBADD+= util MAN= wpa_passphrase.8 .include Index: head/usr.sbin/wpa/wpa_priv/Makefile =================================================================== --- head/usr.sbin/wpa/wpa_priv/Makefile (revision 275053) +++ head/usr.sbin/wpa/wpa_priv/Makefile (revision 275054) @@ -1,17 +1,16 @@ # $FreeBSD$ .include "${.CURDIR}/../Makefile.inc" .PATH.c:${WPA_SUPPLICANT_DISTDIR} \ ${WPA_DISTDIR}/src/drivers PROG= wpa_priv SRCS= drivers.c os_unix.c eloop.c common.c wpa_debug.c wpabuf.c wpa_priv.c \ driver_common.c l2_packet_freebsd.c -DPADD+= ${LIBPCAP} -LDADD+= -lpcap +LIBADD= pcap .include "${.CURDIR}/../Makefile.crypto" .include Index: head/usr.sbin/wpa/wpa_supplicant/Makefile =================================================================== --- head/usr.sbin/wpa/wpa_supplicant/Makefile (revision 275053) +++ head/usr.sbin/wpa/wpa_supplicant/Makefile (revision 275054) @@ -1,153 +1,151 @@ # $FreeBSD$ .include .include "${.CURDIR}/../Makefile.inc" .PATH.c:${WPA_SUPPLICANT_DISTDIR} \ ${WPA_DISTDIR}/src/drivers PROG= wpa_supplicant SRCS= aes-unwrap.c base64.c blacklist.c bss.c common.c config.c \ config_file.c ctrl_iface.c ctrl_iface_unix.c driver_bsd.c \ driver_common.c driver_ndis.c driver_wired.c drivers.c \ eap_register.c eloop.c events.c gas.c gas_query.c hs20.c \ hs20_supplicant.c http_client.c http_server.c httpread.c \ ieee802_11_common.c interworking.c l2_packet_freebsd.c main.c \ md5.c notify.c offchannel.c os_unix.c peerkey.c pmksa_cache.c \ preauth.c scan.c upnp_xml.c uuid.c wpa.c wpa_common.c wpa_debug.c \ wpa_ft.c wpa_ie.c wpa_supplicant.c wpabuf.c wpas_glue.c wps.c \ wps_attr_build.c wps_attr_parse.c wps_attr_process.c \ wps_common.c wps_dev_attr.c wps_enrollee.c wps_registrar.c \ wps_supplicant.c wps_upnp.c wps_upnp_ap.c wps_upnp_event.c \ wps_upnp_ssdp.c wps_upnp_web.c Packet32.c MAN= wpa_supplicant.8 wpa_supplicant.conf.5 .if ${MK_EXAMPLES} != "no" FILESDIR= ${SHAREDIR}/examples/etc .PATH: ${WPA_SUPPLICANT_DISTDIR} FILES= wpa_supplicant.conf .endif CFLAGS+=-DCONFIG_BACKEND_FILE \ -DCONFIG_DEBUG_SYSLOG \ -DCONFIG_DRIVER_BSD \ -DCONFIG_DRIVER_NDIS \ -DCONFIG_DRIVER_WIRED \ -DCONFIG_PEERKEY \ -DCONFIG_SMARTCARD \ -DCONFIG_TERMINATE_ONLASTIF \ -DCONFIG_WPS \ -DCONFIG_WPS2 \ -DCONFIG_WPS_UPNP \ -DCONFIG_TLS=openssl \ -DCONFIG_IEEE80211R \ -DCONFIG_INTERWORKING \ -DCONFIG_PRIVSEP \ -DCONFIG_HS20 \ -DCONFIG_GAS \ -DPKCS12_FUNCS #CFLAGS+= -g -DPADD+= ${LIBPCAP} ${LIBUTIL} -LDADD+= -lpcap -lutil +LIBADD= pcap util # User customizations to the wpa_supplicant build environment CFLAGS+=${WPA_SUPPLICANT_CFLAGS} #DPADD+=${WPA_SUPPLICANT_DPADD} LDADD+=${WPA_SUPPLICANT_LDADD} #LDFLAGS+=${WPA_SUPPLICANT_LDFLAGS} .if ${MK_WPA_SUPPLICANT_EAPOL} != "no" CFLAGS+=-DEAP_GTC \ -DEAP_LEAP \ -DEAP_MD5 \ -DEAP_MSCHAPv2 \ -DEAP_OTP \ -DEAP_PEAP \ -DEAP_PSK \ -DEAP_TLS \ -DEAP_TTLS \ -DEAP_GTC \ -DEAP_OTP \ -DEAP_LEAP \ -DIEEE8021X_EAPOL SRCS+= chap.c \ eap.c \ eap_common.c \ eap_gtc.c \ eap_leap.c \ eap_md5.c \ eap_methods.c \ eap_mschapv2.c \ eap_otp.c \ eap_peap.c \ eap_peap_common.c \ eap_psk.c \ eap_psk_common.c \ eap_tls.c \ eap_tls_common.c \ eap_ttls.c \ eapol_supp_sm.c \ ms_funcs.c \ mschapv2.c TLS_FUNCS=y NEED_AES_EAX=y NEED_AES_ENCBLOCK=y NEED_AES_OMAC1=y .endif .if !empty(CFLAGS:M-DCONFIG_WPS) NEED_AES_CBC=y .endif .if !empty(CFLAGS:M*-DEAP_AKA) SRCS+= eap_aka.c NEED_SIM_COMMON=y NEED_AES_CBC=y .endif .if !empty(CFLAGS:M*-DEAP_SIM) SRCS+= eap_sim.c NEED_SIM_COMMON=y NEED_AES_CBC=y .endif .if defined(NEED_SIM_COMMON) SRCS+= eap_sim_common.c NEED_FIPS186_2_PRF=y .endif # PC/SC interface for smartcards (USIM, GSM SIM) # GSM/UMTS authentication algorithm (for EAP-SIM/EAP-AKA) # NB: requires devel/pcsc-lite # # WPA_SUPPLICANT_CFLAGS=-DEAP_AKA -DPCSC_FUNCS -I/usr/local/include/PCSC # WPA_SUPPLICANT_LDADD=-L/usr/local/lib # .if !empty(CFLAGS:M*-DPCSC_FUNCS) SRCS+= pcsc_funcs.c -DPADD+=${LIBPTHREAD} -LDADD+=-lpcsclite -lpthread +LIBADD+= pcslite pthread .endif .if !empty(CFLAGS:M*-DEAP_GPSK) CFLAGS+=-DEAP_GPSK_SHA256 SRCS+= eap_gpsk.c \ eap_gpsk_common.c NEED_AES_OMAC1=y .endif .if !empty(CFLAGS:M*-DEAP_PAX) SRCS+= eap_pax.c \ eap_pax_common.c .endif .if !empty(CFLAGS:M*-DEAP_SAKE) SRCS+= eap_sake.c \ eap_sake_common.c .endif .include "${.CURDIR}/../Makefile.crypto" .include Index: head/usr.sbin/ypserv/Makefile =================================================================== --- head/usr.sbin/ypserv/Makefile (revision 275053) +++ head/usr.sbin/ypserv/Makefile (revision 275054) @@ -1,44 +1,43 @@ # $FreeBSD$ RPCDIR= ${.CURDIR}/../../include/rpcsvc .PATH: ${RPCDIR} PROG= ypserv MAN= ypserv.8 ypinit.8 SRCS= yp_svc.c yp_server.c yp_dblookup.c yp_dnslookup.c \ ypxfr_clnt.c yp.h yp_main.c yp_error.c yp_access.c yp_svc_udp.c CFLAGS+= -DDB_CACHE -DTCP_WRAPPER -I. WARNS?= 0 -DPADD= ${LIBWRAP} -LDADD= -lwrap +LIBADD= wrap CLEANFILES= yp_svc.c ypxfr_clnt.c yp.h RPCGEN= RPCGEN_CPP=${CPP:Q} rpcgen -I -C # We need to remove the 'static' keyword from _rpcsvcstate so that # yp_main.c can see it. yp_svc.c: yp.x rm -f ${.TARGET} ${RPCGEN} -DYPSERV_ONLY -m ${RPCDIR}/yp.x | \ sed s/"static int _rpcsvcstate"/"int _rpcsvcstate"/g > ${.TARGET} ypxfr_clnt.c: yp.x ${RPCGEN} -DYPPUSH_ONLY -l -o ${.TARGET} ${RPCDIR}/yp.x yp.h: yp.x ${RPCGEN} -h -o ${.TARGET} ${RPCDIR}/yp.x FILES= Makefile.yp FILESNAME= Makefile.dist FILESDIR= /var/yp SCRIPTS= ypinit.sh .if !exists(${DESTDIR}${FILESDIR}/Makefile) SYMLINKS= ${FILESNAME} ${FILESDIR}/Makefile .endif .include