Module Name: src
Committed By: rin
Date: Wed Feb 8 23:34:15 UTC 2017
Modified Files:
src/sbin/ifconfig: Makefile Makefile.common
Log Message:
Cosmetic changes. No functional changes.
To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 src/sbin/ifconfig/Makefile
cvs rdiff -u -r1.2 -r1.3 src/sbin/ifconfig/Makefile.common
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/ifconfig/Makefile
diff -u src/sbin/ifconfig/Makefile:1.59 src/sbin/ifconfig/Makefile:1.60
--- src/sbin/ifconfig/Makefile:1.59 Wed Feb 8 23:22:43 2017
+++ src/sbin/ifconfig/Makefile Wed Feb 8 23:34:15 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.59 2017/02/08 23:22:43 rin Exp $
+# $NetBSD: Makefile,v 1.60 2017/02/08 23:34:15 rin Exp $
# @(#)Makefile 8.1 (Berkeley) 6/5/93
# when making a change to this file, please check if the change is
@@ -7,25 +7,25 @@
.include <bsd.own.mk>
-RUMPPRG=ifconfig
-MAN= ifconfig.8
+RUMPPRG= ifconfig
+MAN= ifconfig.8
+
+SRCS= af_atalk.c af_link.c carp.c
+
+CPPFLAGS+= -I${NETBSDSRCDIR}/sys/dist/pf/
+SRCS+= pfsync.c
-#DBG+=-g
-SRCS= af_atalk.c af_link.c carp.c
.if (${USE_INET6} != "no")
CPPFLAGS+= -DINET6
-SRCS+= af_inet6.c
+SRCS+= af_inet6.c
.endif
.include "Makefile.common"
.PATH: ${.CURDIR}/../../lib/libc/net
-RUMPSRCS= getifaddrs.c getnameinfo.c if_indextoname.c
+RUMPSRCS= getifaddrs.c getnameinfo.c if_indextoname.c
.if (${MKRUMP} != "no")
-CPPFLAGS+= -DRUMP_ACTION
+CPPFLAGS+= -DRUMP_ACTION
.endif
-CPPFLAGS+=-I${NETBSDSRCDIR}/sys/dist/pf/
-SRCS+= pfsync.c
-
.include <bsd.prog.mk>
Index: src/sbin/ifconfig/Makefile.common
diff -u src/sbin/ifconfig/Makefile.common:1.2 src/sbin/ifconfig/Makefile.common:1.3
--- src/sbin/ifconfig/Makefile.common:1.2 Wed Feb 8 23:22:43 2017
+++ src/sbin/ifconfig/Makefile.common Wed Feb 8 23:34:15 2017
@@ -1,27 +1,15 @@
-# $NetBSD: Makefile.common,v 1.2 2017/02/08 23:22:43 rin Exp $
+# $NetBSD: Makefile.common,v 1.3 2017/02/08 23:34:15 rin Exp $
# shared stuff with src/distrib/utils/x_ifconfig for install media.
# stuff not required by install media should be into Makefile.
.ifdef SMALLPROG
-CPPFLAGS+=-DSMALL
+CPPFLAGS+= -DSMALL
.endif
-DPADD+=${LIBUTIL}
-DPADD+=${LIBPROP}
-LDADD+=-lutil
-LDADD+=-lprop
+DPADD+= ${LIBUTIL} ${LIBPROP}
+LDADD+= -lutil -lprop
-INCS+=af_inetany.h env.h extern.h media.h parse.h util.h
-SRCS+= af_inet.c
-SRCS+= af_inetany.c
-SRCS+= agr.c
-SRCS+= env.c
-SRCS+= ether.c
-SRCS+= ieee80211.c
-SRCS+= ifconfig.c
-SRCS+= media.c
-SRCS+= parse.c
-SRCS+= tunnel.c
-SRCS+= util.c
-SRCS+= vlan.c
+INCS+= af_inetany.h env.h extern.h media.h parse.h util.h
+SRCS+= af_inet.c af_inetany.c agr.c env.c ether.c ieee80211.c \
+ ifconfig.c media.c parse.c tunnel.c util.c vlan.c
