Wed Dec 12 06:36:13 2018 UTC ()
 Use DPSRCS for magic.h. OK'd by Christos.


(msaitoh)
diff -r1.10 -r1.11 src/external/bsd/file/lib/Makefile
cvs diff -r1.10 -r1.11 src/external/bsd/file/lib/Makefile (expand / switch to unified diff)

--- src/external/bsd/file/lib/Makefile 2018/10/19 00:11:48 1.10
+++ src/external/bsd/file/lib/Makefile 2018/12/12 06:36:13 1.11
@@ -1,45 +1,44 @@ @@ -1,45 +1,44 @@
1# $NetBSD: Makefile,v 1.10 2018/10/19 00:11:48 christos Exp $ 1# $NetBSD: Makefile,v 1.11 2018/12/12 06:36:13 msaitoh Exp $
2# 2#
3 3
4USE_FORT?= yes # data driven bugs? 4USE_FORT?= yes # data driven bugs?
5 5
6.include <bsd.own.mk> 6.include <bsd.own.mk>
7 7
8.include "../Makefile.inc" 8.include "../Makefile.inc"
9 9
10LIB= magic 10LIB= magic
11LIBDPLIBS+= z ${NETBSDSRCDIR}/lib/libz 11LIBDPLIBS+= z ${NETBSDSRCDIR}/lib/libz
12CPPFLAGS+=-I. 12CPPFLAGS+=-I.
13 13
14.if ${MACHINE_ARCH} == "i386" 14.if ${MACHINE_ARCH} == "i386"
15# Set lint to exit on warnings 15# Set lint to exit on warnings
16# XXX: Soon 16# XXX: Soon
17#LINTFLAGS+= -w 17#LINTFLAGS+= -w
18.endif 18.endif
19 19
20SRCS= magic.c apprentice.c softmagic.c ascmagic.c compress.c \ 20SRCS= magic.c apprentice.c softmagic.c ascmagic.c compress.c \
21 is_json.c is_tar.c readelf.c print.c fsmagic.c apptype.c \ 21 is_json.c is_tar.c readelf.c print.c fsmagic.c apptype.c \
22 funcs.c cdf.c readcdf.c cdf_time.c encoding.c der.c buffer.c 22 funcs.c cdf.c readcdf.c cdf_time.c encoding.c der.c buffer.c
 23DPSRCS= magic.h
23MAN= libmagic.3 24MAN= libmagic.3
24MLINKS+= libmagic.3 magic_open.3 \ 25MLINKS+= libmagic.3 magic_open.3 \
25 libmagic.3 magic_close.3 \ 26 libmagic.3 magic_close.3 \
26 libmagic.3 magic_error.3 \ 27 libmagic.3 magic_error.3 \
27 libmagic.3 magic_file.3 \ 28 libmagic.3 magic_file.3 \
28 libmagic.3 magic_buffer.3 \ 29 libmagic.3 magic_buffer.3 \
29 libmagic.3 magic_setflags.3 \ 30 libmagic.3 magic_setflags.3 \
30 libmagic.3 magic_check.3 \ 31 libmagic.3 magic_check.3 \
31 libmagic.3 magic_compile.3 \ 32 libmagic.3 magic_compile.3 \
32 libmagic.3 magic_load.3 33 libmagic.3 magic_load.3
33INCS= magic.h 34INCS= magic.h
34INCSDIR= /usr/include 35INCSDIR= /usr/include
35 36
36COPTS.softmagic.c = -Wno-format-nonliteral 37COPTS.softmagic.c = -Wno-format-nonliteral
37 38
38magic.c: magic.h 39magic.c: magic.h
39magic.h: magic.h.in 40magic.h: magic.h.in
40 ${TOOL_SED} -e "s/X.YY/${VERSION:S/.//g}/" < ${.ALLSRC} > ${.TARGET} 41 ${TOOL_SED} -e "s/X.YY/${VERSION:S/.//g}/" < ${.ALLSRC} > ${.TARGET}
41CLEANFILES+= magic.h 42CLEANFILES+= magic.h
42 43
43.include <bsd.lib.mk> 44.include <bsd.lib.mk>
44 
45${ALLOBJS}: magic.h