Mon Apr 20 13:04:10 2020 UTC ()
Don't let clang warn about comparing pointers with string literals.


(joerg)
diff -r1.21 -r1.22 src/external/bsd/nvi/usr.bin/nvi/Makefile
diff -r1.22 -r1.23 src/external/ibm-public/postfix/Makefile.inc
diff -r1.10 -r1.11 src/external/mit/xorg/bin/xkbcomp/Makefile
cvs diff -r1.21 -r1.22 src/external/bsd/nvi/usr.bin/nvi/Makefile (switch to unified diff)

--- src/external/bsd/nvi/usr.bin/nvi/Makefile 2020/04/12 17:28:57 1.21
+++ src/external/bsd/nvi/usr.bin/nvi/Makefile 2020/04/20 13:04:10 1.22
@@ -1,127 +1,128 @@ @@ -1,127 +1,128 @@
1# $NetBSD: Makefile,v 1.21 2020/04/12 17:28:57 martin Exp $ 1# $NetBSD: Makefile,v 1.22 2020/04/20 13:04:10 joerg Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4 4
5USE_WIDECHAR?=yes 5USE_WIDECHAR?=yes
6 6
7WARNS= 5 7WARNS= 5
8 8
9COPTS.exf.c+= -Wno-format-nonliteral 9COPTS.exf.c+= -Wno-format-nonliteral
10COPTS.msg.c+= -Wno-format-nonliteral 10COPTS.msg.c+= -Wno-format-nonliteral
11.if ${USE_WIDECHAR} == "yes" 11.if ${USE_WIDECHAR} == "yes"
12.if ${ACTIVE_CC} == "gcc" 12.if ${ACTIVE_CC} == "gcc"
13COPTS.regexec.c+= -Wno-old-style-definition 13COPTS.regexec.c+= -Wno-old-style-definition
14.endif 14.endif
15.else 15.else
16COPTS.v_increment.c+= -Wno-format-nonliteral 16COPTS.v_increment.c+= -Wno-format-nonliteral
17CWARNFLAGS.gcc+= -Wno-unused 17CWARNFLAGS.gcc+= -Wno-unused
18CWARNFLAGS.clang+= -Wno-unsequenced 18CWARNFLAGS.clang+= -Wno-unsequenced
19.endif 19.endif
 20CWARNFLAGS.clang+= -Wno-error=string-compare
20 21
21CPPFLAGS+=-I${DIST}/include -I${.CURDIR} -I. 22CPPFLAGS+=-I${DIST}/include -I${.CURDIR} -I.
22CPPFLAGS+=-DGTAGS -DIMCTRL 23CPPFLAGS+=-DGTAGS -DIMCTRL
23CPPFLAGS+=-DHAVE_OPENPTY -DHAVE_UTIL_H 24CPPFLAGS+=-DHAVE_OPENPTY -DHAVE_UTIL_H
24CPPFLAGS+=-DHAVE_SIGTIMEDWAIT  25CPPFLAGS+=-DHAVE_SIGTIMEDWAIT
25CPPFLAGS+=-DHAVE_MVWCHGAT 26CPPFLAGS+=-DHAVE_MVWCHGAT
26 27
27#DBG=-g 28#DBG=-g
28#CPPFLAGS+=-DLOGDEBUG -DTRACE 29#CPPFLAGS+=-DLOGDEBUG -DTRACE
29#CPPFLAGS+=-DDBDEBUG -DTRACE 30#CPPFLAGS+=-DDBDEBUG -DTRACE
30#CPPFLAGS+=-DQUEUEDEBUG 31#CPPFLAGS+=-DQUEUEDEBUG
31 32
32LDADD+= -lcurses -lterminfo -lutil 33LDADD+= -lcurses -lterminfo -lutil
33DPADD+= ${LIBCURSES} ${LIBTERMINFO} ${LIBUTIL} 34DPADD+= ${LIBCURSES} ${LIBTERMINFO} ${LIBUTIL}
34PROG= vi 35PROG= vi
35SRCS= api.c cl_bsd.c cl_funcs.c cl_main.c cl_read.c cl_screen.c cl_term.c \ 36SRCS= api.c cl_bsd.c cl_funcs.c cl_main.c cl_read.c cl_screen.c cl_term.c \
36 conv.c cut.c delete.c ex.c ex_abbrev.c ex_append.c \ 37 conv.c cut.c delete.c ex.c ex_abbrev.c ex_append.c \
37 ex_args.c ex_argv.c ex_at.c ex_bang.c ex_cd.c ex_cmd.c ex_cscope.c \ 38 ex_args.c ex_argv.c ex_at.c ex_bang.c ex_cd.c ex_cmd.c ex_cscope.c \
38 ex_delete.c ex_display.c ex_edit.c ex_equal.c ex_file.c ex_filter.c \ 39 ex_delete.c ex_display.c ex_edit.c ex_equal.c ex_file.c ex_filter.c \
39 ex_global.c ex_init.c ex_join.c ex_map.c ex_mark.c ex_mkexrc.c \ 40 ex_global.c ex_init.c ex_join.c ex_map.c ex_mark.c ex_mkexrc.c \
40 ex_move.c ex_open.c ex_perl.c ex_preserve.c ex_print.c ex_put.c \ 41 ex_move.c ex_open.c ex_perl.c ex_preserve.c ex_print.c ex_put.c \
41 ex_quit.c ex_read.c ex_screen.c ex_script.c ex_set.c ex_shell.c \ 42 ex_quit.c ex_read.c ex_screen.c ex_script.c ex_set.c ex_shell.c \
42 ex_shift.c ex_source.c ex_stop.c ex_subst.c ex_tag.c ex_tcl.c \ 43 ex_shift.c ex_source.c ex_stop.c ex_subst.c ex_tag.c ex_tcl.c \
43 ex_txt.c ex_undo.c ex_usage.c ex_util.c ex_version.c ex_visual.c \ 44 ex_txt.c ex_undo.c ex_usage.c ex_util.c ex_version.c ex_visual.c \
44 ex_write.c ex_yank.c ex_z.c exf.c getc.c gs.c \ 45 ex_write.c ex_yank.c ex_z.c exf.c getc.c gs.c \
45 key.c trace.c \ 46 key.c trace.c \
46 main.c mark.c msg.c nothread.c options.c options_f.c put.c recover.c \ 47 main.c mark.c msg.c nothread.c options.c options_f.c put.c recover.c \
47 screen.c search.c seq.c util.c v_at.c v_ch.c v_cmd.c v_delete.c \ 48 screen.c search.c seq.c util.c v_at.c v_ch.c v_cmd.c v_delete.c \
48 v_event.c v_ex.c v_increment.c v_init.c v_itxt.c v_left.c v_mark.c \ 49 v_event.c v_ex.c v_increment.c v_init.c v_itxt.c v_left.c v_mark.c \
49 v_match.c v_paragraph.c v_put.c v_redraw.c v_replace.c v_right.c \ 50 v_match.c v_paragraph.c v_put.c v_redraw.c v_replace.c v_right.c \
50 v_screen.c v_scroll.c v_search.c v_section.c v_sentence.c v_status.c \ 51 v_screen.c v_scroll.c v_search.c v_section.c v_sentence.c v_status.c \
51 v_txt.c v_ulcase.c v_undo.c v_util.c v_word.c v_xchar.c v_yank.c \ 52 v_txt.c v_ulcase.c v_undo.c v_util.c v_word.c v_xchar.c v_yank.c \
52 v_z.c v_zexit.c vi.c vs_line.c vs_msg.c vs_refresh.c \ 53 v_z.c v_zexit.c vi.c vs_line.c vs_msg.c vs_refresh.c \
53 vs_relative.c vs_smap.c vs_split.c 54 vs_relative.c vs_smap.c vs_split.c
54 55
55NOTUSED=ip_funcs.c ip_read.c ip_screen.c ip_term.c \ 56NOTUSED=ip_funcs.c ip_read.c ip_screen.c ip_term.c \
56 ip_run.c ip_send.c ip_trans.c ipc_cmd.c ipc_method.c 57 ip_run.c ip_send.c ip_trans.c ipc_cmd.c ipc_method.c
57 58
58# For wide char support 59# For wide char support
59.if ${USE_WIDECHAR} == "yes" 60.if ${USE_WIDECHAR} == "yes"
60SRCS+= regcomp.c regerror.c regexec.c regfree.c 61SRCS+= regcomp.c regerror.c regexec.c regfree.c
61CPPFLAGS+=-I${DIST}/regex -D__REGEX_PRIVATE -DUSE_WIDECHAR 62CPPFLAGS+=-I${DIST}/regex -D__REGEX_PRIVATE -DUSE_WIDECHAR
62.endif 63.endif
63 64
64# For db3 db1 emulation 65# For db3 db1 emulation
65#SRCS+=db1.c log.c vi_db.c 66#SRCS+=db1.c log.c vi_db.c
66#CPPFLAGS+=-DUSE_DB1 67#CPPFLAGS+=-DUSE_DB1
67 68
68# For built-in db1 emulation 69# For built-in db1 emulation
69SRCS+=vi_db1.c log1.c 70SRCS+=vi_db1.c log1.c
70CPPFLAGS+=-DUSE_BUNDLED_DB 71CPPFLAGS+=-DUSE_BUNDLED_DB
71 72
72LINKS= ${BINDIR}/vi ${BINDIR}/ex ${BINDIR}/vi ${BINDIR}/view 73LINKS= ${BINDIR}/vi ${BINDIR}/ex ${BINDIR}/vi ${BINDIR}/view
73MLINKS= vi.1 ex.1 vi.1 view.1 74MLINKS= vi.1 ex.1 vi.1 view.1
74 75
75DPSRCS+=options_def.h ipc_def.h ex_def.h # ipc_gen.c 76DPSRCS+=options_def.h ipc_def.h ex_def.h # ipc_gen.c
76CLEANFILES+=options_def.h ipc_def.h ex_def.h # ipc_gen.c 77CLEANFILES+=options_def.h ipc_def.h ex_def.h # ipc_gen.c
77 78
78options_def.h: options.awk options.c 79options_def.h: options.awk options.c
79 ${_MKTARGET_CREATE} 80 ${_MKTARGET_CREATE}
80 ${TOOL_AWK} -f ${.ALLSRC} >${.TARGET} 81 ${TOOL_AWK} -f ${.ALLSRC} >${.TARGET}
81 82
82ex_def.h: ex.awk ex_cmd.c 83ex_def.h: ex.awk ex_cmd.c
83 ${_MKTARGET_CREATE} 84 ${_MKTARGET_CREATE}
84 ${TOOL_AWK} -f ${.ALLSRC} >${.TARGET} 85 ${TOOL_AWK} -f ${.ALLSRC} >${.TARGET}
85 86
86ipc_def.h: ipc.awk vipc.awk ipc_cmd.c ip_read.c 87ipc_def.h: ipc.awk vipc.awk ipc_cmd.c ip_read.c
87 ${_MKTARGET_CREATE} 88 ${_MKTARGET_CREATE}
88 (${TOOL_AWK} -f ${.ALLSRC:M*/ipc.awk} ${.ALLSRC:M*/ipc_cmd.c} && \ 89 (${TOOL_AWK} -f ${.ALLSRC:M*/ipc.awk} ${.ALLSRC:M*/ipc_cmd.c} && \
89 ${TOOL_AWK} -f ${.ALLSRC:M*/vipc.awk} ${.ALLSRC:M*/ip_read.c}) > \ 90 ${TOOL_AWK} -f ${.ALLSRC:M*/vipc.awk} ${.ALLSRC:M*/ip_read.c}) > \
90 ${.TARGET} 91 ${.TARGET}
91 92
92.for i in cl common ex ip ipc vi 93.for i in cl common ex ip ipc vi
93DPSRCS+=${i}_extern.h 94DPSRCS+=${i}_extern.h
94CLEANFILES+=${i}_extern.h 95CLEANFILES+=${i}_extern.h
95# does not work, DIST isn't set yet here 96# does not work, DIST isn't set yet here
96#_${i}_SRCS != echo ${DIST}/${i}/*.c ${DIST}/${i}/*.xs 97#_${i}_SRCS != echo ${DIST}/${i}/*.c ${DIST}/${i}/*.xs
97${i}_extern.h: ${SRCS} ${NOTUSED} 98${i}_extern.h: ${SRCS} ${NOTUSED}
98 ${_MKTARGET_CREATE} 99 ${_MKTARGET_CREATE}
99 @${TOOL_SED} -n "s/^ \* PUBLIC: \(.*\)/\1/p" ${.ALLSRC:M${DIST}/$i/*} > ${.TARGET}.tmp 100 @${TOOL_SED} -n "s/^ \* PUBLIC: \(.*\)/\1/p" ${.ALLSRC:M${DIST}/$i/*} > ${.TARGET}.tmp
100 @if cmp -s ${.TARGET}.tmp ${.TARGET}; then \ 101 @if cmp -s ${.TARGET}.tmp ${.TARGET}; then \
101 rm -f ${.TARGET}.tmp; \ 102 rm -f ${.TARGET}.tmp; \
102 else \ 103 else \
103 mv -f ${.TARGET}.tmp ${.TARGET}; \ 104 mv -f ${.TARGET}.tmp ${.TARGET}; \
104 fi 105 fi
105.endfor 106.endfor
106 107
107DPSRCS+=version.h 108DPSRCS+=version.h
108CLEANFILES+=version.h 109CLEANFILES+=version.h
109version.h: ../../Makefile.inc 110version.h: ../../Makefile.inc
110 ${_MKTARGET_CREATE} 111 ${_MKTARGET_CREATE}
111 echo '#define VI_VERSION "(${VERSION})"' > ${.TARGET} 112 echo '#define VI_VERSION "(${VERSION})"' > ${.TARGET}
112 113
113#ipc_gen.c: vipc.pl ip_read.c 114#ipc_gen.c: vipc.pl ip_read.c
114# ${_MKTARGET_CREATE} 115# ${_MKTARGET_CREATE}
115# ${TOOL_PERL} -n ${.ALLSRC} > ${.TARGET} 116# ${TOOL_PERL} -n ${.ALLSRC} > ${.TARGET}
116 117
117 118
118.include "${.CURDIR}/../../Makefile.inc" 119.include "${.CURDIR}/../../Makefile.inc"
119 120
120.PATH: ${DIST}/vi ${DIST}/ex ${DIST}/cl 121.PATH: ${DIST}/vi ${DIST}/ex ${DIST}/cl
121.PATH: ${DIST}/common 122.PATH: ${DIST}/common
122.PATH: ${DIST}/ipc 123.PATH: ${DIST}/ipc
123.PATH: ${DIST}/ip 124.PATH: ${DIST}/ip
124.PATH: ${DIST}/regex 125.PATH: ${DIST}/regex
125.PATH: ${DIST}/docs/vi.man 126.PATH: ${DIST}/docs/vi.man
126 127
127.include <bsd.prog.mk> 128.include <bsd.prog.mk>
cvs diff -r1.22 -r1.23 src/external/ibm-public/postfix/Makefile.inc (switch to unified diff)

--- src/external/ibm-public/postfix/Makefile.inc 2020/04/04 15:45:45 1.22
+++ src/external/ibm-public/postfix/Makefile.inc 2020/04/20 13:04:10 1.23
@@ -1,96 +1,97 @@ @@ -1,96 +1,97 @@
1# $NetBSD: Makefile.inc,v 1.22 2020/04/04 15:45:45 christos Exp $ 1# $NetBSD: Makefile.inc,v 1.23 2020/04/20 13:04:10 joerg Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4 4
5USE_FORT?= yes # network client and server 5USE_FORT?= yes # network client and server
6CWARNFLAGS.clang+= -Wno-empty-body -Wno-format-extra-args -Wno-string-plus-int 6CWARNFLAGS.clang+= -Wno-empty-body -Wno-format-extra-args \
 7 -Wno-string-plus-int -Wno-string-compare
7WARNS?= 0 8WARNS?= 0
8 9
9PFIX_DISTDIR= ${NETBSDSRCDIR}/external/ibm-public/postfix/dist 10PFIX_DISTDIR= ${NETBSDSRCDIR}/external/ibm-public/postfix/dist
10 11
11CPPFLAGS+= -DNETBSD7 -DUSE_SASL_AUTH -DNO_EAI \ 12CPPFLAGS+= -DNETBSD7 -DUSE_SASL_AUTH -DNO_EAI \
12 -I${DIST} \ 13 -I${DIST} \
13 -I${PFIX_DISTDIR}/src/dns -I${PFIX_DISTDIR}/src/global \ 14 -I${PFIX_DISTDIR}/src/dns -I${PFIX_DISTDIR}/src/global \
14 -I${PFIX_DISTDIR}/src/master -I${PFIX_DISTDIR}/src/util \ 15 -I${PFIX_DISTDIR}/src/master -I${PFIX_DISTDIR}/src/util \
15 -I${PFIX_DISTDIR}/src/tls -I${PFIX_DISTDIR}/src/milter \ 16 -I${PFIX_DISTDIR}/src/tls -I${PFIX_DISTDIR}/src/milter \
16 -I${PFIX_DISTDIR}/src/xsasl \ 17 -I${PFIX_DISTDIR}/src/xsasl \
17 ${${ACTIVE_CC} == "clang":?-Wno-comment:} 18 ${${ACTIVE_CC} == "clang":?-Wno-comment:}
18 19
19CPPFLAGS+= -DUSE_SASL_AUTH 20CPPFLAGS+= -DUSE_SASL_AUTH
20CPPFLAGS+= -DDEF_SERVER_SASL_TYPE=\"dovecot\" 21CPPFLAGS+= -DDEF_SERVER_SASL_TYPE=\"dovecot\"
21 22
22CPPFLAGS+= -DUSE_SASLC_SASL 23CPPFLAGS+= -DUSE_SASLC_SASL
23CPPFLAGS+= -DDEF_CLIENT_SASL_TYPE=\"saslc\" 24CPPFLAGS+= -DDEF_CLIENT_SASL_TYPE=\"saslc\"
24DPADD+= ${LIBSASCL} ${LIBSSL} 25DPADD+= ${LIBSASCL} ${LIBSSL}
25LDADD+= -lsaslc -lssl 26LDADD+= -lsaslc -lssl
26.if (${MKKERBEROS} != "no") 27.if (${MKKERBEROS} != "no")
27DPADD+= ${LIBGSSAPI} ${LIBCRYPTO} 28DPADD+= ${LIBGSSAPI} ${LIBCRYPTO}
28LDADD+= -lgssapi -lcrypto 29LDADD+= -lgssapi -lcrypto
29.endif 30.endif
30 31
31.if defined(HAVE_PCC) 32.if defined(HAVE_PCC)
32# code uses gcc-specific aggregate dynamic array 33# code uses gcc-specific aggregate dynamic array
33CPPFLAGS+= -DCANT_USE_SEND_RECV_MSG 34CPPFLAGS+= -DCANT_USE_SEND_RECV_MSG
34.endif 35.endif
35 36
36# TLS support. 37# TLS support.
37CPPFLAGS+= -DUSE_TLS 38CPPFLAGS+= -DUSE_TLS
38 39
39# IPv6 support. 40# IPv6 support.
40.if ${MKINET6} == "no" 41.if ${MKINET6} == "no"
41CPPFLAGS+= -DNO_IPV6 42CPPFLAGS+= -DNO_IPV6
42.endif 43.endif
43 44
44# SQLite support. 45# SQLite support.
45CPPFLAGS+= -DHAS_SQLITE 46CPPFLAGS+= -DHAS_SQLITE
46. if defined(PROG) 47. if defined(PROG)
47DPADD+= ${LIBSQLITE3} 48DPADD+= ${LIBSQLITE3}
48LDADD+= -lsqlite3 49LDADD+= -lsqlite3
49.endif 50.endif
50 51
51# LDAP support. 52# LDAP support.
52.if ${USE_LDAP} != "no" 53.if ${USE_LDAP} != "no"
53CPPFLAGS+= -DHAS_LDAP 54CPPFLAGS+= -DHAS_LDAP
54 55
55# Automatically link in libldap for a program. 56# Automatically link in libldap for a program.
56. if defined(PROG) 57. if defined(PROG)
57LDADD+= -lldap -llber 58LDADD+= -lldap -llber
58DPADD+= ${LIBLDAP} ${LIBLBER} 59DPADD+= ${LIBLDAP} ${LIBLBER}
59. if (${MKPIC} == "no" || (defined(LDSTATIC) && ${LDSTATIC} != "")) 60. if (${MKPIC} == "no" || (defined(LDSTATIC) && ${LDSTATIC} != ""))
60DPADD+= ${LIBSSL} ${LIBCRYPTO} 61DPADD+= ${LIBSSL} ${LIBCRYPTO}
61LDADD+= -lssl -lcrypto 62LDADD+= -lssl -lcrypto
62. endif 63. endif
63. endif 64. endif
64.endif # USE_LDAP != no 65.endif # USE_LDAP != no
65 66
66PFIX_SRCDIR= ${NETBSDSRCDIR}/external/ibm-public/postfix 67PFIX_SRCDIR= ${NETBSDSRCDIR}/external/ibm-public/postfix
67PFIX_LIBSDIRS= dns dns masterlib master global global util util \ 68PFIX_LIBSDIRS= dns dns masterlib master global global util util \
68 milter milter xsasl xsasl 69 milter milter xsasl xsasl
69 70
70PFIX_LIBSDIRS+= tls tls 71PFIX_LIBSDIRS+= tls tls
71 72
72.for _LD _LL in ${PFIX_LIBSDIRS} 73.for _LD _LL in ${PFIX_LIBSDIRS}
73.if !defined(POBJDIR.${_LL}) 74.if !defined(POBJDIR.${_LL})
74POBJDIR.${_LL}!=cd ${PFIX_SRCDIR}/lib/${_LD} && ${PRINTOBJDIR} 75POBJDIR.${_LL}!=cd ${PFIX_SRCDIR}/lib/${_LD} && ${PRINTOBJDIR}
75.MAKEOVERRIDES+=POBJDIR.${_LL} 76.MAKEOVERRIDES+=POBJDIR.${_LL}
76.endif 77.endif
77LIBP${_LL:tu}= ${POBJDIR.${_LL}}/lib${_LL}.a 78LIBP${_LL:tu}= ${POBJDIR.${_LL}}/lib${_LL}.a
78.endfor 79.endfor
79 80
80 81
81# Directories to install into. 82# Directories to install into.
82# 83#
83PFIX_LIBEXECDIR=/usr/libexec/postfix 84PFIX_LIBEXECDIR=/usr/libexec/postfix
84PFIX_ETCDIR= /etc/postfix 85PFIX_ETCDIR= /etc/postfix
85PFIX_EXAMPLEDIR=/usr/share/examples/postfix 86PFIX_EXAMPLEDIR=/usr/share/examples/postfix
86PFIX_HTMLDIR= /usr/share/doc/reference/ref8/postfix 87PFIX_HTMLDIR= /usr/share/doc/reference/ref8/postfix
87PFIX_SBINDIR= /usr/sbin 88PFIX_SBINDIR= /usr/sbin
88 89
89# override defaults which are otherwise empty and/or so postconf is correct 90# override defaults which are otherwise empty and/or so postconf is correct
90CPPFLAGS+= -DDEF_HTML_DIR=\"${PFIX_HTMLDIR}\" \ 91CPPFLAGS+= -DDEF_HTML_DIR=\"${PFIX_HTMLDIR}\" \
91 -DDEF_README_DIR=\"${PFIX_EXAMPLEDIR}\" \ 92 -DDEF_README_DIR=\"${PFIX_EXAMPLEDIR}\" \
92 -DDEF_SAMPLE_DIR=\"${PFIX_EXAMPLEDIR}\" \ 93 -DDEF_SAMPLE_DIR=\"${PFIX_EXAMPLEDIR}\" \
93 -DDEF_MANPAGE_DIR=\"${MANDIR}\" 94 -DDEF_MANPAGE_DIR=\"${MANDIR}\"
94 95
95# postfix check wants a lot of files to be owned by root 96# postfix check wants a lot of files to be owned by root
96BINOWN= root 97BINOWN= root
cvs diff -r1.10 -r1.11 src/external/mit/xorg/bin/xkbcomp/Makefile (switch to unified diff)

--- src/external/mit/xorg/bin/xkbcomp/Makefile 2015/07/20 23:50:23 1.10
+++ src/external/mit/xorg/bin/xkbcomp/Makefile 2020/04/20 13:04:10 1.11
@@ -1,36 +1,36 @@ @@ -1,36 +1,36 @@
1# $NetBSD: Makefile,v 1.10 2015/07/20 23:50:23 mrg Exp $ 1# $NetBSD: Makefile,v 1.11 2020/04/20 13:04:10 joerg Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4.include "Makefile.common" 4.include "Makefile.common"
5 5
6PROG= xkbcomp 6PROG= xkbcomp
7SRCS= xkbcomp.c xkbscan.c expr.c vmod.c indicators.c misc.c \ 7SRCS= xkbcomp.c xkbscan.c expr.c vmod.c indicators.c misc.c \
8 keymap.c keycodes.c keytypes.c compat.c action.c alias.c \ 8 keymap.c keycodes.c keytypes.c compat.c action.c alias.c \
9 symbols.c geometry.c xkbpath.c listing.c \ 9 symbols.c geometry.c xkbpath.c listing.c \
10 xkbparse.y parseutils.c utils.c 10 xkbparse.y parseutils.c utils.c
11 11
12CPPFLAGS.xkbpath.c= -DDFLT_XKB_CONFIG_ROOT=\"${XKBROOTDIR}\" 12CPPFLAGS.xkbpath.c= -DDFLT_XKB_CONFIG_ROOT=\"${XKBROOTDIR}\"
13 13
14CPPFLAGS+= -I${X11SRCDIR.${PROG}} 14CPPFLAGS+= -I${X11SRCDIR.${PROG}}
15CPPFLAGS+= -DHAVE_STRDUP -DHAVE_STRCASECMP 15CPPFLAGS+= -DHAVE_STRDUP -DHAVE_STRCASECMP
16CPPFLAGS.geometry.c= -Wno-error # XXX 16CPPFLAGS.geometry.c= -Wno-error # XXX
17COPTS.xkbscan.c+= -Wno-stack-protector 17COPTS.xkbscan.c+= -Wno-stack-protector
18 18
19FILESDIR=${XKBROOTDIR} 19FILESDIR=${XKBROOTDIR}
20FILES= README 20FILES= README
21 21
22SYMLINKS+= ${BINDIR}/xkbcomp ${XKBROOTDIR}/xkbcomp 22SYMLINKS+= ${BINDIR}/xkbcomp ${XKBROOTDIR}/xkbcomp
23SYMLINKS+= ${XKBDATADIR} ${XKBCOMPDIR} 23SYMLINKS+= ${XKBDATADIR} ${XKBCOMPDIR}
24 24
25LDADD+= -lxkbfile -lXext -lX11 25LDADD+= -lxkbfile -lXext -lX11
26DPADD+= ${LIBXKBFILE} ${LIBXEXT} ${LIBX11} 26DPADD+= ${LIBXKBFILE} ${LIBXEXT} ${LIBX11}
27 27
28.PATH: ${X11SRCDIR.${PROG}} 28.PATH: ${X11SRCDIR.${PROG}}
29.PATH: ${X11SRCDIR.${PROG}}/man 29.PATH: ${X11SRCDIR.${PROG}}/man
30 30
31CWARNFLAGS.clang+= -Wno-parentheses 31CWARNFLAGS.clang+= -Wno-parentheses -Wno-string-compare
32 32
33.include "../../xorg-pkg-ver.mk" 33.include "../../xorg-pkg-ver.mk"
34 34
35.include <bsd.x11.mk> 35.include <bsd.x11.mk>
36.include <bsd.prog.mk> 36.include <bsd.prog.mk>