Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src Cosmetic changes. No functional changes.



details:   https://anonhg.NetBSD.org/src/rev/a7ccd14ea79a
branches:  trunk
changeset: 821539:a7ccd14ea79a
user:      rin <rin%NetBSD.org@localhost>
date:      Wed Feb 08 23:26:24 2017 +0000

description:
Cosmetic changes. No functional changes.

diffstat:

 distrib/utils/x_ifconfig/Makefile |  13 ++++++-------
 sbin/ifconfig/Makefile            |  22 +++++++++++-----------
 sbin/ifconfig/Makefile.common     |  26 +++++++-------------------
 3 files changed, 24 insertions(+), 37 deletions(-)

diffs (116 lines):

diff -r f35e9d5945dd -r a7ccd14ea79a distrib/utils/x_ifconfig/Makefile
--- a/distrib/utils/x_ifconfig/Makefile Wed Feb 08 23:24:57 2017 +0000
+++ b/distrib/utils/x_ifconfig/Makefile Wed Feb 08 23:26:24 2017 +0000
@@ -1,23 +1,22 @@
-# $NetBSD: Makefile,v 1.37 2017/02/08 23:24:57 rin Exp $
+# $NetBSD: Makefile,v 1.38 2017/02/08 23:26:24 rin Exp $
 # Build a smaller ifconfig (i.e. for boot media)
 
-NOMAN= # defined
+NOMAN=         # defined
 
 .include <bsd.own.mk>
 
+PROG=          ifconfig
 SRCDIR=                ${.CURDIR}/../../../sbin/ifconfig
 
-
 CPPFLAGS+=     -DCRUNCHOPS
+
 .if defined(SMALLPROG_INET6) && (${USE_INET6} != "no")
 CPPFLAGS+=     -DINET6
-SRCS+= af_inet6.c
+SRCS+=         af_inet6.c
 .endif
 
-PROG=  ifconfig
-
 .PATH:         ${SRCDIR}
 
-.include "${.CURDIR}/../../../sbin/ifconfig/Makefile.common"
+.include "${SRCDIR}/Makefile.common"
 
 .include <bsd.prog.mk>
diff -r f35e9d5945dd -r a7ccd14ea79a sbin/ifconfig/Makefile
--- a/sbin/ifconfig/Makefile    Wed Feb 08 23:24:57 2017 +0000
+++ b/sbin/ifconfig/Makefile    Wed Feb 08 23:26:24 2017 +0000
@@ -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
 
-#DBG+=-g
-SRCS= af_atalk.c af_link.c carp.c
+SRCS=          af_atalk.c af_link.c carp.c
+
+CPPFLAGS+=     -I${NETBSDSRCDIR}/sys/dist/pf/
+SRCS+=         pfsync.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>
diff -r f35e9d5945dd -r a7ccd14ea79a sbin/ifconfig/Makefile.common
--- a/sbin/ifconfig/Makefile.common     Wed Feb 08 23:24:57 2017 +0000
+++ b/sbin/ifconfig/Makefile.common     Wed Feb 08 23:26:24 2017 +0000
@@ -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



Home | Main Index | Thread Index | Old Index