diff options
Diffstat (limited to 'usr.sbin')
24 files changed, 81 insertions, 81 deletions
diff --git a/usr.sbin/cron/cron/Makefile b/usr.sbin/cron/cron/Makefile index 905c3ec..27d2a3a 100644 --- a/usr.sbin/cron/cron/Makefile +++ b/usr.sbin/cron/cron/Makefile @@ -4,9 +4,9 @@ PROG= cron SRCS= cron.c database.c do_command.c job.c user.c popen.c MAN8= cron.8 -.if exists(${.CURDIR}/../lib/obj) -LDDESTDIR+= -L${.CURDIR}/../lib/obj -DPADD+= ${.CURDIR}/../lib/obj/libcron.a +.if exists(${.OBJDIR}/../lib) +LDDESTDIR+= -L${.OBJDIR}/../lib +DPADD+= ${.OBJDIR}/../lib/libcron.a .else LDDESTDIR+= -L${.CURDIR}/../lib DPADD+= ${.CURDIR}/../lib/libcron.a diff --git a/usr.sbin/cron/crontab/Makefile b/usr.sbin/cron/crontab/Makefile index 09a1fdc..cce341d 100644 --- a/usr.sbin/cron/crontab/Makefile +++ b/usr.sbin/cron/crontab/Makefile @@ -6,9 +6,9 @@ CFLAGS+= -I${.CURDIR}/../cron MAN1= crontab.1 MAN5= crontab.5 -.if exists(${.CURDIR}/../lib/obj) -LDDESTDIR+= -L${.CURDIR}/../lib/obj -DPADD+= ${.CURDIR}/../lib/obj/libcron.a +.if exists(${.OBJDIR}/../lib) +LDDESTDIR+= -L${.OBJDIR}/../lib +DPADD+= ${.OBJDIR}/../lib/libcron.a .else LDDESTDIR+= -L${.CURDIR}/../lib DPADD+= ${.CURDIR}/../lib/libcron.a diff --git a/usr.sbin/mrouted/map-mbone/Makefile b/usr.sbin/mrouted/map-mbone/Makefile index b707344..2110b32 100644 --- a/usr.sbin/mrouted/map-mbone/Makefile +++ b/usr.sbin/mrouted/map-mbone/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.1 1994/09/08 02:51:33 wollman Exp $ +# $Id: Makefile,v 1.2 1995/03/31 21:16:56 wollman Exp $ PROG= map-mbone @@ -6,9 +6,9 @@ S= ${.CURDIR}/.. .PATH: $S CFLAGS+= -I$S LDADD+= -lmrouted -.if exists($S/common/obj) -LDDESTDIR+= -L$S/common/obj -DPADD+= $S/common/obj/libmrouted.a +.if exists(${.OBJDIR}/../common) +LDDESTDIR+= -L${.OBJDIR}/../common +DPADD+= ${.OBJDIR}/../common/libmrouted.a .else LDDESTDIR+= -L$S/common DPADD+= $S/common/libmrouted.a diff --git a/usr.sbin/mrouted/mrinfo/Makefile b/usr.sbin/mrouted/mrinfo/Makefile index fdf83fc..34d51cd 100644 --- a/usr.sbin/mrouted/mrinfo/Makefile +++ b/usr.sbin/mrouted/mrinfo/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.3 1995/06/21 18:30:10 wollman Exp $ +# $Id: Makefile,v 1.4 1996/05/20 16:42:30 pst Exp $ PROG= mrinfo @@ -6,9 +6,9 @@ S= ${.CURDIR}/.. .PATH: $S CFLAGS+= -I$S LDADD+= -lmrouted -.if exists($S/common/obj) -LDDESTDIR+= -L$S/common/obj -DPADD+= $S/common/obj/libmrouted.a +.if exists(${.OBJDIR}/../common) +LDDESTDIR+= -L${.OBJDIR}/../common +DPADD+= ${.OBJDIR}/../common/libmrouted.a .else LDDESTDIR+= -L$S/common DPADD+= $S/common/libmrouted.a diff --git a/usr.sbin/mrouted/mrouted/Makefile b/usr.sbin/mrouted/mrouted/Makefile index dca5762..1c5dcc5 100644 --- a/usr.sbin/mrouted/mrouted/Makefile +++ b/usr.sbin/mrouted/mrouted/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.2 1995/06/13 18:05:16 wollman Exp $ +# $Id: Makefile,v 1.3 1995/07/08 22:36:06 ats Exp $ PROG= mrouted @@ -6,9 +6,9 @@ S= ${.CURDIR}/.. .PATH: $S CFLAGS+= -I$S LDADD+= -lmrouted -.if exists($S/common/obj) -LDDESTDIR+= -L$S/common/obj -DPADD+= $S/common/obj/libmrouted.a +.if exists(${.OBJDIR}/../common) +LDDESTDIR+= -L${.OBJDIR}/../common +DPADD+= ${.OBJDIR}/../common/libmrouted.a .else LDDESTDIR+= -L$S/common DPADD+= $S/common/libmrouted.a diff --git a/usr.sbin/mrouted/mtrace/Makefile b/usr.sbin/mrouted/mtrace/Makefile index 0d17ec0..6e79dea 100644 --- a/usr.sbin/mrouted/mtrace/Makefile +++ b/usr.sbin/mrouted/mtrace/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.2 1995/06/21 18:30:16 wollman Exp $ +# $Id: Makefile,v 1.3 1996/05/20 16:42:32 pst Exp $ PROG= mtrace @@ -6,9 +6,9 @@ S= ${.CURDIR}/.. .PATH: $S CFLAGS+= -I$S LDADD+= -lmrouted -.if exists($S/common/obj) -LDDESTDIR+= -L$S/common/obj -DPADD+= $S/common/obj/libmrouted.a +.if exists(${.OBJDIR}/../common) +LDDESTDIR+= -L${.OBJDIR}/../common +DPADD+= ${.OBJDIR}/../common/libmrouted.a .else LDDESTDIR+= -L$S/common DPADD+= $S/common/libmrouted.a diff --git a/usr.sbin/pcvt/kbdio/Makefile b/usr.sbin/pcvt/kbdio/Makefile index c67b3f6..398736f 100644 --- a/usr.sbin/pcvt/kbdio/Makefile +++ b/usr.sbin/pcvt/kbdio/Makefile @@ -25,7 +25,7 @@ LDADD= -lm -ly -ll NOMAN= NOSHARED= no shared linkage -CFLAGS+= -I${.CURDIR}/obj -I${.CURDIR} #-g +CFLAGS+= -I${.OBJDIR} -I${.CURDIR} #-g CLEANFILES+= kbdio.c lex.c lex.yy.c y.tab.[ch] CLEANFILES+= y.output # comment file from bison diff --git a/usr.sbin/pcvt/kcon/Makefile b/usr.sbin/pcvt/kcon/Makefile index 4826870..dee4f45 100644 --- a/usr.sbin/pcvt/kcon/Makefile +++ b/usr.sbin/pcvt/kcon/Makefile @@ -5,6 +5,6 @@ CFLAGS+= -I${.CURDIR}/../keycap -DKEYB_DEVICE=\"${DEVICE}\" # the -Lfoo could be omitted if libkeycap.a were installed before # making those programs here -LDADD = -L${.CURDIR}/../keycap -L${.CURDIR}/../keycap/obj -lkeycap +LDADD = -L${.CURDIR}/../keycap -L${.OBJDIR}/../keycap -lkeycap .include <bsd.prog.mk> diff --git a/usr.sbin/pcvt/vgaio/Makefile b/usr.sbin/pcvt/vgaio/Makefile index b26b8eb..53083e0 100644 --- a/usr.sbin/pcvt/vgaio/Makefile +++ b/usr.sbin/pcvt/vgaio/Makefile @@ -24,7 +24,7 @@ DPADD= ${LIBM} ${LIBY} ${LIBL} LDADD= -lm -ly -ll CFLAGS= -O2 # due to a gcc bug, it compiles only with -O2! -CFLAGS+= -I${.CURDIR}/obj -I${.CURDIR} +CFLAGS+= -I${.OBJDIR} -I${.CURDIR} CLEANFILES+= lex.c lex.yy.c vgaio.c y.tab.[ch] CLEANFILES+= y.output # comment file from bison diff --git a/usr.sbin/pkg_install/add/Makefile b/usr.sbin/pkg_install/add/Makefile index ade7e57..723ca45 100644 --- a/usr.sbin/pkg_install/add/Makefile +++ b/usr.sbin/pkg_install/add/Makefile @@ -2,9 +2,9 @@ PROG= pkg_add CFLAGS+= ${DEBUG} -I${.CURDIR}/../lib -.if exists(${.CURDIR}/../lib/obj) -LDADD+= -L${.CURDIR}/../lib/obj -linstall -DPADD+= ${.CURDIR}/../lib/obj/libinstall.a +.if exists(${.OBJDIR}/../lib) +LDADD+= -L${.OBJDIR}/../lib -linstall +DPADD+= ${.OBJDIR}/../lib/libinstall.a .else LDADD+= -L${.CURDIR}/../lib -linstall DPADD+= ${.CURDIR}/../lib/libinstall.a diff --git a/usr.sbin/pkg_install/create/Makefile b/usr.sbin/pkg_install/create/Makefile index fda22e7..26d57e4 100644 --- a/usr.sbin/pkg_install/create/Makefile +++ b/usr.sbin/pkg_install/create/Makefile @@ -2,9 +2,9 @@ PROG= pkg_create CFLAGS+= ${DEBUG} -I${.CURDIR}/../lib -.if exists(${.CURDIR}/../lib/obj) -LDADD+= -L${.CURDIR}/../lib/obj -linstall -DPADD+= ${.CURDIR}/../lib/obj/libinstall.a +.if exists(${.OBJDIR}/../lib) +LDADD+= -L${.OBJDIR}/../lib -linstall +DPADD+= ${.OBJDIR}/../lib/libinstall.a .else LDADD+= -L${.CURDIR}/../lib -linstall DPADD+= ${.CURDIR}/../lib/libinstall.a diff --git a/usr.sbin/pkg_install/delete/Makefile b/usr.sbin/pkg_install/delete/Makefile index 38c6802..9fd0980 100644 --- a/usr.sbin/pkg_install/delete/Makefile +++ b/usr.sbin/pkg_install/delete/Makefile @@ -1,9 +1,9 @@ PROG= pkg_delete CFLAGS+= ${DEBUG} -I${.CURDIR}/../lib -.if exists(${.CURDIR}/../lib/obj) -LDADD+= -L${.CURDIR}/../lib/obj -linstall -DPADD+= ${.CURDIR}/../lib/obj/libinstall.a +.if exists(${.OBJDIR}/../lib) +LDADD+= -L${.OBJDIR}/../lib -linstall +DPADD+= ${.OBJDIR}/../lib/libinstall.a .else LDADD+= -L${.CURDIR}/../lib -linstall DPADD+= ${.CURDIR}/../lib/libinstall.a diff --git a/usr.sbin/pkg_install/info/Makefile b/usr.sbin/pkg_install/info/Makefile index 8c5098c..9ab8dc3 100644 --- a/usr.sbin/pkg_install/info/Makefile +++ b/usr.sbin/pkg_install/info/Makefile @@ -1,9 +1,9 @@ PROG= pkg_info CFLAGS+= ${DEBUG} -I${.CURDIR}/../lib -.if exists(${.CURDIR}/../lib/obj) -LDADD+= -L${.CURDIR}/../lib/obj -linstall -DPADD+= ${.CURDIR}/../lib/obj/libinstall.a +.if exists(${.OBJDIR}/../lib) +LDADD+= -L${.OBJDIR}/../lib -linstall +DPADD+= ${.OBJDIR}/../lib/libinstall.a .else LDADD+= -L${.CURDIR}/../lib -linstall DPADD+= ${.CURDIR}/../lib/libinstall.a diff --git a/usr.sbin/sup/sup/Makefile b/usr.sbin/sup/sup/Makefile index 5b53b91..7deb8d2 100644 --- a/usr.sbin/sup/sup/Makefile +++ b/usr.sbin/sup/sup/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.2 1995/12/26 22:33:03 peter Exp $ +# $Id: Makefile,v 1.3 1995/12/26 22:39:27 peter Exp $ PROG= sup SRCS= supcmain.c supcvers.c supcparse.c supcname.c supcmisc.c supcmeat.c @@ -7,8 +7,8 @@ LIBSRC= ${.CURDIR}/../lib COPTS+= -DVAR_TMP -DHAS_DAEMON -I${.CURDIR} -I${LIBSRC} COPTS+= -DRENAMELOG=\"/var/log/sup.rename\" -.if exists(${LIBSRC}/obj/.) -LIBOBJ= ${LIBSRC}/obj +.if exists(${.OBJDIR}/../lib) +LIBOBJ= ${.OBJDIR}/../lib .else LIBOBJ= ${LIBSRC} .endif diff --git a/usr.sbin/sup/supfilesrv/Makefile b/usr.sbin/sup/supfilesrv/Makefile index 53fff45..c2a1c88 100644 --- a/usr.sbin/sup/supfilesrv/Makefile +++ b/usr.sbin/sup/supfilesrv/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.2 1996/02/06 19:03:56 pst Exp $ +# $Id: Makefile,v 1.3 1996/02/06 19:04:41 pst Exp $ PROG= supfilesrv SRCS= supfilesrv.c @@ -9,8 +9,8 @@ LIBSRC= ${.CURDIR}/../lib COPTS+= -DVAR_TMP -DHAS_DAEMON -I${.CURDIR} -I${LIBSRC} COPTS+= -DRENAMELOG=\"/var/log/sup.rename\" -.if exists(${LIBSRC}/obj/.) -LIBOBJ= ${LIBSRC}/obj +.if exists(${.OBJDIR}/../lib) +LIBOBJ= ${.OBJDIR}/../lib .else LIBOBJ= ${LIBSRC} .endif diff --git a/usr.sbin/sup/supscan/Makefile b/usr.sbin/sup/supscan/Makefile index 7268d71..f96d732 100644 --- a/usr.sbin/sup/supscan/Makefile +++ b/usr.sbin/sup/supscan/Makefile @@ -1,4 +1,4 @@ -# $Id$ +# $Id: Makefile,v 1.1 1995/12/26 05:15:20 peter Exp $ PROG= supscan SRCS= supscan.c @@ -8,8 +8,8 @@ LIBSRC= ${.CURDIR}/../lib COPTS+= -DVAR_TMP -DHAS_DAEMON -I${.CURDIR} -I${LIBSRC} COPTS+= -DRENAMELOG=\"/var/log/sup.rename\" -.if exists(${LIBSRC}/obj/.) -LIBOBJ= ${LIBSRC}/obj +.if exists(${.OBJDIR}/../lib) +LIBOBJ= ${.OBJDIR}/../lib .else LIBOBJ= ${LIBSRC} .endif diff --git a/usr.sbin/xntpd/authstuff/Makefile b/usr.sbin/xntpd/authstuff/Makefile index 79b2d9d..902848f 100644 --- a/usr.sbin/xntpd/authstuff/Makefile +++ b/usr.sbin/xntpd/authstuff/Makefile @@ -1,5 +1,5 @@ # -# $Id: Makefile,v 1.1 1993/12/21 21:06:20 wollman Exp $ +# $Id: Makefile,v 1.2 1993/12/22 11:32:10 rgrimes Exp $ # # Most of the programs in this directory are completely useless for the # NTP configuration that we provide by default. @@ -7,9 +7,9 @@ CFLAGS+= -I${.CURDIR}/../include -.if exists(${.CURDIR}/../lib/obj) -LDADD+= -L${.CURDIR}/../lib/obj -DPADD+= ${.CURDIR}/../lib/obj/libntp.a +.if exists(${.OBJDIR}/../lib) +LDADD+= -L${.OBJDIR}/../lib +DPADD+= ${.OBJDIR}/../lib/libntp.a .else LDADD+= -L${.CURDIR}/../lib DPADD+= ${.CURDIR}/../lib/libntp.a diff --git a/usr.sbin/xntpd/ntpdate/Makefile b/usr.sbin/xntpd/ntpdate/Makefile index f0af840..d1a9dd9 100644 --- a/usr.sbin/xntpd/ntpdate/Makefile +++ b/usr.sbin/xntpd/ntpdate/Makefile @@ -1,12 +1,12 @@ # -# $Id: Makefile,v 1.3 1993/12/22 11:32:56 rgrimes Exp $ +# $Id: Makefile,v 1.4 1994/10/03 23:51:17 phk Exp $ # CFLAGS+= -I${.CURDIR}/../include -.if exists(${.CURDIR}/../lib/obj) -LDADD+= -L${.CURDIR}/../lib/obj -DPADD+= -L${.CURDIR}/../lib/obj/libntp.a +.if exists(${.OBJDIR}/../lib) +LDADD+= -L${.OBJDIR}/../lib +DPADD+= -L${.OBJDIR}/../lib/libntp.a .else LDADD+= -L${.CURDIR}/../lib DPADD+= -L${.CURDIR}/../lib/libntp.a diff --git a/usr.sbin/xntpd/ntpq/Makefile b/usr.sbin/xntpd/ntpq/Makefile index 875592a..4ba9f07 100644 --- a/usr.sbin/xntpd/ntpq/Makefile +++ b/usr.sbin/xntpd/ntpq/Makefile @@ -1,12 +1,12 @@ # -# $Id: Makefile,v 1.3 1993/12/22 11:33:07 rgrimes Exp $ +# $Id: Makefile,v 1.4 1994/10/03 23:51:22 phk Exp $ # CFLAGS+= -I${.CURDIR}/../include -.if exists(${.CURDIR}/../lib/obj) -LDADD+= -L${.CURDIR}/../lib/obj -DPADD+= -L${.CURDIR}/../lib/obj/libntp.a +.if exists(${.OBJDIR}/../lib) +LDADD+= -L${.OBJDIR}/../lib +DPADD+= -L${.OBJDIR}/../lib/libntp.a .else LDADD+= -L${.CURDIR}/../lib DPADD+= -L${.CURDIR}/../lib/libntp.a diff --git a/usr.sbin/xntpd/ntptrace/Makefile b/usr.sbin/xntpd/ntptrace/Makefile index 5d5f327..1334dfd 100644 --- a/usr.sbin/xntpd/ntptrace/Makefile +++ b/usr.sbin/xntpd/ntptrace/Makefile @@ -1,12 +1,12 @@ # -# $Id: Makefile,v 1.2 1993/12/22 11:33:14 rgrimes Exp $ +# $Id: Makefile,v 1.3 1994/10/03 23:51:26 phk Exp $ # CFLAGS+= -I${.CURDIR}/../include -.if exists(${.CURDIR}/../lib/obj) -LDADD+= -L${.CURDIR}/../lib/obj -DPADD+= -L${.CURDIR}/../lib/obj/libntp.a +.if exists(${.OBJDIR}/../lib) +LDADD+= -L${.OBJDIR}/../lib +DPADD+= -L${.OBJDIR}/../lib/libntp.a .else LDADD+= -L${.CURDIR}/../lib DPADD+= -L${.CURDIR}/../lib/libntp.a diff --git a/usr.sbin/xntpd/parse/util/Makefile b/usr.sbin/xntpd/parse/util/Makefile index ad9c0eb..a05ca08 100644 --- a/usr.sbin/xntpd/parse/util/Makefile +++ b/usr.sbin/xntpd/parse/util/Makefile @@ -1,14 +1,14 @@ # -# $Id$ +# $Id: Makefile,v 1.2 1995/04/04 17:48:02 rgrimes Exp $ # CFLAGS+= -I${.CURDIR}/../../include CFLAGS+= -DNTP_POSIX_SOURCE -DUSE_PROTOTYPES CFLAGS+= -DSYS_FREEBSD -DBOEDER -DHAVE_TERMIOS -DHAVE_BSD_NICE -.if exists(${.CURDIR}/../../lib/obj) -LDADD+= -L${.CURDIR}/../../lib/obj -DPADD+= -L${.CURDIR}/../../lib/obj/libntp.a +.if exists(${.OBJDIR}/../../lib) +LDADD+= -L${.OBJDIR}/../../lib +DPADD+= -L${.OBJDIR}/../../lib/libntp.a .else LDADD+= -L${.CURDIR}/../../lib DPADD+= -L${.CURDIR}/../../lib/libntp.a diff --git a/usr.sbin/xntpd/util/Makefile b/usr.sbin/xntpd/util/Makefile index 02cb294..04f3587 100644 --- a/usr.sbin/xntpd/util/Makefile +++ b/usr.sbin/xntpd/util/Makefile @@ -1,12 +1,12 @@ # -# $Id: Makefile,v 1.2 1993/12/22 11:33:28 rgrimes Exp $ +# $Id: Makefile,v 1.3 1994/10/03 23:51:29 phk Exp $ # CFLAGS+= -I${.CURDIR}/../include -.if exists(${.CURDIR}/../lib/obj) -LDADD+= -L${.CURDIR}/../lib/obj -DPADD+= -L${.CURDIR}/../lib/obj/libntp.a +.if exists(${.OBJDIR}/../lib) +LDADD+= -L${.OBJDIR}/../lib +DPADD+= -L${.OBJDIR}/../lib/libntp.a .else LDADD+= -L${.CURDIR}/../lib DPADD+= -L${.CURDIR}/../lib/libntp.a diff --git a/usr.sbin/xntpd/xntpd/Makefile b/usr.sbin/xntpd/xntpd/Makefile index 6ab7cd0..a1de730 100644 --- a/usr.sbin/xntpd/xntpd/Makefile +++ b/usr.sbin/xntpd/xntpd/Makefile @@ -1,20 +1,20 @@ # -# $Id: Makefile,v 1.6 1994/09/30 00:34:17 wollman Exp $ +# $Id: Makefile,v 1.7 1994/10/03 23:51:32 phk Exp $ # CFLAGS+= -I${.CURDIR}/../include -.if exists(${.CURDIR}/../lib/obj) -LDADD+= -L${.CURDIR}/../lib/obj -DPADD+= ${.CURDIR}/../lib/obj/libntp.a +.if exists(${.OBJDIR}/../lib) +LDADD+= -L${.OBJDIR}/../lib +DPADD+= ${.OBJDIR}/../lib/libntp.a .else LDADD+= -L${.CURDIR}/../lib DPADD+= ${.CURDIR}/../lib/libntp.a .endif -.if exists(${.CURDIR}/../parse/obj) -LDADD+= -L${.CURDIR}/../parse/obj -DPADD+= ${.CURDIR}/../parse/obj/libparse.a +.if exists(${.OBJDIR}/../parse) +LDADD+= -L${.OBJDIR}/../parse +DPADD+= ${.OBJDIR}/../parse/libparse.a .else LDADD+= -L${.CURDIR}/../parse DPADD+= ${.CURDIR}/../parse/libparse.a diff --git a/usr.sbin/xntpd/xntpdc/Makefile b/usr.sbin/xntpd/xntpdc/Makefile index a06cf1a..2543074 100644 --- a/usr.sbin/xntpd/xntpdc/Makefile +++ b/usr.sbin/xntpd/xntpdc/Makefile @@ -1,12 +1,12 @@ # -# $Id: Makefile,v 1.2 1993/12/22 11:34:00 rgrimes Exp $ +# $Id: Makefile,v 1.3 1994/10/03 23:51:34 phk Exp $ # CFLAGS+= -I${.CURDIR}/../include -.if exists(${.CURDIR}/../lib/obj) -LDADD+= -L${.CURDIR}/../lib/obj -DPADD+= -L${.CURDIR}/../lib/obj/libntp.a +.if exists(${.OBJDIR}/../lib) +LDADD+= -L${.OBJDIR}/../lib +DPADD+= -L${.OBJDIR}/../lib/libntp.a .else LDADD+= -L${.CURDIR}/../lib DPADD+= -L${.CURDIR}/../lib/libntp.a |
