| @@ -1,30 +1,31 @@ | | | @@ -1,30 +1,31 @@ |
1 | # $NetBSD: Makefile,v 1.7 2011/02/21 04:54:52 mrg Exp $ | | 1 | # $NetBSD: Makefile,v 1.8 2011/07/30 11:18:23 tron Exp $ |
2 | | | 2 | |
3 | .include <bsd.own.mk> | | 3 | .include <bsd.own.mk> |
4 | .include "Makefile.common" | | 4 | .include "Makefile.common" |
5 | | | 5 | |
6 | PROG= xkbcomp | | 6 | PROG= xkbcomp |
7 | SRCS= xkbcomp.c xkbscan.c expr.c vmod.c indicators.c misc.c \ | | 7 | SRCS= 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 | |
12 | CPPFLAGS.xkbpath.c= -DDFLT_XKB_CONFIG_ROOT=\"${XKBROOTDIR}\" | | 12 | CPPFLAGS.xkbpath.c= -DDFLT_XKB_CONFIG_ROOT=\"${XKBROOTDIR}\" |
13 | | | 13 | |
14 | CPPFLAGS+= -I${X11SRCDIR.${PROG}} -I${X11SRCDIR.${PROG}}/../include -DHAVE_CONFIG_H | | 14 | CPPFLAGS+= -I${X11SRCDIR.${PROG}} -I${X11SRCDIR.${PROG}}/../include -DHAVE_CONFIG_H |
15 | CPPFLAGS.geometry.c= -Wno-error # XXX | | 15 | CPPFLAGS.geometry.c= -Wno-error # XXX |
| | | 16 | COPTS.xkbscan.c+= -Wno-stack-protector |
16 | | | 17 | |
17 | FILESDIR=${XKBROOTDIR} | | 18 | FILESDIR=${XKBROOTDIR} |
18 | FILES= README | | 19 | FILES= README |
19 | | | 20 | |
20 | SYMLINKS+= ${BINDIR}/xkbcomp ${XKBROOTDIR}/xkbcomp | | 21 | SYMLINKS+= ${BINDIR}/xkbcomp ${XKBROOTDIR}/xkbcomp |
21 | SYMLINKS+= ${XKBDATADIR} ${XKBCOMPDIR} | | 22 | SYMLINKS+= ${XKBDATADIR} ${XKBCOMPDIR} |
22 | | | 23 | |
23 | LDADD+= -lxkbfile -lXext -lX11 | | 24 | LDADD+= -lxkbfile -lXext -lX11 |
24 | DPADD+= ${LIBXKBFILE} ${LIBXEXT} ${LIBX11} | | 25 | DPADD+= ${LIBXKBFILE} ${LIBXEXT} ${LIBX11} |
25 | | | 26 | |
26 | .PATH: ${X11SRCDIR.${PROG}} | | 27 | .PATH: ${X11SRCDIR.${PROG}} |
27 | .PATH: ${X11SRCDIR.${PROG}}/man | | 28 | .PATH: ${X11SRCDIR.${PROG}}/man |
28 | | | 29 | |
29 | .include <bsd.x11.mk> | | 30 | .include <bsd.x11.mk> |
30 | .include <bsd.prog.mk> | | 31 | .include <bsd.prog.mk> |