[src/trunk]: src Rename sbin/ifconfig/Makefile.inc to Makefile.common; the fo...

[rin <rin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/3fffdf4bf659
branches:  trunk
changeset: 821536:3fffdf4bf659
user:      rin <rin%NetBSD.org@localhost>
date:      Wed Feb 08 23:16:41 2017 +0000

description:
Rename sbin/ifconfig/Makefile.inc to Makefile.common; the former can
potentially conflict with bsd.subdir.mk.

diffstat:

 distrib/utils/x_ifconfig/Makefile |   4 ++--
 sbin/ifconfig/Makefile            |   4 ++--
 sbin/ifconfig/Makefile.common     |  23 +++++++++++++++++++++++
 sbin/ifconfig/Makefile.inc        |  23 -----------------------
 4 files changed, 27 insertions(+), 27 deletions(-)

diffs (90 lines):

diff -r 2f8b2273f1be -r 3fffdf4bf659 distrib/utils/x_ifconfig/Makefile
--- a/distrib/utils/x_ifconfig/Makefile Wed Feb 08 23:13:59 2017 +0000
+++ b/distrib/utils/x_ifconfig/Makefile Wed Feb 08 23:16:41 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2017/02/07 16:49:40 rin Exp $
+# $NetBSD: Makefile,v 1.35 2017/02/08 23:16:41 rin Exp $
 # Build a smaller ifconfig (i.e. for boot media)
 
 NOMAN= # defined
@@ -19,7 +19,7 @@
 .endif
 
 PROG=  ifconfig
-.include "${.CURDIR}/../../../sbin/ifconfig/Makefile.inc"
+.include "${.CURDIR}/../../../sbin/ifconfig/Makefile.common"
 
 .include <bsd.prog.mk>
 
diff -r 2f8b2273f1be -r 3fffdf4bf659 sbin/ifconfig/Makefile
--- a/sbin/ifconfig/Makefile    Wed Feb 08 23:13:59 2017 +0000
+++ b/sbin/ifconfig/Makefile    Wed Feb 08 23:16:41 2017 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.57 2017/02/08 23:14:00 rin Exp $
+#      $NetBSD: Makefile,v 1.58 2017/02/08 23:16:41 rin Exp $
 #      @(#)Makefile    8.1 (Berkeley) 6/5/93
 
 # when making a change to this file, please check if the change is
@@ -17,7 +17,7 @@
 SRCS+= af_inet6.c
 .endif
 
-.include "Makefile.inc"
+.include "Makefile.common"
 
 .PATH:         ${.CURDIR}/../../lib/libc/net
 RUMPSRCS= getifaddrs.c getnameinfo.c if_indextoname.c
diff -r 2f8b2273f1be -r 3fffdf4bf659 sbin/ifconfig/Makefile.common
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sbin/ifconfig/Makefile.common     Wed Feb 08 23:16:41 2017 +0000
@@ -0,0 +1,23 @@
+#      $NetBSD: Makefile.common,v 1.1 2017/02/08 23:16:41 rin Exp $
+
+# shared stuff with src/distrib/utils/x_ifconfig for install media.
+# stuff not required by install media should be into Makefile.
+
+DPADD+=${LIBUTIL}
+DPADD+=${LIBPROP}
+LDADD+=-lutil
+LDADD+=-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
diff -r 2f8b2273f1be -r 3fffdf4bf659 sbin/ifconfig/Makefile.inc
--- a/sbin/ifconfig/Makefile.inc        Wed Feb 08 23:13:59 2017 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-#      $NetBSD: Makefile.inc,v 1.9 2012/10/31 10:17:34 msaitoh Exp $
-
-# shared stuff with src/distrib/utils/x_ifconfig for install media.
-# stuff not required by install media should be into Makefile.
-
-DPADD+=${LIBUTIL}
-DPADD+=${LIBPROP}
-LDADD+=-lutil
-LDADD+=-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