From owner-svn-src-head@FreeBSD.ORG  Thu Sep 23 14:06:15 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 75187106564A;
	Thu, 23 Sep 2010 14:06: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 644C78FC12;
	Thu, 23 Sep 2010 14:06: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 o8NE6FsE071317;
	Thu, 23 Sep 2010 14:06:15 GMT (envelope-from marius@svn.freebsd.org)
Received: (from marius@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o8NE6FuZ071314;
	Thu, 23 Sep 2010 14:06:15 GMT (envelope-from marius@svn.freebsd.org)
Message-Id: <201009231406.o8NE6FuZ071314@svn.freebsd.org>
From: Marius Strobl <marius@FreeBSD.org>
Date: Thu, 23 Sep 2010 14:06:15 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r213075 - in head: libexec/tftpd usr.bin/tftp
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 23 Sep 2010 14:06:15 -0000

Author: marius
Date: Thu Sep 23 14:06:15 2010
New Revision: 213075
URL: http://svn.freebsd.org/changeset/base/213075

Log:
  Try to adhere to style.Makefile(5).
  
  MFC after:	3 days

Modified:
  head/libexec/tftpd/Makefile
  head/usr.bin/tftp/Makefile

Modified: head/libexec/tftpd/Makefile
==============================================================================
--- head/libexec/tftpd/Makefile	Thu Sep 23 12:04:12 2010	(r213074)
+++ head/libexec/tftpd/Makefile	Thu Sep 23 14:06:15 2010	(r213075)
@@ -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: head/usr.bin/tftp/Makefile
==============================================================================
--- head/usr.bin/tftp/Makefile	Thu Sep 23 12:04:12 2010	(r213074)
+++ head/usr.bin/tftp/Makefile	Thu Sep 23 14:06:15 2010	(r213075)
@@ -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>