svn commit: r301884 - head/usr.bin/awk

Bryan Drewery bdrewery at FreeBSD.org
Tue Jun 14 16:20:07 UTC 2016


Author: bdrewery
Date: Tue Jun 14 16:20:05 2016
New Revision: 301884
URL: https://svnweb.freebsd.org/changeset/base/301884

Log:
  WITH_META_MODE: Fix rebuilding maketab outside of build-tools.
  
  The bsd.dep.mk yacc targets rely on only the .c file getting a .meta
  file.  However the previous code here relying on only the .h file meant
  that it would be generated with a .meta file.  r301285 made it so that
  the .h file is never expected to get a .meta file.  To keep this
  restriction in place add in an extra dependency on the .c file so that
  it is generated at this time.  It's a hack but the best for the patterns
  we have at the moment for handling build-tools and side-effect-generated
  files.
  
  Reported by:	Mark Millard
  Approved by:	re (implicit)
  Sponsored by:	EMC / Isilon Storage Division

Modified:
  head/usr.bin/awk/Makefile

Modified: head/usr.bin/awk/Makefile
==============================================================================
--- head/usr.bin/awk/Makefile	Tue Jun 14 16:19:59 2016	(r301883)
+++ head/usr.bin/awk/Makefile	Tue Jun 14 16:20:05 2016	(r301884)
@@ -17,8 +17,10 @@ MLINKS=	awk.1 nawk.1
 
 CLEANFILES= maketab proctab.c ytab.h
 
-ytab.h: awkgram.h .NOMETA
-	ln -sf ${.ALLSRC} ${.TARGET}
+# XXX: awkgram.c isn't really needed here but it is added to keep
+# awkgram.h: .NOMETA respected.
+ytab.h: awkgram.c awkgram.h .NOMETA
+	ln -sf ${.ALLSRC:M*.h} ${.TARGET}
 
 proctab.c: maketab
 	${BTOOLSPATH:U.}/maketab > proctab.c


More information about the svn-src-head mailing list