svn commit: r349062 - in head: bin/csh bin/sh lib/libmagic lib/ncurses/ncurses share/syscons/scrnmaps usr.bin/awk usr.bin/vi/catalog

[Bryan Drewery]

Author: bdrewery
Date: Sat Jun 15 17:08:13 2019
New Revision: 349062
URL: https://svnweb.freebsd.org/changeset/base/349062

Log:
  Fix .depend files to work for build tools.
  
  This is somewhat of a follow-up to r335746.
  
  MFC after:	2 weeks
  Sponsored by:	DellEMC

Modified:
  head/bin/csh/Makefile
  head/bin/sh/Makefile
  head/lib/libmagic/Makefile
  head/lib/ncurses/ncurses/Makefile
  head/share/syscons/scrnmaps/Makefile
  head/usr.bin/awk/Makefile
  head/usr.bin/vi/catalog/Makefile

Modified: head/bin/csh/Makefile
==============================================================================
--- head/bin/csh/Makefile	Sat Jun 15 17:08:02 2019	(r349061)
+++ head/bin/csh/Makefile	Sat Jun 15 17:08:13 2019	(r349062)
@@ -117,6 +117,7 @@ csh.1: tcsh.man
 
 build-tools: gethost
 
+DEPENDOBJS+= gethost
 gethost: gethost.c sh.err.h tc.const.h sh.h ${BUILD_TOOLS_META}
 	@rm -f ${.TARGET}
 	${CC:N${CCACHE_BIN}} -o gethost ${LDFLAGS} ${CFLAGS:C/-DHAVE_ICONV//} \

Modified: head/bin/sh/Makefile
==============================================================================
--- head/bin/sh/Makefile	Sat Jun 15 17:08:02 2019	(r349061)
+++ head/bin/sh/Makefile	Sat Jun 15 17:08:13 2019	(r349062)
@@ -48,6 +48,7 @@ builtins.h: .NOMETA
 builtins.c builtins.h: mkbuiltins builtins.def
 	sh ${.CURDIR}/mkbuiltins ${.CURDIR}
 
+DEPENDOBJS+= mknodes mksyntax
 mknodes mksyntax: ${BUILD_TOOLS_META}
 
 .ORDER: nodes.c nodes.h

Modified: head/lib/libmagic/Makefile
==============================================================================
--- head/lib/libmagic/Makefile	Sat Jun 15 17:08:02 2019	(r349061)
+++ head/lib/libmagic/Makefile	Sat Jun 15 17:08:13 2019	(r349062)
@@ -41,10 +41,11 @@ magic.mgc: mkmagic magic
 	${BTOOLSPATH:U.}/mkmagic magic
 
 CLEANFILES+=	mkmagic
+DEPENDOBJS+=	mkmagic
 build-tools: mkmagic
 mkmagic: apprentice.c cdf_time.c encoding.c funcs.c magic.c print.c ${INCS} ${BUILD_TOOLS_META}
-	${CC:N${CCACHE_BIN}} ${CFLAGS} -DCOMPILE_ONLY ${LDFLAGS} -o ${.TARGET} ${.ALLSRC:N*.h} \
-	    ${LDADD}
+	${CC:N${CCACHE_BIN}} ${CFLAGS} -DCOMPILE_ONLY ${LDFLAGS} -o ${.TARGET} \
+	    ${.ALLSRC:N*.h:O:u} ${LDADD}
 
 FILEVER!= awk '$$1 == "\#define" && $$2 == "VERSION" { print $$3; exit }' \
 			${.CURDIR}/config.h

Modified: head/lib/ncurses/ncurses/Makefile
==============================================================================
--- head/lib/ncurses/ncurses/Makefile	Sat Jun 15 17:08:02 2019	(r349061)
+++ head/lib/ncurses/ncurses/Makefile	Sat Jun 15 17:08:13 2019	(r349062)
@@ -389,6 +389,7 @@ keys.list: MKkeys_list.sh Caps
 	    ${NCURSES_DIR}/include/Caps | LC_ALL=C sort > keys.list
 
 # Build tools
+DEPENDOBJS+= make_hash make_keys
 build-tools: make_hash make_keys
 
 make_keys: make_keys.c names.c ncurses_def.h ${HEADERS} ${BUILD_TOOLS_META}

Modified: head/share/syscons/scrnmaps/Makefile
==============================================================================
--- head/share/syscons/scrnmaps/Makefile	Sat Jun 15 17:08:02 2019	(r349061)
+++ head/share/syscons/scrnmaps/Makefile	Sat Jun 15 17:08:13 2019	(r349062)
@@ -12,6 +12,7 @@ CLEANFILES+= ${SCRMAPS_MK} ${SCRMAPS}
 FILES=	${SCRMAPS}
 FILESDIR= ${SHAREDIR}/syscons/scrnmaps
 
+DEPENDOBJS+= ${SCRMAPS_MK}
 build-tools: ${SCRMAPS_MK}
 
 ${SCRMAPS}: ${.TARGET:R}.mk

Modified: head/usr.bin/awk/Makefile
==============================================================================
--- head/usr.bin/awk/Makefile	Sat Jun 15 17:08:02 2019	(r349061)
+++ head/usr.bin/awk/Makefile	Sat Jun 15 17:08:13 2019	(r349062)
@@ -27,6 +27,7 @@ ytab.h: awkgram.c awkgram.h .NOMETA
 proctab.c: maketab
 	${BTOOLSPATH:U.}/maketab awkgram.h > proctab.c
 
+DEPENDOBJS+= maketab
 build-tools: maketab
 maketab: ytab.h maketab.c ${BUILD_TOOLS_META}
 

Modified: head/usr.bin/vi/catalog/Makefile
==============================================================================
--- head/usr.bin/vi/catalog/Makefile	Sat Jun 15 17:08:02 2019	(r349061)
+++ head/usr.bin/vi/catalog/Makefile	Sat Jun 15 17:08:13 2019	(r349062)
@@ -105,8 +105,8 @@ english.base: dump ${SCAN} #Makefile
 	sort -nu > $@
 
 
-dump: dump.c ${BUILD_TOOLS_META}
-	${CC:N${CCACHE_BIN}} -o ${.TARGET} ${.ALLSRC}
+DEPENDOBJS+=	dump
+dump: ${BUILD_TOOLS_META}
 
 CLEANFILES+= dump ${CAT} english.base *.check __ck1 __ck2