| @@ -1,14 +1,14 @@ | | | @@ -1,14 +1,14 @@ |
1 | # $NetBSD: Makefile.libx11,v 1.8 2011/02/23 07:53:29 mrg Exp $ | | 1 | # $NetBSD: Makefile.libx11,v 1.8.6.1 2013/06/12 03:52:39 msaitoh Exp $ |
2 | | | 2 | |
3 | LIB= X11 | | 3 | LIB= X11 |
4 | .PATH: ${X11SRCDIR.${LIB}}/src | | 4 | .PATH: ${X11SRCDIR.${LIB}}/src |
5 | .PATH: ${X11SRCDIR.${LIB}}/src/xkb | | 5 | .PATH: ${X11SRCDIR.${LIB}}/src/xkb |
6 | .PATH: ${X11SRCDIR.${LIB}}/src/xcms | | 6 | .PATH: ${X11SRCDIR.${LIB}}/src/xcms |
7 | .PATH: ${X11SRCDIR.${LIB}}/src/xlibi18n | | 7 | .PATH: ${X11SRCDIR.${LIB}}/src/xlibi18n |
8 | | | 8 | |
9 | SRCS= \ | | 9 | SRCS= \ |
10 | AllCells.c \ | | 10 | AllCells.c \ |
11 | AllowEv.c \ | | 11 | AllowEv.c \ |
12 | AllPlanes.c \ | | 12 | AllPlanes.c \ |
13 | AutoRep.c \ | | 13 | AutoRep.c \ |
14 | Backgnd.c \ | | 14 | Backgnd.c \ |
| @@ -451,15 +451,19 @@ CPPFLAGS.imTrans.c= $(CONN_DEFINES) $(XT | | | @@ -451,15 +451,19 @@ CPPFLAGS.imTrans.c= $(CONN_DEFINES) $(XT |
451 | CPPFLAGS.imTransR.c= $(CONN_DEFINES) $(XTRANS_XIM_DEFINES) | | 451 | CPPFLAGS.imTransR.c= $(CONN_DEFINES) $(XTRANS_XIM_DEFINES) |
452 | CPPFLAGS.lcFile.c= $(XLC_DEFINES) $(SETID_DEFINES) | | 452 | CPPFLAGS.lcFile.c= $(XLC_DEFINES) $(SETID_DEFINES) |
453 | CPPFLAGS.x11trans.c= $(TRANS_INCLUDES) $(CONN_DEFINES) $(SOCK_DEFINES) $(XTRANS_X_DEFINES) $(POLL_DEFINES) | | 453 | CPPFLAGS.x11trans.c= $(TRANS_INCLUDES) $(CONN_DEFINES) $(SOCK_DEFINES) $(XTRANS_X_DEFINES) $(POLL_DEFINES) |
454 | CPPFLAGS.ximtrans.c= $(TRANS_INCLUDES) $(CONN_DEFINES) $(SOCK_DEFINES) $(XTRANS_XIM_DEFINES) $(POLL_DEFINES) | | 454 | CPPFLAGS.ximtrans.c= $(TRANS_INCLUDES) $(CONN_DEFINES) $(SOCK_DEFINES) $(XTRANS_XIM_DEFINES) $(POLL_DEFINES) |
455 | | | 455 | |
456 | #BUILDSYMLINKS= transport.c x11trans.c \ | | 456 | #BUILDSYMLINKS= transport.c x11trans.c \ |
457 | # transport.c ximtrans.c | | 457 | # transport.c ximtrans.c |
458 | | | 458 | |
459 | COPTS.StBytes.c+= -Wno-error | | 459 | COPTS.StBytes.c+= -Wno-error |
460 | COPTS.lcUTF8.c+= -Wno-error | | 460 | COPTS.lcUTF8.c+= -Wno-error |
461 | COPTS.Font.c+= -Wno-error # XXX xf86bigfstr.h | | 461 | COPTS.Font.c+= -Wno-error # XXX xf86bigfstr.h |
462 | COPTS.OpenDis.c+= -Wno-error # XXX xf86bigfstr.h | | 462 | COPTS.OpenDis.c+= -Wno-error # XXX xf86bigfstr.h |
463 | COPTS.XlibInt.c+= -Wno-error # XXX xcmiscstr.h | | 463 | COPTS.XlibInt.c+= -Wno-error # XXX xcmiscstr.h |
| | | 464 | .if ${HAVE_GCC} < 45 |
| | | 465 | COPTS.LiHosts.c+= -Wno-error # XXX: old gcc figures out that const |
| | | 466 | # cond because nHosts < max_hosts |
| | | 467 | .endif |
464 | | | 468 | |
465 | .include "${NETBSDSRCDIR}/external/mit/xorg/tools/makekeys/Makefile.makekeys" | | 469 | .include "${NETBSDSRCDIR}/external/mit/xorg/tools/makekeys/Makefile.makekeys" |