diff options
| author | delphij <delphij@FreeBSD.org> | 2016-06-27 06:41:11 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2016-06-27 06:41:11 +0000 |
| commit | 05dea908a0038cf030676684bfb2e147aa42ae10 (patch) | |
| tree | 5e6fd8ea125ef05a5ab40b857816dd7f37fbf203 /lib | |
| parent | f1bd70502f890a8668985030c0aecc3aeacb10ac (diff) | |
| download | FreeBSD-src-05dea908a0038cf030676684bfb2e147aa42ae10.zip FreeBSD-src-05dea908a0038cf030676684bfb2e147aa42ae10.tar.gz | |
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)
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libmagic/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/libmagic/Makefile b/lib/libmagic/Makefile index d578b70..302338c 100644 --- a/lib/libmagic/Makefile +++ b/lib/libmagic/Makefile @@ -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 }' \ |
