Module Name: src
Committed By: rin
Date: Wed Feb 8 23:16:41 UTC 2017
Modified Files:
src/distrib/utils/x_ifconfig: Makefile
src/sbin/ifconfig: Makefile
Added Files:
src/sbin/ifconfig: Makefile.common
Removed Files:
src/sbin/ifconfig: Makefile.inc
Log Message:
Rename sbin/ifconfig/Makefile.inc to Makefile.common; the former can
potentially conflict with bsd.subdir.mk.
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/distrib/utils/x_ifconfig/Makefile
cvs rdiff -u -r1.57 -r1.58 src/sbin/ifconfig/Makefile
cvs rdiff -u -r0 -r1.1 src/sbin/ifconfig/Makefile.common
cvs rdiff -u -r1.9 -r0 src/sbin/ifconfig/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/x_ifconfig/Makefile
diff -u src/distrib/utils/x_ifconfig/Makefile:1.34 src/distrib/utils/x_ifconfig/Makefile:1.35
--- src/distrib/utils/x_ifconfig/Makefile:1.34 Tue Feb 7 16:49:40 2017
+++ src/distrib/utils/x_ifconfig/Makefile Wed Feb 8 23:16:41 2017
@@ -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 @@ CPPFLAGS+=-DSMALL
.endif
PROG= ifconfig
-.include "${.CURDIR}/../../../sbin/ifconfig/Makefile.inc"
+.include "${.CURDIR}/../../../sbin/ifconfig/Makefile.common"
.include <bsd.prog.mk>
Index: src/sbin/ifconfig/Makefile
diff -u src/sbin/ifconfig/Makefile:1.57 src/sbin/ifconfig/Makefile:1.58
--- src/sbin/ifconfig/Makefile:1.57 Wed Feb 8 23:14:00 2017
+++ src/sbin/ifconfig/Makefile Wed Feb 8 23:16:41 2017
@@ -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 @@ CPPFLAGS+= -DINET6
SRCS+= af_inet6.c
.endif
-.include "Makefile.inc"
+.include "Makefile.common"
.PATH: ${.CURDIR}/../../lib/libc/net
RUMPSRCS= getifaddrs.c getnameinfo.c if_indextoname.c
Added files:
Index: src/sbin/ifconfig/Makefile.common
diff -u /dev/null src/sbin/ifconfig/Makefile.common:1.1
--- /dev/null Wed Feb 8 23:16:41 2017
+++ src/sbin/ifconfig/Makefile.common Wed Feb 8 23:16:41 2017
@@ -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
