From daddfa7cc7c7ce2d835f2c2aa53a296ce962703b Mon Sep 17 00:00:00 2001
From: Ed Maste <emaste@FreeBSD.org>
Date: Fri, 20 Apr 2018 22:23:38 +0000
Subject: [PATCH] makefs: tidy up reach-over source

- cd9660 relies on an #include "iso.h" but does not build any .c files
  out of source, so remove reach-over .PATH
- ffs does not rely on any sys/ headers, so remove -I from CFLAGS.
- ffs_tables from sys/ is used by ffs; move the SRCS entry from the top-
  level Makefile to ffs' Makefile.inc.

Sponsored by:	The FreeBSD Foundation
---
 usr.sbin/makefs/Makefile            | 3 ---
 usr.sbin/makefs/cd9660/Makefile.inc | 2 +-
 usr.sbin/makefs/ffs/Makefile.inc    | 6 +++---
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/usr.sbin/makefs/Makefile b/usr.sbin/makefs/Makefile
index 8eb19256e479..199837bcddf7 100644
--- a/usr.sbin/makefs/Makefile
+++ b/usr.sbin/makefs/Makefile
@@ -29,9 +29,6 @@ SRCS+=	getid.c misc.c spec.c
 CFLAGS+=-I${SRCTOP}/contrib/mknod
 SRCS+=	pack_dev.c
 
-.PATH:	${SRCTOP}/sys/ufs/ffs
-SRCS+=	ffs_tables.c
-
 CFLAGS+=	-I${SRCTOP}/lib/libnetbsd
 LIBADD=		netbsd util sbuf
 
diff --git a/usr.sbin/makefs/cd9660/Makefile.inc b/usr.sbin/makefs/cd9660/Makefile.inc
index a04664ed4928..b5012a323699 100644
--- a/usr.sbin/makefs/cd9660/Makefile.inc
+++ b/usr.sbin/makefs/cd9660/Makefile.inc
@@ -1,7 +1,7 @@
 #	$FreeBSD$
 #
 
-.PATH:	${SRCDIR}/cd9660 ${SRCTOP}/sys/fs/cd9660/
+.PATH:	${SRCDIR}/cd9660
 
 CFLAGS+=-I${SRCTOP}/sys/fs/cd9660/
 
diff --git a/usr.sbin/makefs/ffs/Makefile.inc b/usr.sbin/makefs/ffs/Makefile.inc
index 2e9f1921b43f..a1e839fd7ab6 100644
--- a/usr.sbin/makefs/ffs/Makefile.inc
+++ b/usr.sbin/makefs/ffs/Makefile.inc
@@ -2,8 +2,8 @@
 #
 
 .PATH:	${SRCDIR}/ffs ${SRCTOP}/sys/ufs/ffs
-
-CFLAGS+=	-I${SRCTOP}/sys/ufs/ffs
-
 SRCS+=	ffs_alloc.c ffs_balloc.c ffs_bswap.c ffs_subr.c ufs_bmap.c
 SRCS+=	buf.c mkfs.c
+
+# Reach-over source from sys/ufs/ffs
+SRCS+=	ffs_tables.c