svn commit: r302222 - head/lib/libmagic

[Xin LI]

Author: delphij
Date: Mon Jun 27 06:41:11 2016
New Revision: 302222
URL: https://svnweb.freebsd.org/changeset/base/302222

Log:
  Fix build: explicitly reference the generated magic.h as dependency
  of mkmagic and point its location.
  
  Reported by:	jenkins
  Pointy hat to:	delphij
  MFC after:	2 weeks
  X-MFC-With:	302221
  Approved by:	re (kib)

Modified:
  head/lib/libmagic/Makefile

Modified: head/lib/libmagic/Makefile
==============================================================================
--- head/lib/libmagic/Makefile	Mon Jun 27 01:29:17 2016	(r302221)
+++ head/lib/libmagic/Makefile	Mon Jun 27 06:41:11 2016	(r302222)
@@ -19,7 +19,7 @@ INCS=	magic.h
 MAGICPATH?=	/usr/share/misc
 
 CFLAGS+= -DMAGIC='"${MAGICPATH}/magic"' -DHAVE_CONFIG_H
-CFLAGS+= -I${.CURDIR} -I${CONTRDIR}/src
+CFLAGS+= -I${.CURDIR} -I${.OBJDIR} -I${CONTRDIR}/src
 
 WARNS?=		3
 
@@ -40,8 +40,8 @@ magic.mgc: mkmagic magic
 
 CLEANFILES+=	mkmagic
 build-tools: mkmagic
-mkmagic: apprentice.c cdf_time.c encoding.c funcs.c magic.c print.c ${BUILD_TOOLS_META}
-	${CC} ${CFLAGS} -DCOMPILE_ONLY ${LDFLAGS} -o ${.TARGET} ${.ALLSRC} \
+mkmagic: apprentice.c cdf_time.c encoding.c funcs.c magic.c print.c ${INCS} ${BUILD_TOOLS_META}
+	${CC} ${CFLAGS} -DCOMPILE_ONLY ${LDFLAGS} -o ${.TARGET} ${.ALLSRC:N*.h} \
 	    ${LDADD}
 
 FILEVER!= awk '$$1 == "\#define" && $$2 == "VERSION" { print $$3; exit }' \