From owner-svn-src-stable@FreeBSD.ORG  Mon Oct  4 19:51:15 2010
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 642F1106566C;
	Mon,  4 Oct 2010 19:51:15 +0000 (UTC)
	(envelope-from marius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 52A138FC08;
	Mon,  4 Oct 2010 19:51:15 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o94JpFSv025121;
	Mon, 4 Oct 2010 19:51:15 GMT (envelope-from marius@svn.freebsd.org)
Received: (from marius@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o94JpFbH025118;
	Mon, 4 Oct 2010 19:51:15 GMT (envelope-from marius@svn.freebsd.org)
Message-Id: <201010041951.o94JpFbH025118@svn.freebsd.org>
From: Marius Strobl <marius@FreeBSD.org>
Date: Mon, 4 Oct 2010 19:51:15 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r213415 - in stable/8: libexec/tftpd usr.bin/tftp
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 04 Oct 2010 19:51:15 -0000

Author: marius
Date: Mon Oct  4 19:51:15 2010
New Revision: 213415
URL: http://svn.freebsd.org/changeset/base/213415

Log:
  MFC: 213075
  
  Try to adhere to style.Makefile(5).

Modified:
  stable/8/libexec/tftpd/Makefile
  stable/8/usr.bin/tftp/Makefile
Directory Properties:
  stable/8/libexec/tftpd/   (props changed)
  stable/8/usr.bin/tftp/   (props changed)

Modified: stable/8/libexec/tftpd/Makefile
==============================================================================
--- stable/8/libexec/tftpd/Makefile	Mon Oct  4 19:40:01 2010	(r213414)
+++ stable/8/libexec/tftpd/Makefile	Mon Oct  4 19:51:15 2010	(r213415)
@@ -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/8/usr.bin/tftp/Makefile
==============================================================================
--- stable/8/usr.bin/tftp/Makefile	Mon Oct  4 19:40:01 2010	(r213414)
+++ stable/8/usr.bin/tftp/Makefile	Mon Oct  4 19:51:15 2010	(r213415)
@@ -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>