Author: bdrewery
Date: Sat Mar 12 22:21:14 2016
New Revision: 296771
URL: https://svnweb.freebsd.org/changeset/base/296771
Log:
Reduce duplicated logic from r291744.
Sponsored by: EMC / Isilon Storage Division
Modified:
head/sys/conf/config.mk
head/sys/conf/kmod.mk
head/sys/modules/Makefile
Modified: head/sys/conf/config.mk
==============================================================================
--- head/sys/conf/config.mk Sat Mar 12 22:21:02 2016 (r296770)
+++ head/sys/conf/config.mk Sat Mar 12 22:21:14 2016 (r296771)
@@ -53,3 +53,8 @@ KERN_OPTS+= DEV_EISA
KERN_OPTS!=cat ${KERNBUILDDIR}/opt*.h | awk '{print $$2;}' | sort -u
.export KERN_OPTS
.endif
+
+.if !defined(__MPATH)
+__MPATH!=find ${SYSDIR:tA}/ -name \*_if.m
+.export __MPATH
+.endif
Modified: head/sys/conf/kmod.mk
==============================================================================
--- head/sys/conf/kmod.mk Sat Mar 12 22:21:02 2016 (r296770)
+++ head/sys/conf/kmod.mk Sat Mar 12 22:21:14 2016 (r296771)
@@ -386,11 +386,7 @@ vnode_if_typedef.h:
.endif
# Build _if.[ch] from _if.m, and clean them when we're done.
-# This is duplicated in sys/modules/Makefile.
-.if !defined(__MPATH)
-__MPATH!=find ${SYSDIR:tA}/ -name \*_if.m
-.export __MPATH
-.endif
+# __MPATH defined in config.mk
_MFILES=${__MPATH:T:O}
_MPATH=${__MPATH:H:O:u}
.PATH.m: ${_MPATH}
Modified: head/sys/modules/Makefile
==============================================================================
--- head/sys/modules/Makefile Sat Mar 12 22:21:02 2016 (r296770)
+++ head/sys/modules/Makefile Sat Mar 12 22:21:14 2016 (r296771)
@@ -775,12 +775,6 @@ afterinstall:
.include "${SYSDIR}/conf/config.mk"
-# Use sys/conf/kmod.mk's MPATH to avoid redundantly running in every subdir.
-.if !defined(__MPATH)
-__MPATH!=find ${SYSDIR:tA}/ -name \*_if.m
-.export __MPATH
-.endif
-
SUBDIR:= ${SUBDIR:u:O}
.include <bsd.subdir.mk>
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
