diff options
29 files changed, 80 insertions, 59 deletions
diff --git a/games/atc/Makefile b/games/atc/Makefile index 80305a1833475..933975a55a0eb 100644 --- a/games/atc/Makefile +++ b/games/atc/Makefile @@ -5,7 +5,7 @@ CFLAGS+=-DBSD -I${.CURDIR} -I. SRCS= extern.c grammar.c graphics.c input.c lex.c list.c log.c \ main.c tunable.c update.c MAN6= atc.6 -DPADD= ${usr/lib/libl.a ${LIBM} ${LIBTERMCAP} ${LIBCURSES} ${LIBCOMPAT} +DPADD= ${LIBL} ${LIBM} ${LIBCURSES} ${LIBTERMCAP} ${LIBCOMPAT} LDADD= -ll -lm -lcurses -ltermcap -lcompat GAMES= ATC_scores Game_List Killer crossover default easy game_2 CLEANFILES=grammar.c y.tab.h lex.c diff --git a/games/fortune/fortune/Makefile b/games/fortune/fortune/Makefile index 62f8182b8d451..bb3258f92e9a1 100644 --- a/games/fortune/fortune/Makefile +++ b/games/fortune/fortune/Makefile @@ -3,7 +3,7 @@ PROG= fortune MAN6= fortune.6 CFLAGS+=-DDEBUG -Wall -I${.CURDIR}/../strfile -DPADD= ${COMPAT} +DPADD= ${LIBCOMPAT} LDADD= -lcompat .include "${.CURDIR}/../../Makefile.inc" diff --git a/gnu/lib/libg++/Makefile b/gnu/lib/libg++/Makefile index 5b4ece6a71843..6ec09425ad6f8 100644 --- a/gnu/lib/libg++/Makefile +++ b/gnu/lib/libg++/Makefile @@ -1,5 +1,5 @@ # -# $Id: Makefile,v 1.11 1995/08/06 12:22:53 bde Exp $ +# $Id: Makefile,v 1.12 1996/08/30 02:09:09 peter Exp $ # SRCS= bitand.c bitany.c bitblt.c bitclear.c bitcopy.c bitcount.c \ bitinvert.c bitlcomp.c bitset1.c bitxor.c cleanup.c except.c \ @@ -29,8 +29,8 @@ NOMAN= noman CFLAGS+= -nostdinc -I${.CURDIR}/include -I/usr/include CXXFLAGS+= -I${.CURDIR}/include -I/usr/include/g++ -I/usr/include \ -nostdinc++ -LDADD+= -lcurses -lcompat -lgcc_pic -DPADD+= ${LIBCURSES} ${LIBCOMPAT} +DPADD= ${LIBCURSES} ${LIBCOMPAT} ${LIBGCC_PIC} +LDADD= -lcurses -lcompat -lgcc_pic .PATH: ${.CURDIR}/libiberty ${.CURDIR}/libio ${.CURDIR}/libg++ ${.CURDIR}/librx beforeinstall: diff --git a/gnu/usr.bin/man/man/Makefile b/gnu/usr.bin/man/man/Makefile index 7e7f22562f901..9aff7372dc772 100644 --- a/gnu/usr.bin/man/man/Makefile +++ b/gnu/usr.bin/man/man/Makefile @@ -4,11 +4,13 @@ BINOWN= man BINMODE=4555 .if exists(${.OBJDIR}/../lib) -LDADD= -L${.OBJDIR}/../lib -lman -CFLAGS+= -I${.OBJDIR}/../lib +LIBDESTDIR= ${.OBJDIR}/../lib .else -LDADD= -L${.CURDIR}/../lib/ -lman +LIBDESTDIR= ${.CURDIR}/../lib .endif +CFLAGS+= -I${LIBDESTDIR} +DPADD= ${LIBDESTDIR}/libman.a +LDADD= -L${LIBDESTDIR} -lman .if exists(${.OBJDIR}) MAN1= ${.OBJDIR}/man.1 @@ -16,7 +18,6 @@ MAN1= ${.OBJDIR}/man.1 MAN1= ${.CURDIR}/man.1 .endif -DPADD+= ${MAN1} CFLAGS+= -I${.CURDIR}/../lib -DSTDC_HEADERS -DPOSIX -DHAS_TROFF CFLAGS+= -DDO_COMPRESS -DALT_SYSTEMS -DSETREUID -DCATMODE=0664 CLEANFILES+= ${MAN1} diff --git a/gnu/usr.bin/man/manpath/Makefile b/gnu/usr.bin/man/manpath/Makefile index 8e55b99a43647..0eaccef4e79eb 100644 --- a/gnu/usr.bin/man/manpath/Makefile +++ b/gnu/usr.bin/man/manpath/Makefile @@ -2,10 +2,12 @@ PROG= manpath SRCS= manpath.c .if exists(${.OBJDIR}/../lib) -LDADD= -L${.OBJDIR}/../lib -lman +LIBDESTDIR= ${.OBJDIR}/../lib .else -LDADD= -L${.CURDIR}/../lib/ -lman +LIBDESTDIR= ${.CURDIR}/../lib .endif +DPADD= ${LIBDESTDIR}/libman.a +LDADD= -L${LIBDESTDIR} -lman .if exists(${.OBJDIR}) MAN1=${.OBJDIR}/manpath.1 @@ -13,7 +15,6 @@ MAN1=${.OBJDIR}/manpath.1 MAN1=${.CURDIR}/manpath.1 .endif -DPADD+= ${MAN1} CFLAGS+= -DMAIN -DSTDC_HEADERS -DPOSIX -DHAS_TROFF -DDO_UNCOMPRESS CFLAGS+= -DALT_SYSTEMS -I${.CURDIR}/../lib -I${.OBJDIR}/../lib CLEANFILES+= ${MAN1} diff --git a/lib/libcurses/Makefile b/lib/libcurses/Makefile index ec3aad1fd82e2..3d25222d6f8e5 100644 --- a/lib/libcurses/Makefile +++ b/lib/libcurses/Makefile @@ -1,9 +1,10 @@ # From: @(#)Makefile 8.2 (Berkeley) 1/2/94 -# $Id: Makefile,v 1.6 1995/08/06 12:23:33 bde Exp $ +# $Id: Makefile,v 1.7 1996/08/30 01:47:14 peter Exp $ CFLAGS+=#-DTFILE=\"/dev/ttyp0\" CFLAGS+=-D_CURSES_PRIVATE -I${.CURDIR} -LDADD+= -ltermcap +DPADD= ${LIBTERMCAP} +LDADD= -ltermcap LIB= curses SRCS= addbytes.c addch.c addnstr.c box.c clear.c clrtobot.c clrtoeol.c \ cr_put.c ctrace.c cur_hash.c curses.c delch.c deleteln.c delwin.c \ diff --git a/lib/libncurses/Makefile b/lib/libncurses/Makefile index dd32bad85c7e2..ae392838cb253 100644 --- a/lib/libncurses/Makefile +++ b/lib/libncurses/Makefile @@ -1,5 +1,5 @@ # Makefile for ncurses -# $Id: Makefile,v 1.17 1996/08/26 09:25:20 peter Exp $ +# $Id: Makefile,v 1.18 1996/08/30 01:58:36 peter Exp $ LIB= ncurses SHLIB_MAJOR= 3 @@ -16,7 +16,8 @@ SRCS= lib_kernel.c lib_pad.c lib_bkgd.c \ lib_insstr.c lib_insdel.c lib_twait.c lib_window.c copyright.c CFLAGS+= -I. -I${.CURDIR} -Wall -DMYTINFO -LDADD+= -lmytinfo +DPADD= ${LIBMYTINFO} +LDADD= -lmytinfo CLEANFILES+= lib_keyname.c keys.tries diff --git a/lib/libss/Makefile b/lib/libss/Makefile index 54c58e11b1a2f..44bf476cb4209 100644 --- a/lib/libss/Makefile +++ b/lib/libss/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.12 1996/06/24 04:23:28 jkh Exp $ +# $Id: Makefile,v 1.13 1996/08/30 02:04:37 peter Exp $ LIB= ss SRCS= ss_err.c data.c error.c execute_cmd.c help.c invocation.c list_rqs.c \ @@ -7,11 +7,12 @@ SRCS= ss_err.c data.c error.c execute_cmd.c help.c invocation.c list_rqs.c \ CFLAGS+= -I. -I${.CURDIR} -DPOSIX -DIN_LIBSS CLEANFILES+= ss ss_err.c ss_err.h std_rqs.c .if exists(${.OBJDIR}/../libcom_err) -LDADD+= -L${.OBJDIR}/../libcom_err +LIBDESTDIR= ${.OBJDIR}/../libcom_err .else -LDADD+= -L${.CURDIR}/../libcom_err +LIBDESTDIR= ${.CURDIR}/../libcom_err .endif -LDADD+= -lcom_err +DPADD= ${LIBDESTDIR}/libcom_err.a +LDADD= -L${LIBDESTDIR} -lcom_err ss_err.h ss_err.c: ${.CURDIR}/ss_err.et test -e ss_err.et || ln -s ${.CURDIR}/ss_err.et . diff --git a/lib/ncurses/ncurses/Makefile b/lib/ncurses/ncurses/Makefile index dd32bad85c7e2..ae392838cb253 100644 --- a/lib/ncurses/ncurses/Makefile +++ b/lib/ncurses/ncurses/Makefile @@ -1,5 +1,5 @@ # Makefile for ncurses -# $Id: Makefile,v 1.17 1996/08/26 09:25:20 peter Exp $ +# $Id: Makefile,v 1.18 1996/08/30 01:58:36 peter Exp $ LIB= ncurses SHLIB_MAJOR= 3 @@ -16,7 +16,8 @@ SRCS= lib_kernel.c lib_pad.c lib_bkgd.c \ lib_insstr.c lib_insdel.c lib_twait.c lib_window.c copyright.c CFLAGS+= -I. -I${.CURDIR} -Wall -DMYTINFO -LDADD+= -lmytinfo +DPADD= ${LIBMYTINFO} +LDADD= -lmytinfo CLEANFILES+= lib_keyname.c keys.tries diff --git a/libexec/telnetd/Makefile b/libexec/telnetd/Makefile index 0164c5d9861f5..4a93d76567a69 100644 --- a/libexec/telnetd/Makefile +++ b/libexec/telnetd/Makefile @@ -9,10 +9,10 @@ CFLAGS+=-I${.CURDIR}/../../lib SRCS= global.c slc.c state.c sys_term.c telnetd.c \ termstat.c utility.c #SRCS+= authenc.c -DPADD= ${LIBUTIL} ${LIBTERMCAP} +DPADD= ${LIBUTIL} ${LIBTERMCAP} ${LIBTELNET} LDADD= -lutil -ltermcap -ltelnet +#DPADD+= $LIBKRB} ${LIBDES} #LDADD+= -lkrb -ldes MAN8= telnetd.8 - .include <bsd.prog.mk> diff --git a/libexec/xtend/Makefile b/libexec/xtend/Makefile index a01ed65c95bd5..041145caed62e 100644 --- a/libexec/xtend/Makefile +++ b/libexec/xtend/Makefile @@ -1,12 +1,13 @@ # Makefile for xtend (Stark) 10/30/93 -# $Id: Makefile,v 1.2 1995/04/18 01:53:56 jkh Exp $ +# $Id: Makefile,v 1.3 1996/09/04 22:22:54 bde Exp $ BINMODE= 555 PROG= xtend SRCS= xtend.c status.c packet.c user.c CFLAGS+= -DXTENUNAME=\"xten\" -DXTENGNAME=\"xten\" -LDADD+= -lutil +DPADD= ${LIBUTIL} +LDADD= -lutil MAN8= xtend.8 diff --git a/libexec/ypxfr/Makefile b/libexec/ypxfr/Makefile index 2beb10d901b37..e7a9cad2dd308 100644 --- a/libexec/ypxfr/Makefile +++ b/libexec/ypxfr/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.2 1996/06/05 05:42:46 wpaul Exp $ +# $Id: Makefile,v 1.3 1996/06/06 03:58:06 wpaul Exp $ PROG= ypxfr SRCS= ypxfr_clnt.c yp_clnt.c ypxfr_getmap.c yp_dblookup.c \ @@ -10,7 +10,8 @@ SRCS= ypxfr_clnt.c yp_clnt.c ypxfr_getmap.c yp_dblookup.c \ MAN8= ypxfr.8 CFLAGS+= -I. -LDADD+= -lrpcsvc +DPADD= ${LIBRPCSVC} +LDADD= -lrpcsvc CLEANFILES= yp.h yp_clnt.c ypxfr_clnt.c diff --git a/sbin/ifconfig/Makefile b/sbin/ifconfig/Makefile index 658e2e87b3fcd..b4aa1ea38e5ad 100644 --- a/sbin/ifconfig/Makefile +++ b/sbin/ifconfig/Makefile @@ -2,7 +2,7 @@ PROG= ifconfig MAN8= ifconfig.8 +DPADD= ${LIBKVM} ${LIBIPX} LDADD= -lkvm -lipx -DPADD= ${LIBKVM} .include <bsd.prog.mk> diff --git a/sbin/init/Makefile b/sbin/init/Makefile index 62f71d29b9ad0..285240b9454c6 100644 --- a/sbin/init/Makefile +++ b/sbin/init/Makefile @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 7/19/93 -# $Id: Makefile,v 1.6 1996/02/13 09:12:10 joerg Exp $ +# $Id: Makefile,v 1.7 1996/05/04 08:16:20 markm Exp $ PROG= init MAN8= init.8 @@ -9,11 +9,11 @@ CFLAGS+=-DDEBUGSHELL -DSECURE .if exists(../../secure) && !defined(NOCRYPT) && !defined(NOSECURE) DISTRIBUTION=des -DPADD= ${DESCRYPTOBJDIR}/libdescrypt.a ${LIBUTIL} -LDADD= -L${DESCRYPTOBJDIR} -lutil -ldescrypt +DPADD= ${LIBUTIL} ${DESCRYPTOBJDIR}/libdescrypt.a +LDADD= -lutil -L${DESCRYPTOBJDIR} -ldescrypt .else -DPADD= ${SCRYPTOBJDIR}/libscrypt.a ${LIBUTIL} -LDADD= -L${SCRYPTOBJDIR} -lutil -lscrypt +DPADD= ${LIBUTIL} ${SCRYPTOBJDIR}/libscrypt.a +LDADD= -lutil -L${SCRYPTOBJDIR} -lscrypt .endif .include <bsd.prog.mk> diff --git a/usr.bin/netstat/Makefile b/usr.bin/netstat/Makefile index a68e2c5d292df..adf191642a34c 100644 --- a/usr.bin/netstat/Makefile +++ b/usr.bin/netstat/Makefile @@ -8,7 +8,7 @@ CFLAGS+=-I/sys # -g #.PATH: ${.CURDIR}/../../sys/netiso BINGRP= kmem BINMODE=2555 +DPADD= ${LIBKVM} ${LIBIPX} LDADD= -lkvm -lipx -DPADD= ${LIBKVM} .include <bsd.prog.mk> diff --git a/usr.bin/systat/Makefile b/usr.bin/systat/Makefile index ecf831ef25818..eabc3ce6da59f 100644 --- a/usr.bin/systat/Makefile +++ b/usr.bin/systat/Makefile @@ -4,8 +4,8 @@ PROG= systat CFLAGS+=-I${.CURDIR}/../../sys -I${.CURDIR}/../vmstat SRCS= cmds.c cmdtab.c disks.c fetch.c iostat.c keyboard.c vmstat.c main.c \ mbufs.c netcmds.c netstat.c pigs.c swap.c +DPADD= ${LIBCURSES} ${LIBTERMCAP} ${LIBM} ${LIBKVM} LDADD= -lcurses -ltermcap -lm -lkvm -DPADD= ${LIBCURSES} ${LIBTERMCAP} ${LIBM} BINGRP= kmem BINMODE=2555 diff --git a/usr.bin/telnet/Makefile b/usr.bin/telnet/Makefile index fee9815c16a0f..0da9e2528adda 100644 --- a/usr.bin/telnet/Makefile +++ b/usr.bin/telnet/Makefile @@ -41,9 +41,10 @@ CFLAGS+=-I${.CURDIR}/../../lib #CFLAGS+= -DKRB4 +DPADD= ${LIBTERMCAP} ${LIBTELNET} LDADD= -ltermcap -ltelnet +#DPADD+= ${LIBKRB} ${LIBDES} #LDADD+= -lkrb -ldes -DPADD= ${LIBTERMCAP} SRCS= authenc.c commands.c main.c network.c ring.c sys_bsd.c telnet.c \ terminal.c tn3270.c utilities.c diff --git a/usr.bin/tip/tip/Makefile b/usr.bin/tip/tip/Makefile index ece08034b0bb9..ef78565f24a2f 100644 --- a/usr.bin/tip/tip/Makefile +++ b/usr.bin/tip/tip/Makefile @@ -15,7 +15,8 @@ LIBACU=${.CURDIR}/../libacu/libacu.a PROG= tip CFLAGS+=-DUSE_PERROR -LDADD+= $(LIBACU) +DPADD= $(LIBACU) +LDADD= $(LIBACU) LINKS= ${BINDIR}/tip MAN1= tip.1 MAN5= modems.5 diff --git a/usr.bin/tn3270/tn3270/Makefile b/usr.bin/tn3270/tn3270/Makefile index 7dd19528b7ccc..df18677bedf4a 100644 --- a/usr.bin/tn3270/tn3270/Makefile +++ b/usr.bin/tn3270/tn3270/Makefile @@ -2,8 +2,8 @@ PROG= tn3270 CFLAGS+=-I${.CURDIR} -I. -LDADD+= -lcurses -ltermcap -ltelnet -lcrypt -DPADD+= ${LIBCURSES} /usr/lib/libtermcap.a /usr/lib/libtelnet.a +DPADD= ${LIBCURSES} ${LIBTERMCAP} ${LIBTELNET} ${LIBCRYPT} +LDADD= -lcurses -ltermcap -ltelnet -lcrypt CLEANFILES+= asc_disp.OUT asc_disp.out disp_asc.OUT disp_asc.out TMPfunc.out .PATH: ${.CURDIR}/../api ${.CURDIR}/../ascii ${.CURDIR}/../ctlr .PATH: ${.CURDIR}/../general ${.CURDIR}/../sys_curses ${.CURDIR}/../../telnet diff --git a/usr.bin/vmstat/Makefile b/usr.bin/vmstat/Makefile index b082cb62336b8..117c30d176ea1 100644 --- a/usr.bin/vmstat/Makefile +++ b/usr.bin/vmstat/Makefile @@ -5,7 +5,7 @@ CFLAGS+=-I${.CURDIR}/../../sys MAN8= vmstat.8 BINGRP= kmem BINMODE=2555 -DPADD= names.c ${LIBKVM} +DPADD= ${LIBKVM} LDADD= -lkvm .include <bsd.prog.mk> diff --git a/usr.sbin/pcvt/kcon/Makefile b/usr.sbin/pcvt/kcon/Makefile index dee4f45b368ce..5b5829870ec21 100644 --- a/usr.sbin/pcvt/kcon/Makefile +++ b/usr.sbin/pcvt/kcon/Makefile @@ -2,9 +2,16 @@ PROG= kcon DEVICE= /dev/ttyv0 CFLAGS+= -I${.CURDIR}/../keycap -DKEYB_DEVICE=\"${DEVICE}\" +.if exists(${.OBJDIR}/../keycap) +LIBDESTDIR= ${.OBJDIR}/../keycap +.else +LIBDESTDIR= ${.CURDIR}/../keycap +.endif + # the -Lfoo could be omitted if libkeycap.a were installed before # making those programs here -LDADD = -L${.CURDIR}/../keycap -L${.OBJDIR}/../keycap -lkeycap +DPADD = ${LIBDESTDIR}/libkeycap.a +LDADD = -L${LIBDESTDIR} -lkeycap .include <bsd.prog.mk> diff --git a/usr.sbin/rpc.yppasswdd/Makefile b/usr.sbin/rpc.yppasswdd/Makefile index 8a106cf197b57..5da11cab4a264 100644 --- a/usr.sbin/rpc.yppasswdd/Makefile +++ b/usr.sbin/rpc.yppasswdd/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.3 1996/06/05 06:13:02 wpaul Exp $ +# $Id: Makefile,v 1.4 1996/06/06 20:47:53 wpaul Exp $ PROG= rpc.yppasswdd SRCS= pw_copy.c pw_util.c util.c yppasswd_svc.c yp_error.c ypxfr_misc.c \ @@ -16,7 +16,8 @@ CFLAGS+= -I${.CURDIR}/../../usr.sbin/vipw -I${.CURDIR}/../../usr.sbin/ypserv \ -I${.CURDIR}/../../libexec/ypxfr -I${.CURDIR}/../../usr.bin/chpass \ -I${.CURDIR} -I. -LDADD+=-lrpcsvc -lcrypt +DPADD= ${LIBRPCSVC} ${LIBCRYPT} +LDADD= -lrpcsvc -lcrypt CLEANFILES= yppasswd_svc.c yppasswd.h \ yppasswd_private_xdr.c yppasswd_private.h \ diff --git a/usr.sbin/rpc.ypxfrd/Makefile b/usr.sbin/rpc.ypxfrd/Makefile index 627f23f30b349..7a56a82fb3ed7 100644 --- a/usr.sbin/rpc.ypxfrd/Makefile +++ b/usr.sbin/rpc.ypxfrd/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.1.1.1 1996/06/05 04:36:54 wpaul Exp $ +# $Id: Makefile,v 1.2 1996/06/06 03:59:22 wpaul Exp $ PROG= rpc.ypxfrd SRCS= ypxfrd_svc.c ypxfrd_server.c yp_error.c \ @@ -12,7 +12,8 @@ MAN8= rpc.ypxfrd.8 CFLAGS+= -I. -DXFRBLOCKSIZE=65535 -LDADD+=-lrpcsvc +DPADD= ${LIBRPCSVC} +LDADD= -lrpcsvc CLEANFILES= ypxfrd_svc.c ypxfrd.h diff --git a/usr.sbin/slstat/Makefile b/usr.sbin/slstat/Makefile index 406d370617e75..6cabf1e5696b3 100644 --- a/usr.sbin/slstat/Makefile +++ b/usr.sbin/slstat/Makefile @@ -1,9 +1,9 @@ # from: @(#)Makefile 5.6 (Berkeley) 4/23/91 -# $Id: Makefile,v 1.1.1.1 1994/06/17 06:42:36 rich Exp $ +# $Id: Makefile,v 1.2 1994/10/17 06:05:31 davidg Exp $ PROG= slstat MAN8= slstat.8 -DPADD= ${LIBUTIL} +DPADD= ${LIBKVM} LDADD= -lkvm BINGRP= kmem BINMODE=2555 diff --git a/usr.sbin/spray/Makefile b/usr.sbin/spray/Makefile index 5ecd1c5be0e98..a46a58af4484c 100644 --- a/usr.sbin/spray/Makefile +++ b/usr.sbin/spray/Makefile @@ -1,7 +1,8 @@ -# $Id: Makefile,v 1.2 1995/07/11 01:18:05 jtc Exp $ +# $Id: Makefile,v 1.1.1.1 1996/01/05 09:09:30 graichen Exp $ PROG= spray MAN8= spray.8 +DPADD= ${LIBRPCSVC} LDADD= -lrpcsvc .include <bsd.prog.mk> diff --git a/usr.sbin/sup/sup/Makefile b/usr.sbin/sup/sup/Makefile index 7deb8d2196470..4a372ce75e010 100644 --- a/usr.sbin/sup/sup/Makefile +++ b/usr.sbin/sup/sup/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.3 1995/12/26 22:39:27 peter Exp $ +# $Id: Makefile,v 1.4 1996/06/24 04:25:57 jkh Exp $ PROG= sup SRCS= supcmain.c supcvers.c supcparse.c supcname.c supcmisc.c supcmeat.c @@ -13,7 +13,7 @@ LIBOBJ= ${.OBJDIR}/../lib LIBOBJ= ${LIBSRC} .endif -DPADD+= $(LIBCRYPT) $(LIBOBJ)/libsup.a -LDADD+= -L${LIBOBJ} -lsup -lcrypt +DPADD= $(LIBCRYPT) $(LIBOBJ)/libsup.a ${LIBCRYPT} +LDADD= -L${LIBOBJ} -lsup -lcrypt .include <bsd.prog.mk> diff --git a/usr.sbin/sup/supfilesrv/Makefile b/usr.sbin/sup/supfilesrv/Makefile index c2a1c886e0a76..52ac4bda8cf34 100644 --- a/usr.sbin/sup/supfilesrv/Makefile +++ b/usr.sbin/sup/supfilesrv/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.3 1996/02/06 19:04:41 pst Exp $ +# $Id: Makefile,v 1.4 1996/06/24 04:25:59 jkh Exp $ PROG= supfilesrv SRCS= supfilesrv.c @@ -15,7 +15,7 @@ LIBOBJ= ${.OBJDIR}/../lib LIBOBJ= ${LIBSRC} .endif -DPADD+= $(LIBCRYPT) $(LIBOBJ)/libsup.a $(LIBUTIL) -LDADD+= -L${LIBOBJ} -lsup -lcrypt -lutil +DPADD= $(LIBOBJ)/libsup.a $(LIBCRYPT) $(LIBUTIL) +LDADD= -L${LIBOBJ} -lsup -lcrypt -lutil .include <bsd.prog.mk> diff --git a/usr.sbin/sup/supscan/Makefile b/usr.sbin/sup/supscan/Makefile index f96d7328ab98c..7c2a6aaba087b 100644 --- a/usr.sbin/sup/supscan/Makefile +++ b/usr.sbin/sup/supscan/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.1 1995/12/26 05:15:20 peter Exp $ +# $Id: Makefile,v 1.2 1996/06/24 04:26:03 jkh Exp $ PROG= supscan SRCS= supscan.c @@ -14,7 +14,7 @@ LIBOBJ= ${.OBJDIR}/../lib LIBOBJ= ${LIBSRC} .endif -DPADD+= $(LIBCRYPT) $(LIBOBJ)/libsup.a -LDADD+= -L${LIBOBJ} -lsup -lcrypt +DPADD= $(LIBCRYPT) $(LIBOBJ)/libsup.a ${LIBCRYPT} +LDADD= -L${LIBOBJ} -lsup -lcrypt .include <bsd.prog.mk> diff --git a/usr.sbin/xntpd/xntpd/Makefile b/usr.sbin/xntpd/xntpd/Makefile index a1de730a6bf12..cb62927fe0972 100644 --- a/usr.sbin/xntpd/xntpd/Makefile +++ b/usr.sbin/xntpd/xntpd/Makefile @@ -1,5 +1,5 @@ # -# $Id: Makefile,v 1.7 1994/10/03 23:51:32 phk Exp $ +# $Id: Makefile,v 1.8 1996/06/24 04:26:19 jkh Exp $ # CFLAGS+= -I${.CURDIR}/../include @@ -21,6 +21,7 @@ DPADD+= ${.CURDIR}/../parse/libparse.a .endif LDADD+= -lntp -lparse -lkvm +DPADD+= ${LIBKVM} PROG= xntpd MAN8= ${.CURDIR}/../doc/xntpd.8 |