head 1.5; access; symbols netbsd-11-0-RC5:1.5 netbsd-11-0-RC4:1.5 netbsd-11-0-RC3:1.5 netbsd-11-0-RC2:1.5 netbsd-11-0-RC1:1.5 perseant-exfatfs-base-20250801:1.5 netbsd-11:1.5.0.6 netbsd-11-base:1.5 netbsd-10-1-RELEASE:1.5 perseant-exfatfs-base-20240630:1.5 perseant-exfatfs:1.5.0.4 perseant-exfatfs-base:1.5 netbsd-8-3-RELEASE:1.3 netbsd-9-4-RELEASE:1.3 netbsd-10-0-RELEASE:1.5 netbsd-10-0-RC6:1.5 netbsd-10-0-RC5:1.5 netbsd-10-0-RC4:1.5 netbsd-10-0-RC3:1.5 netbsd-10-0-RC2:1.5 netbsd-10-0-RC1:1.5 netbsd-10:1.5.0.2 netbsd-10-base:1.5 netbsd-9-3-RELEASE:1.3 cjep_sun2x-base1:1.3 cjep_sun2x:1.3.0.24 cjep_sun2x-base:1.3 cjep_staticlib_x-base1:1.3 netbsd-9-2-RELEASE:1.3 cjep_staticlib_x:1.3.0.22 cjep_staticlib_x-base:1.3 netbsd-9-1-RELEASE:1.3 phil-wifi-20200421:1.3 phil-wifi-20200411:1.3 is-mlppp:1.3.0.20 is-mlppp-base:1.3 phil-wifi-20200406:1.3 netbsd-8-2-RELEASE:1.3 netbsd-9-0-RELEASE:1.3 netbsd-9-0-RC2:1.3 netbsd-9-0-RC1:1.3 phil-wifi-20191119:1.3 netbsd-9:1.3.0.18 netbsd-9-base:1.3 phil-wifi-20190609:1.3 netbsd-8-1-RELEASE:1.3 netbsd-8-1-RC1:1.3 pgoyette-compat-merge-20190127:1.3 pgoyette-compat-20190127:1.3 pgoyette-compat-20190118:1.3 pgoyette-compat-1226:1.3 pgoyette-compat-1126:1.3 pgoyette-compat-1020:1.3 pgoyette-compat-0930:1.3 pgoyette-compat-0906:1.3 netbsd-7-2-RELEASE:1.2.20.1 pgoyette-compat-0728:1.3 netbsd-8-0-RELEASE:1.3 phil-wifi:1.3.0.16 phil-wifi-base:1.3 pgoyette-compat-0625:1.3 netbsd-8-0-RC2:1.3 pgoyette-compat-0521:1.3 pgoyette-compat-0502:1.3 pgoyette-compat-0422:1.3 netbsd-8-0-RC1:1.3 pgoyette-compat-0415:1.3 pgoyette-compat-0407:1.3 pgoyette-compat-0330:1.3 pgoyette-compat-0322:1.3 pgoyette-compat-0315:1.3 netbsd-7-1-2-RELEASE:1.2.20.1 pgoyette-compat:1.3.0.14 pgoyette-compat-base:1.3 netbsd-7-1-1-RELEASE:1.2.20.1 matt-nb8-mediatek:1.3.0.12 matt-nb8-mediatek-base:1.3 perseant-stdc-iso10646:1.3.0.10 perseant-stdc-iso10646-base:1.3 netbsd-8:1.3.0.8 netbsd-8-base:1.3 prg-localcount2-base3:1.3 prg-localcount2-base2:1.3 prg-localcount2-base1:1.3 prg-localcount2:1.3.0.6 prg-localcount2-base:1.3 pgoyette-localcount-20170426:1.3 bouyer-socketcan-base1:1.3 pgoyette-localcount-20170320:1.3 netbsd-7-1:1.2.20.1.0.2 netbsd-7-1-RELEASE:1.2.20.1 netbsd-7-1-RC2:1.2.20.1 netbsd-7-nhusb-base-20170116:1.2.20.1 bouyer-socketcan:1.3.0.4 bouyer-socketcan-base:1.3 pgoyette-localcount-20170107:1.3 netbsd-7-1-RC1:1.2.20.1 pgoyette-localcount-20161104:1.3 netbsd-7-0-2-RELEASE:1.2 localcount-20160914:1.3 netbsd-7-nhusb:1.2.0.24 netbsd-7-nhusb-base:1.2 pgoyette-localcount-20160806:1.3 pgoyette-localcount-20160726:1.3 pgoyette-localcount:1.3.0.2 pgoyette-localcount-base:1.3 netbsd-7-0-1-RELEASE:1.2 netbsd-7-0:1.2.0.22 netbsd-7-0-RELEASE:1.2 netbsd-7-0-RC3:1.2 netbsd-7-0-RC2:1.2 netbsd-7-0-RC1:1.2 netbsd-5-2-3-RELEASE:1.1.1.1 netbsd-5-1-5-RELEASE:1.1.1.1 netbsd-6-0-6-RELEASE:1.2 netbsd-6-1-5-RELEASE:1.2 netbsd-7:1.2.0.20 netbsd-7-base:1.2 yamt-pagecache-base9:1.2 yamt-pagecache-tag8:1.2 netbsd-6-1-4-RELEASE:1.2 netbsd-6-0-5-RELEASE:1.2 tls-earlyentropy:1.2.0.18 tls-earlyentropy-base:1.2 riastradh-xf86-video-intel-2-7-1-pre-2-21-15:1.2 riastradh-drm2-base3:1.2 netbsd-6-1-3-RELEASE:1.2 netbsd-6-0-4-RELEASE:1.2 netbsd-5-2-2-RELEASE:1.1.1.1 netbsd-5-1-4-RELEASE:1.1.1.1 netbsd-6-1-2-RELEASE:1.2 netbsd-6-0-3-RELEASE:1.2 netbsd-5-2-1-RELEASE:1.1.1.1 netbsd-5-1-3-RELEASE:1.1.1.1 netbsd-6-1-1-RELEASE:1.2 riastradh-drm2-base2:1.2 riastradh-drm2-base1:1.2 riastradh-drm2:1.2.0.12 riastradh-drm2-base:1.2 netbsd-6-1:1.2.0.16 netbsd-6-0-2-RELEASE:1.2 netbsd-6-1-RELEASE:1.2 netbsd-6-1-RC4:1.2 netbsd-6-1-RC3:1.2 agc-symver:1.2.0.14 agc-symver-base:1.2 netbsd-6-1-RC2:1.2 netbsd-6-1-RC1:1.2 yamt-pagecache-base8:1.2 netbsd-5-2:1.1.1.1.0.4 netbsd-6-0-1-RELEASE:1.2 yamt-pagecache-base7:1.2 netbsd-5-2-RELEASE:1.1.1.1 netbsd-5-2-RC1:1.1.1.1 matt-nb6-plus-nbase:1.2 yamt-pagecache-base6:1.2 netbsd-6-0:1.2.0.10 netbsd-6-0-RELEASE:1.2 netbsd-6-0-RC2:1.2 tls-maxphys:1.2.0.8 tls-maxphys-base:1.2 matt-nb6-plus:1.2.0.6 matt-nb6-plus-base:1.2 netbsd-6-0-RC1:1.2 yamt-pagecache-base5:1.2 yamt-pagecache-base4:1.2 netbsd-6:1.2.0.4 netbsd-6-base:1.2 netbsd-5-1-2-RELEASE:1.1.1.1 netbsd-5-1-1-RELEASE:1.1.1.1 yamt-pagecache-base3:1.2 yamt-pagecache-base2:1.2 yamt-pagecache:1.2.0.2 yamt-pagecache-base:1.2 cherry-xenmp:1.1.1.1.0.22 cherry-xenmp-base:1.1.1.1 bouyer-quota2-nbase:1.1.1.1 bouyer-quota2:1.1.1.1.0.20 bouyer-quota2-base:1.1.1.1 matt-mips64-premerge-20101231:1.1.1.1 matt-nb5-mips64-premerge-20101231:1.1.1.1 matt-nb5-pq3:1.1.1.1.0.18 matt-nb5-pq3-base:1.1.1.1 netbsd-5-1:1.1.1.1.0.16 netbsd-5-1-RELEASE:1.1.1.1 netbsd-5-1-RC4:1.1.1.1 matt-nb5-mips64-k15:1.1.1.1 netbsd-5-1-RC3:1.1.1.1 netbsd-5-1-RC2:1.1.1.1 netbsd-5-1-RC1:1.1.1.1 netbsd-5-0-2-RELEASE:1.1.1.1 matt-nb5-mips64-premerge-20091211:1.1.1.1 matt-premerge-20091211:1.1.1.1 matt-nb5-mips64-u2-k2-k4-k7-k8-k9:1.1.1.1 matt-nb4-mips64-k7-u2a-k9b:1.1.1.1 matt-nb5-mips64-u1-k1-k5:1.1.1.1 matt-nb5-mips64:1.1.1.1.0.14 netbsd-5-0-1-RELEASE:1.1.1.1 jym-xensuspend-nbase:1.1.1.1 netbsd-5-0:1.1.1.1.0.12 netbsd-5-0-RELEASE:1.1.1.1 netbsd-5-0-RC4:1.1.1.1 netbsd-5-0-RC3:1.1.1.1 netbsd-5-0-RC2:1.1.1.1 jym-xensuspend:1.1.1.1.0.10 jym-xensuspend-base:1.1.1.1 netbsd-5-0-RC1:1.1.1.1 haad-dm-base:1.1.1.1 haad-dm-base2:1.1.1.1 haad-nbase2:1.1.1.1 netbsd-5:1.1.1.1.0.8 netbsd-5-base:1.1.1.1 matt-mips64-base2:1.1.1.1 haad-dm:1.1.1.1.0.6 haad-dm-base1:1.1.1.1 wrstuden-revivesa-base-3:1.1.1.1 wrstuden-revivesa:1.1.1.1.0.2 wrstuden-revivesa-base-2:1.1.1.1 oinkoink:1.1.1.1 mrg-and-rtr:1.1.1; locks; strict; comment @# @; 1.5 date 2021.11.16.09.25.51; author nia; state Exp; branches; next 1.4; commitid ZhN9fVPgGjpz60hD; 1.4 date 2021.07.13.05.53.13; author mrg; state Exp; branches; next 1.3; commitid 5po6tRFPFYECYM0D; 1.3 date 2016.06.02.22.41.26; author mrg; state Exp; branches; next 1.2; commitid bDug2YlLbP9EyW8z; 1.2 date 2011.08.11.23.15.38; author joerg; state Exp; branches 1.2.20.1 1.2.24.1; next 1.1; 1.1 date 2008.07.29.05.01.22; author mrg; state Exp; branches 1.1.1.1; next ; 1.2.20.1 date 2016.12.23.08.04.04; author snj; state Exp; branches; next ; commitid XwXtErZDSEkP95zz; 1.2.24.1 date 2017.01.18.08.46.21; author skrll; state Exp; branches; next ; commitid M6f3RyDtiAR3wqCz; 1.1.1.1 date 2008.07.29.05.01.22; author mrg; state Exp; branches 1.1.1.1.2.1 1.1.1.1.6.1; next ; 1.1.1.1.2.1 date 2008.07.29.05.01.22; author wrstuden; state dead; branches; next 1.1.1.1.2.2; 1.1.1.1.2.2 date 2008.09.18.05.18.36; author wrstuden; state Exp; branches; next ; 1.1.1.1.6.1 date 2008.07.29.05.01.22; author haad; state dead; branches; next 1.1.1.1.6.2; 1.1.1.1.6.2 date 2008.10.19.22.41.08; author haad; state Exp; branches; next ; desc @@ 1.5 log @xorg: sprinkle a little bit of USE_FORT around @ text @# $NetBSD: Makefile,v 1.4 2021/07/13 05:53:13 mrg Exp $ NOPIC= 1 USE_FORT?= yes # data-driven bugs? .include .include "../Makefile.libx11" .include "../Makefile.ximcp" .include "../Makefile.xlcDef" .include "../Makefile.xlcUTF8Load" .include "../Makefile.xlibi18n" .include "../Makefile.xomGeneric" SRCS+= \ ${SRCS.ximcp} \ ${SRCS.xlcDef} \ ${SRCS.xlcUTF8Load} \ ${SRCS.xlibi18n} \ ${SRCS.xomGeneric} CWARNFLAGS.clang+= -Wno-parentheses .include .include @ 1.4 log @move the i18n modules into libX11 directly. fixes at least alacritty, and saves memory too. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.3 2016/06/02 22:41:26 mrg Exp $ d5 2 @ 1.3 log @fix PR 48928: build the static libX11 properly. pull in the ximcp, xlcDef, xlcUTF8Load, xlibi18n, and xomGeneric modules directly. also, don't include bsd.lib.mk in the fragment parts for these modules, but in the module build itself. otherwise, bsd.lib.mk is included before SRCS is complete and the build strangely seems to miss parts listed. tested using the example in the PR. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.2 2011/08/11 23:15:38 joerg Exp $ a20 4 SRCS+= \ XlcDL.c \ XlcSL.c @ 1.2 log @Various warning adjustments for clang @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $ d8 5 d14 6 a19 9 .if 0 SRCS+= imCallbk.c imDefFlt.c imDefIc.c imDefIm.c imDefLkup.c imDispch.c \ imEvToWire.c imExten.c imImSw.c imInsClbk.c imInt.c imLcFlt.c \ imLcGIc.c imLcIc.c imLcIm.c imLcLkup.c imLcPrs.c imLcSIc.c imRm.c \ imRmAttr.c imThaiFlt.c imThaiIc.c imThaiIm.c imTrX.c imTrans.c \ imTransR.c lcEuc.c lcGenConv.c lcJis.c lcSjis.c lcUTF8Load.c \ omDefault.c omGeneric.c omImText.c omText.c omTextEsc.c omTextExt.c \ omTextPer.c omXChar.c .endif @ 1.2.24.1 log @Sync with netbsd-5 @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.2.20.1 2016/12/23 08:04:04 snj Exp $ a7 5 .include "../Makefile.ximcp" .include "../Makefile.xlcDef" .include "../Makefile.xlcUTF8Load" .include "../Makefile.xlibi18n" .include "../Makefile.xomGeneric" d9 9 a17 6 SRCS+= \ ${SRCS.ximcp} \ ${SRCS.xlcDef} \ ${SRCS.xlcUTF8Load} \ ${SRCS.xlibi18n} \ ${SRCS.xomGeneric} @ 1.2.20.1 log @Pull up following revision(s) (requested by mrg in ticket #1336): external/mit/xorg/lib/libX11/Makefile.xlibi18n: revision 1.2 external/mit/xorg/lib/libX11/xlcUTF8Load/Makefile: revision 1.2 external/mit/xorg/lib/libX11/xlcDef/Makefile: revision 1.2 external/mit/xorg/lib/libX11/Makefile.xomGeneric: revision 1.2 external/mit/xorg/lib/libX11/xomGeneric/Makefile: revision 1.2 external/mit/xorg/lib/libX11/Makefile.xlcDef: revision 1.2 external/mit/xorg/lib/libX11/xlibi18n/Makefile: revision 1.2 external/mit/xorg/lib/libX11/ximcp/Makefile: revision 1.4 external/mit/xorg/lib/libX11/static/Makefile: revision 1.3 external/mit/xorg/lib/libX11/Makefile.ximcp: revision 1.3 external/mit/xorg/lib/libX11/Makefile.xlcUTF8Load: revision 1.2 fix PR 48928: build the static libX11 properly. pull in the ximcp, xlcDef, xlcUTF8Load, xlibi18n, and xomGeneric modules directly. also, don't include bsd.lib.mk in the fragment parts for these modules, but in the module build itself. otherwise, bsd.lib.mk is included before SRCS is complete and the build strangely seems to miss parts listed. tested using the example in the PR. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.2 2011/08/11 23:15:38 joerg Exp $ a7 5 .include "../Makefile.ximcp" .include "../Makefile.xlcDef" .include "../Makefile.xlcUTF8Load" .include "../Makefile.xlibi18n" .include "../Makefile.xomGeneric" d9 9 a17 6 SRCS+= \ ${SRCS.ximcp} \ ${SRCS.xlcDef} \ ${SRCS.xlcUTF8Load} \ ${SRCS.xlibi18n} \ ${SRCS.xomGeneric} @ 1.1 log @Initial revision @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.1 2003/09/14 07:56:21 lukem Exp $ d23 2 @ 1.1.1.1 log @initial import of the crossbuild framework for modular Xorg. this is heavily based upon the work rtr@@ did on src/x11, but hacked to work for modern modular Xorg source split. the sources will live in xsrc/external/mit//dist. documentation on using this will come when the above directories are fully populated. there are 192 of them so it may take some time before that is completed. @ text @@ 1.1.1.1.6.1 log @file Makefile was added on branch haad-dm on 2008-10-19 22:41:08 +0000 @ text @d1 24 @ 1.1.1.1.6.2 log @Sync with HEAD. @ text @a0 24 # $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $ NOPIC= 1 .include .include "../Makefile.libx11" .if 0 SRCS+= imCallbk.c imDefFlt.c imDefIc.c imDefIm.c imDefLkup.c imDispch.c \ imEvToWire.c imExten.c imImSw.c imInsClbk.c imInt.c imLcFlt.c \ imLcGIc.c imLcIc.c imLcIm.c imLcLkup.c imLcPrs.c imLcSIc.c imRm.c \ imRmAttr.c imThaiFlt.c imThaiIc.c imThaiIm.c imTrX.c imTrans.c \ imTransR.c lcEuc.c lcGenConv.c lcJis.c lcSjis.c lcUTF8Load.c \ omDefault.c omGeneric.c omImText.c omText.c omTextEsc.c omTextExt.c \ omTextPer.c omXChar.c .endif SRCS+= \ XlcDL.c \ XlcSL.c .include .include @ 1.1.1.1.2.1 log @file Makefile was added on branch wrstuden-revivesa on 2008-09-18 05:18:36 +0000 @ text @d1 24 @ 1.1.1.1.2.2 log @Sync with wrstuden-revivesa-base-2. @ text @a0 24 # $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $ NOPIC= 1 .include .include "../Makefile.libx11" .if 0 SRCS+= imCallbk.c imDefFlt.c imDefIc.c imDefIm.c imDefLkup.c imDispch.c \ imEvToWire.c imExten.c imImSw.c imInsClbk.c imInt.c imLcFlt.c \ imLcGIc.c imLcIc.c imLcIm.c imLcLkup.c imLcPrs.c imLcSIc.c imRm.c \ imRmAttr.c imThaiFlt.c imThaiIc.c imThaiIm.c imTrX.c imTrans.c \ imTransR.c lcEuc.c lcGenConv.c lcJis.c lcSjis.c lcUTF8Load.c \ omDefault.c omGeneric.c omImText.c omText.c omTextEsc.c omTextExt.c \ omTextPer.c omXChar.c .endif SRCS+= \ XlcDL.c \ XlcSL.c .include .include @