Module Name: src
Committed By: rin
Date: Wed Feb 8 23:22:43 UTC 2017
Modified Files:
src/distrib/utils/x_ifconfig: Makefile
src/sbin/ifconfig: Makefile Makefile.common
Log Message:
Factor out a common part in Makefile's of ifconfig and x_ifconfig.
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/distrib/utils/x_ifconfig/Makefile
cvs rdiff -u -r1.58 -r1.59 src/sbin/ifconfig/Makefile
cvs rdiff -u -r1.1 -r1.2 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/distrib/utils/x_ifconfig/Makefile
diff -u src/distrib/utils/x_ifconfig/Makefile:1.35 src/distrib/utils/x_ifconfig/Makefile:1.36
--- src/distrib/utils/x_ifconfig/Makefile:1.35 Wed Feb 8 23:16:41 2017
+++ src/distrib/utils/x_ifconfig/Makefile Wed Feb 8 23:22:43 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2017/02/08 23:16:41 rin Exp $
+# $NetBSD: Makefile,v 1.36 2017/02/08 23:22:43 rin Exp $
# Build a smaller ifconfig (i.e. for boot media)
NOMAN= # defined
@@ -14,10 +14,6 @@ CPPFLAGS+= -DINET6
SRCS+= af_inet6.c
.endif
-.ifdef SMALLPROG
-CPPFLAGS+=-DSMALL
-.endif
-
PROG= ifconfig
.include "${.CURDIR}/../../../sbin/ifconfig/Makefile.common"
Index: src/sbin/ifconfig/Makefile
diff -u src/sbin/ifconfig/Makefile:1.58 src/sbin/ifconfig/Makefile:1.59
--- src/sbin/ifconfig/Makefile:1.58 Wed Feb 8 23:16:41 2017
+++ src/sbin/ifconfig/Makefile Wed Feb 8 23:22:43 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2017/02/08 23:16:41 rin Exp $
+# $NetBSD: Makefile,v 1.59 2017/02/08 23:22:43 rin Exp $
# @(#)Makefile 8.1 (Berkeley) 6/5/93
# when making a change to this file, please check if the change is
@@ -25,10 +25,6 @@ RUMPSRCS= getifaddrs.c getnameinfo.c if_
CPPFLAGS+= -DRUMP_ACTION
.endif
-.ifdef SMALLPROG
-CPPFLAGS+=-DSMALL
-.endif
-
CPPFLAGS+=-I${NETBSDSRCDIR}/sys/dist/pf/
SRCS+= pfsync.c
Index: src/sbin/ifconfig/Makefile.common
diff -u src/sbin/ifconfig/Makefile.common:1.1 src/sbin/ifconfig/Makefile.common:1.2
--- src/sbin/ifconfig/Makefile.common:1.1 Wed Feb 8 23:16:41 2017
+++ src/sbin/ifconfig/Makefile.common Wed Feb 8 23:22:43 2017
@@ -1,8 +1,12 @@
-# $NetBSD: Makefile.common,v 1.1 2017/02/08 23:16:41 rin Exp $
+# $NetBSD: Makefile.common,v 1.2 2017/02/08 23:22:43 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
+.endif
+
DPADD+=${LIBUTIL}
DPADD+=${LIBPROP}
LDADD+=-lutil
