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>
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Reply via email to