Module Name: src
Committed By: he
Date: Tue Sep 15 09:22:07 UTC 2009
Modified Files:
src/sbin/ifconfig: Makefile Makefile.inc
Log Message:
Move the addition of pfsync.c from Makefile.inc to Makefile,
so that this part doesn't get included in install media versions
of ifconfig, as per comments on source-changes@ from Izumi Tsutsui.
Also re-instate the use of ${.CURDIR} when setting up the include path.
To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 src/sbin/ifconfig/Makefile
cvs rdiff -u -r1.5 -r1.6 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/sbin/ifconfig/Makefile
diff -u src/sbin/ifconfig/Makefile:1.43 src/sbin/ifconfig/Makefile:1.44
--- src/sbin/ifconfig/Makefile:1.43 Tue Jun 2 23:41:35 2009
+++ src/sbin/ifconfig/Makefile Tue Sep 15 09:22:07 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2009/06/02 23:41:35 pooka Exp $
+# $NetBSD: Makefile,v 1.44 2009/09/15 09:22:07 he Exp $
# @(#)Makefile 8.1 (Berkeley) 6/5/93
# when making a change to this file, please check if the change is
@@ -17,6 +17,9 @@
.include "Makefile.inc"
+CPPFLAGS+=-I ${.CURDIR}/../../sys/dist/pf/
+SRCS+= pfsync.c
+
.if ${MACHINE_ARCH} == "m68000"
# XXX workaround for gcc -O1 bug (PR bin/40036 and toolchain/40066)
COPTS.ifconfig.c+= -fno-loop-optimize
Index: src/sbin/ifconfig/Makefile.inc
diff -u src/sbin/ifconfig/Makefile.inc:1.5 src/sbin/ifconfig/Makefile.inc:1.6
--- src/sbin/ifconfig/Makefile.inc:1.5 Mon Sep 14 15:12:21 2009
+++ src/sbin/ifconfig/Makefile.inc Tue Sep 15 09:22:07 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.5 2009/09/14 15:12:21 he Exp $
+# $NetBSD: Makefile.inc,v 1.6 2009/09/15 09:22:07 he Exp $
PROG= ifconfig
@@ -19,6 +19,3 @@
SRCS+= tunnel.c
SRCS+= util.c
SRCS+= vlan.c
-
-CPPFLAGS+=-I ${NETBSDSRCDIR}/sys/dist/pf/
-SRCS+= pfsync.c
