Date: Fri, 20 Apr 2018 22:23:38 +0000 (UTC) From: Ed Maste <emaste@FreeBSD.org> 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 Message-ID: <201804202223.w3KMNcnT096231@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201804202223.w3KMNcnT096231>