From 9c97c8f02d579c6988b1d150fd1c0fa8dacf2e87 Mon Sep 17 00:00:00 2001 From: obrien Date: Fri, 20 Jul 2001 06:20:32 +0000 Subject: Perform a major cleanup of the usr.sbin Makefiles. These are not perfectly in agreement with each other style-wise, but they are orders of orders of magnitude more consistent style-wise than before. --- usr.sbin/cron/Makefile | 2 ++ usr.sbin/cron/Makefile.inc | 4 ++-- usr.sbin/cron/cron/Makefile | 6 ++++-- usr.sbin/cron/crontab/Makefile | 12 +++++++----- usr.sbin/cron/lib/Makefile | 10 ++++++---- 5 files changed, 21 insertions(+), 13 deletions(-) (limited to 'usr.sbin/cron') diff --git a/usr.sbin/cron/Makefile b/usr.sbin/cron/Makefile index 1131cff..62f853c 100644 --- a/usr.sbin/cron/Makefile +++ b/usr.sbin/cron/Makefile @@ -1,3 +1,5 @@ +# $FreeBSD$ + SUBDIR= lib cron crontab .include diff --git a/usr.sbin/cron/Makefile.inc b/usr.sbin/cron/Makefile.inc index f9208ec..d7844f5 100644 --- a/usr.sbin/cron/Makefile.inc +++ b/usr.sbin/cron/Makefile.inc @@ -1,9 +1,9 @@ # $FreeBSD$ .if exists(${.OBJDIR}/../lib) -LIBCRON=${.OBJDIR}/../lib/libcron.a +LIBCRON= ${.OBJDIR}/../lib/libcron.a .else -LIBCRON=${.CURDIR}/../lib/libcron.a +LIBCRON= ${.CURDIR}/../lib/libcron.a .endif .include "../Makefile.inc" diff --git a/usr.sbin/cron/cron/Makefile b/usr.sbin/cron/cron/Makefile index e9bb9cd..d578da7 100644 --- a/usr.sbin/cron/cron/Makefile +++ b/usr.sbin/cron/cron/Makefile @@ -1,10 +1,12 @@ # $FreeBSD$ PROG= cron +MAN= cron.8 SRCS= cron.c database.c do_command.c job.c user.c popen.c -CFLAGS+=-DLOGIN_CAP + +CFLAGS+= -DLOGIN_CAP + DPADD= ${LIBCRON} ${LIBUTIL} LDADD= ${LIBCRON} -lutil -MAN= cron.8 .include diff --git a/usr.sbin/cron/crontab/Makefile b/usr.sbin/cron/crontab/Makefile index 9ce3541..96a4bd6 100644 --- a/usr.sbin/cron/crontab/Makefile +++ b/usr.sbin/cron/crontab/Makefile @@ -1,14 +1,16 @@ # $FreeBSD$ +BINDIR= /usr/bin + PROG= crontab -CFLAGS+=-I${.CURDIR}/../cron -DPADD= ${LIBCRON} ${LIBUTIL} -LDADD= ${LIBCRON} -lutil MAN= crontab.1 crontab.5 - -BINDIR= /usr/bin BINOWN= root BINMODE=4555 INSTALLFLAGS=-fschg +CFLAGS+= -I${.CURDIR}/../cron + +DPADD= ${LIBCRON} ${LIBUTIL} +LDADD= ${LIBCRON} -lutil + .include diff --git a/usr.sbin/cron/lib/Makefile b/usr.sbin/cron/lib/Makefile index 5270131..ddb5fb1 100644 --- a/usr.sbin/cron/lib/Makefile +++ b/usr.sbin/cron/lib/Makefile @@ -1,10 +1,12 @@ -LIB= cron +# $FreeBSD$ -SRCS= entry.c env.c misc.c -CFLAGS+=-I${.CURDIR}/../cron -CFLAGS+=-DLOGIN_CAP +LIB= cron NOPIC= yes NOPROFILE= yes +SRCS= entry.c env.c misc.c + +CFLAGS+= -I${.CURDIR}/../cron +CFLAGS+= -DLOGIN_CAP install: @echo -n -- cgit v1.1