From owner-svn-src-head@freebsd.org Fri Apr 20 22:23:39 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3CC53FA78E1; Fri, 20 Apr 2018 22:23:39 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E38076D947; Fri, 20 Apr 2018 22:23:38 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DE70E1E455; Fri, 20 Apr 2018 22:23:38 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w3KMNcHA096235; Fri, 20 Apr 2018 22:23:38 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w3KMNcnT096231; Fri, 20 Apr 2018 22:23:38 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201804202223.w3KMNcnT096231@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Fri, 20 Apr 2018 22:23:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r332844 - in head/usr.sbin/makefs: . cd9660 ffs X-SVN-Group: head X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: in head/usr.sbin/makefs: . cd9660 ffs X-SVN-Commit-Revision: 332844 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Apr 2018 22:23:39 -0000 Author: emaste Date: Fri Apr 20 22:23:38 2018 New Revision: 332844 URL: https://svnweb.freebsd.org/changeset/base/332844 Log: 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 Modified: head/usr.sbin/makefs/Makefile head/usr.sbin/makefs/cd9660/Makefile.inc head/usr.sbin/makefs/ffs/Makefile.inc Modified: head/usr.sbin/makefs/Makefile ============================================================================== --- head/usr.sbin/makefs/Makefile Fri Apr 20 20:30:33 2018 (r332843) +++ head/usr.sbin/makefs/Makefile Fri Apr 20 22:23:38 2018 (r332844) @@ -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 Modified: head/usr.sbin/makefs/cd9660/Makefile.inc ============================================================================== --- head/usr.sbin/makefs/cd9660/Makefile.inc Fri Apr 20 20:30:33 2018 (r332843) +++ head/usr.sbin/makefs/cd9660/Makefile.inc Fri Apr 20 22:23:38 2018 (r332844) @@ -1,7 +1,7 @@ # $FreeBSD$ # -.PATH: ${SRCDIR}/cd9660 ${SRCTOP}/sys/fs/cd9660/ +.PATH: ${SRCDIR}/cd9660 CFLAGS+=-I${SRCTOP}/sys/fs/cd9660/ Modified: head/usr.sbin/makefs/ffs/Makefile.inc ============================================================================== --- head/usr.sbin/makefs/ffs/Makefile.inc Fri Apr 20 20:30:33 2018 (r332843) +++ head/usr.sbin/makefs/ffs/Makefile.inc Fri Apr 20 22:23:38 2018 (r332844) @@ -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