Author: marius
Date: Mon Oct 4 19:51:16 2010
New Revision: 213416
URL: http://svn.freebsd.org/changeset/base/213416
Log:
MFC: r213075
Try to adhere to style.Makefile(5).
Modified:
stable/7/libexec/tftpd/Makefile
stable/7/usr.bin/tftp/Makefile
Directory Properties:
stable/7/libexec/tftpd/ (props changed)
stable/7/usr.bin/tftp/ (props changed)
Modified: stable/7/libexec/tftpd/Makefile
==============================================================================
--- stable/7/libexec/tftpd/Makefile Mon Oct 4 19:51:15 2010
(r213415)
+++ stable/7/libexec/tftpd/Makefile Mon Oct 4 19:51:16 2010
(r213416)
@@ -2,13 +2,11 @@
# $FreeBSD$
PROG= tftpd
-SRCS= tftpd.c tftp-io.c tftp-utils.c tftp-file.c tftp-transfer.c
tftp-options.c
+MAN= tftpd.8
+SRCS= tftp-file.c tftp-io.c tftp-options.c tftp-transfer.c tftp-utils.c
+SRCS+= tftpd.c
WARNS= 3
WFORMAT=0
-MAN= tftpd.8
-CFLAGS+=-I${.CURDIR}/../../usr.bin/tftp -I${.CURDIR}/../../libexec/tftpd
-.PATH: ${.CURDIR}/../../usr.bin/tftp
-COPTFLAGS = -O
LDFLAGS= -lwrap
.include <bsd.prog.mk>
Modified: stable/7/usr.bin/tftp/Makefile
==============================================================================
--- stable/7/usr.bin/tftp/Makefile Mon Oct 4 19:51:15 2010
(r213415)
+++ stable/7/usr.bin/tftp/Makefile Mon Oct 4 19:51:16 2010
(r213416)
@@ -1,12 +1,14 @@
# @(#)Makefile 8.1 (Berkeley) 6/6/93
# $FreeBSD$
-WARNS= 3
+.PATH: ${.CURDIR}/../../libexec/tftpd
+
PROG= tftp
-SRCS= main.c tftp.c tftp-utils.c tftp-io.c tftp-file.c tftp-transfer.c
tftp-options.c
+SRCS= main.c tftp-file.c tftp-io.c tftp-options.c tftp-transfer.c
+SRCS+= tftp-utils.c tftp.c
+WARNS= 3
+CFLAGS+=-I${.CURDIR}/../../libexec/tftpd
DPADD= ${LIBEDIT} ${LIBTERMCAP}
LDADD= -ledit -ltermcap
-CFLAGS+=-I${.CURDIR}/../../libexec/tftpd -I${.CURDIR}/../../usr.bin/tftp
-.PATH: ${.CURDIR}/../../libexec/tftpd
.include <bsd.prog.mk>
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
