cleanup Makefile

1 files changed, 51 insertions, 11 deletions

diff --git a/usr.sbin/smtpd/smtpd/Makefile b/usr.sbin/smtpd/smtpd/Makefile
index 120aebae1b4..b7737156376 100644
--- a/usr.sbin/smtpd/smtpd/Makefile
+++ b/usr.sbin/smtpd/smtpd/Makefile
@@ -1,40 +1,80 @@
-#	$OpenBSD: Makefile,v 1.80 2015/11/23 21:50:12 gilles Exp $
+#	$OpenBSD: Makefile,v 1.81 2015/12/01 10:06:59 gilles Exp $
 
 .PATH:		${.CURDIR}/..
 
 PROG=		smtpd
 
-SRCS=		aliases.c bounce.c ca.c compress_backend.c config.c		\
-		control.c crypto.c delivery.c dict.c dns.c envelope.c esc.c	\
-		expand.c forward.c iobuf.c ioev.c limit.c lka.c	lka_session.c	\
-		log.c mailaddr.c mda.c mproc.c				\
-		mta.c mta_session.c parse.y pony.c queue.c queue_backend.c	\
-		ruleset.c runq.c scheduler.c scheduler_backend.c		\
-		smtp.c smtp_session.c smtpd.c ssl.c				\
-		ssl_smtpd.c stat_backend.c table.c to.c tree.c util.c		\
-		waitq.c
+SRCS=	aliases.c
+SRCS+=	bounce.c
+SRCS+=	ca.c
+SRCS+=	compress_backend.c
+SRCS+=	config.c
+SRCS+=	control.c
+SRCS+=	crypto.c
+SRCS+=	delivery.c
+SRCS+=	dict.c
+SRCS+=	dns.c
+SRCS+=	envelope.c
+SRCS+=	esc.c
+SRCS+=	expand.c
+SRCS+=	forward.c
+SRCS+=	iobuf.c
+SRCS+=	ioev.c
+SRCS+=	limit.c
+SRCS+=	lka.c
+SRCS+=	lka_session.c
+SRCS+=	log.c
+SRCS+=	mailaddr.c
+SRCS+=	mda.c
+SRCS+=	mproc.c
+SRCS+=	mta.c
+SRCS+=	mta_session.c
+SRCS+=	parse.y
+SRCS+=	pony.c
+SRCS+=	queue.c
+SRCS+=	queue_backend.c
+SRCS+=	ruleset.c
+SRCS+=	runq.c
+SRCS+=	scheduler.c
+SRCS+=	scheduler_backend.c
+SRCS+=	smtp.c
+SRCS+=	smtp_session.c
+SRCS+=	smtpd.c
+SRCS+=	ssl.c
+SRCS+=	ssl_smtpd.c
+SRCS+=	stat_backend.c
+SRCS+=	table.c
+SRCS+=	to.c
+SRCS+=	tree.c
+SRCS+=	util.c
+SRCS+=	waitq.c
 
 # RFC parsers
 SRCS+=		rfc2822.c
 
 # backends
 SRCS+=		compress_gzip.c
+
 SRCS+=		delivery_filename.c
 SRCS+=		delivery_maildir.c
 SRCS+=		delivery_mbox.c
 SRCS+=		delivery_mda.c
 SRCS+=		delivery_lmtp.c
+
 SRCS+=		table_db.c
 SRCS+=		table_getpwnam.c
 SRCS+=		table_proc.c
 SRCS+=		table_static.c
+
 SRCS+=		queue_fs.c
 SRCS+=		queue_null.c
 SRCS+=		queue_proc.c
 SRCS+=		queue_ram.c
+
 SRCS+=		scheduler_ramqueue.c
 SRCS+=		scheduler_null.c
 SRCS+=		scheduler_proc.c
+
 SRCS+=		stat_ramstat.c
 
 MAN=		sendmail.8 smtpd.8 smtpd.conf.5 table.5
@@ -43,7 +83,7 @@ BINDIR=		/usr/sbin
 LDADD+=		-levent -lutil -lssl -lcrypto -lm -lz
 DPADD+=		${LIBEVENT} ${LIBUTIL} ${LIBSSL} ${LIBCRYPTO} ${LIBM} ${LIBZ}
 
-CFLAGS+=   -fstack-protector-all
+CFLAGS+=	-fstack-protector-all
 CFLAGS+=	-I${.CURDIR}/..
 CFLAGS+=	-Wall -Wstrict-prototypes -Wmissing-prototypes
 CFLAGS+=	-Wmissing-declarations