head	1.6;
access;
symbols
	netbsd-11-0-RC7:1.6
	netbsd-11-0-RC6:1.6
	netbsd-11-0-RC5:1.6
	netbsd-11-0-RC4:1.6
	netbsd-11-0-RC3:1.6
	netbsd-11-0-RC2:1.6
	netbsd-11-0-RC1:1.6
	perseant-exfatfs-base-20250801:1.6
	netbsd-11:1.6.0.4
	netbsd-11-base:1.6
	netbsd-10-1-RELEASE:1.5
	perseant-exfatfs-base-20240630:1.6
	perseant-exfatfs:1.6.0.2
	perseant-exfatfs-base:1.6
	netbsd-8-3-RELEASE:1.4.8.1
	netbsd-9-4-RELEASE:1.4
	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.8
	netbsd-10-base:1.5
	netbsd-9-3-RELEASE:1.4
	cjep_sun2x-base1:1.5
	cjep_sun2x:1.5.0.6
	cjep_sun2x-base:1.5
	cjep_staticlib_x-base1:1.5
	netbsd-9-2-RELEASE:1.4
	cjep_staticlib_x:1.5.0.4
	cjep_staticlib_x-base:1.5
	netbsd-9-1-RELEASE:1.4
	phil-wifi-20200421:1.5
	phil-wifi-20200411:1.5
	is-mlppp:1.5.0.2
	is-mlppp-base:1.5
	phil-wifi-20200406:1.5
	netbsd-8-2-RELEASE:1.4
	netbsd-9-0-RELEASE:1.4
	netbsd-9-0-RC2:1.4
	netbsd-9-0-RC1:1.4
	phil-wifi-20191119:1.5
	netbsd-9:1.4.0.18
	netbsd-9-base:1.4
	phil-wifi-20190609:1.4
	netbsd-8-1-RELEASE:1.4
	netbsd-8-1-RC1:1.4
	pgoyette-compat-merge-20190127:1.4
	pgoyette-compat-20190127:1.4
	pgoyette-compat-20190118:1.4
	pgoyette-compat-1226:1.4
	pgoyette-compat-1126:1.4
	pgoyette-compat-1020:1.4
	pgoyette-compat-0930:1.4
	pgoyette-compat-0906:1.4
	netbsd-7-2-RELEASE:1.2.40.1
	pgoyette-compat-0728:1.4
	netbsd-8-0-RELEASE:1.4
	phil-wifi:1.4.0.16
	phil-wifi-base:1.4
	pgoyette-compat-0625:1.4
	netbsd-8-0-RC2:1.4
	pgoyette-compat-0521:1.4
	pgoyette-compat-0502:1.4
	pgoyette-compat-0422:1.4
	netbsd-8-0-RC1:1.4
	pgoyette-compat-0415:1.4
	pgoyette-compat-0407:1.4
	pgoyette-compat-0330:1.4
	pgoyette-compat-0322:1.4
	pgoyette-compat-0315:1.4
	netbsd-7-1-2-RELEASE:1.2.40.1
	pgoyette-compat:1.4.0.14
	pgoyette-compat-base:1.4
	netbsd-7-1-1-RELEASE:1.2.40.1
	matt-nb8-mediatek:1.4.0.12
	matt-nb8-mediatek-base:1.4
	perseant-stdc-iso10646:1.4.0.10
	perseant-stdc-iso10646-base:1.4
	netbsd-8:1.4.0.8
	netbsd-8-base:1.4
	prg-localcount2-base3:1.4
	prg-localcount2-base2:1.4
	prg-localcount2-base1:1.4
	prg-localcount2:1.4.0.6
	prg-localcount2-base:1.4
	pgoyette-localcount-20170426:1.4
	bouyer-socketcan-base1:1.4
	pgoyette-localcount-20170320:1.4
	netbsd-7-1:1.2.40.1.0.2
	netbsd-7-1-RELEASE:1.2.40.1
	netbsd-7-1-RC2:1.2.40.1
	netbsd-7-nhusb-base-20170116:1.2.40.1
	bouyer-socketcan:1.4.0.4
	bouyer-socketcan-base:1.4
	pgoyette-localcount-20170107:1.4
	netbsd-7-1-RC1:1.2.40.1
	pgoyette-localcount-20161104:1.4
	netbsd-7-0-2-RELEASE:1.2
	localcount-20160914:1.4
	netbsd-7-nhusb:1.2.0.44
	netbsd-7-nhusb-base:1.2
	pgoyette-localcount-20160806:1.4
	pgoyette-localcount-20160726:1.4
	pgoyette-localcount:1.4.0.2
	pgoyette-localcount-base:1.4
	netbsd-7-0-1-RELEASE:1.2
	netbsd-7-0:1.2.0.42
	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.2
	netbsd-5-1-5-RELEASE:1.2
	netbsd-6-0-6-RELEASE:1.2
	netbsd-6-1-5-RELEASE:1.2
	netbsd-7:1.2.0.40
	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.38
	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.2
	netbsd-5-1-4-RELEASE:1.2
	netbsd-6-1-2-RELEASE:1.2
	netbsd-6-0-3-RELEASE:1.2
	netbsd-5-2-1-RELEASE:1.2
	netbsd-5-1-3-RELEASE:1.2
	netbsd-6-1-1-RELEASE:1.2
	riastradh-drm2-base2:1.2
	riastradh-drm2-base1:1.2
	riastradh-drm2:1.2.0.32
	riastradh-drm2-base:1.2
	netbsd-6-1:1.2.0.36
	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.34
	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.2.0.30
	netbsd-6-0-1-RELEASE:1.2
	yamt-pagecache-base7:1.2
	netbsd-5-2-RELEASE:1.2
	netbsd-5-2-RC1:1.2
	matt-nb6-plus-nbase:1.2
	yamt-pagecache-base6:1.2
	netbsd-6-0:1.2.0.28
	netbsd-6-0-RELEASE:1.2
	netbsd-6-0-RC2:1.2
	tls-maxphys:1.2.0.26
	tls-maxphys-base:1.2
	matt-nb6-plus:1.2.0.24
	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.22
	netbsd-6-base:1.2
	netbsd-5-1-2-RELEASE:1.2
	netbsd-5-1-1-RELEASE:1.2
	yamt-pagecache-base3:1.2
	yamt-pagecache-base2:1.2
	yamt-pagecache:1.2.0.20
	yamt-pagecache-base:1.2
	cherry-xenmp:1.2.0.18
	cherry-xenmp-base:1.2
	bouyer-quota2-nbase:1.2
	bouyer-quota2:1.2.0.16
	bouyer-quota2-base:1.2
	matt-mips64-premerge-20101231:1.2
	matt-nb5-mips64-premerge-20101231:1.2
	matt-nb5-pq3:1.2.0.14
	matt-nb5-pq3-base:1.2
	netbsd-5-1:1.2.0.12
	netbsd-5-1-RELEASE:1.2
	netbsd-5-1-RC4:1.2
	matt-nb5-mips64-k15:1.2
	netbsd-5-1-RC3:1.2
	netbsd-5-1-RC2:1.2
	netbsd-5-1-RC1:1.2
	netbsd-5-0-2-RELEASE:1.2
	matt-nb5-mips64-premerge-20091211:1.2
	matt-premerge-20091211:1.2
	matt-nb5-mips64-u2-k2-k4-k7-k8-k9:1.2
	matt-nb4-mips64-k7-u2a-k9b:1.2
	matt-nb5-mips64-u1-k1-k5:1.2
	matt-nb5-mips64:1.2.0.10
	netbsd-5-0-1-RELEASE:1.2
	jym-xensuspend-nbase:1.2
	netbsd-5-0:1.2.0.8
	netbsd-5-0-RELEASE:1.2
	netbsd-5-0-RC4:1.2
	netbsd-5-0-RC3:1.2
	netbsd-5-0-RC2:1.2
	jym-xensuspend:1.2.0.6
	jym-xensuspend-base:1.2
	netbsd-5-0-RC1:1.2
	haad-dm-base:1.2
	haad-dm-base2:1.2
	haad-nbase2:1.2
	netbsd-5:1.2.0.4
	netbsd-5-base:1.2
	matt-mips64-base2:1.2
	haad-dm:1.2.0.2
	haad-dm-base1:1.2
	wrstuden-revivesa-base-3:1.1
	wrstuden-revivesa:1.1.0.2
	wrstuden-revivesa-base-2:1.1;
locks; strict;
comment	@# @;


1.6
date	2023.06.03.09.09.07;	author lukem;	state Exp;
branches;
next	1.5;
commitid	aBaIRnuykonRStrE;

1.5
date	2019.10.13.07.28.08;	author mrg;	state Exp;
branches;
next	1.4;
commitid	vRNwN94v7NgB2GGB;

1.4
date	2016.06.13.20.03.07;	author ryoon;	state Exp;
branches
	1.4.8.1
	1.4.16.1;
next	1.3;
commitid	wuOeLeSJQvkZklaz;

1.3
date	2016.06.02.22.41.26;	author mrg;	state Exp;
branches;
next	1.2;
commitid	bDug2YlLbP9EyW8z;

1.2
date	2008.10.06.16.24.33;	author tron;	state Exp;
branches
	1.2.2.1
	1.2.40.1
	1.2.44.1;
next	1.1;

1.1
date	2008.09.07.13.15.11;	author rtr;	state Exp;
branches
	1.1.2.1;
next	;

1.4.8.1
date	2020.08.05.14.16.41;	author martin;	state Exp;
branches;
next	;
commitid	WW15qhOgp06KKSiC;

1.4.16.1
date	2020.04.13.08.02.32;	author martin;	state Exp;
branches;
next	;
commitid	X01YhRUPVUDaec4C;

1.2.2.1
date	2008.10.06.16.24.33;	author haad;	state dead;
branches;
next	1.2.2.2;

1.2.2.2
date	2008.10.19.22.41.08;	author haad;	state Exp;
branches;
next	;

1.2.40.1
date	2016.12.23.08.04.04;	author snj;	state Exp;
branches;
next	;
commitid	XwXtErZDSEkP95zz;

1.2.44.1
date	2017.01.18.08.46.21;	author skrll;	state Exp;
branches;
next	;
commitid	M6f3RyDtiAR3wqCz;

1.1.2.1
date	2008.09.07.13.15.11;	author wrstuden;	state dead;
branches;
next	1.1.2.2;

1.1.2.2
date	2008.09.18.05.18.36;	author wrstuden;	state Exp;
branches;
next	;


desc
@@


1.6
log
@bsd.own.mk: rename GCC_NO_* to CC_WNO_*

Rename compiler-warning-disable variables from
	GCC_NO_warning
to
	CC_WNO_warning
where warning is the full warning name as used by the compiler.

GCC_NO_IMPLICIT_FALLTHRU is CC_WNO_IMPLICIT_FALLTHROUGH

Using the convention CC_compilerflag, where compilerflag
is based on the full compiler flag name.
@
text
@# $NetBSD: Makefile.ximcp,v 1.5 2019/10/13 07:28:08 mrg Exp $

.PATH:	${X11SRCDIR.X11}/modules/im/ximcp
SRCS.ximcp= \
	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 \
	imRmAttr.c \
	imRm.c \
	imThaiFlt.c \
	imThaiIc.c \
	imThaiIm.c \
	imTrans.c \
	imTransR.c \
	imTrX.c

CPPFLAGS+= \
	-I${DESTDIR}${X11INCDIR}/X11 \
	-I${X11SRCDIR.X11}/src/xlibi18n

CPPFLAGS+= \
	${X11FLAGS.CONNECTION} \
	-DXIM_t \
	-DTRANS_CLIENT \
	-DHASXDMAUTH

COPTS.imDefLkup.c=	-Wno-error
COPTS.imRm.c=	-Wno-error
COPTS.imTrans.c=	-Wno-error
COPTS.imLcLkup.c=	-Wno-stack-protector
COPTS.imInsClbk.c=	-Wno-unused-value

COPTS.imDefIm.c=	${CC_WNO_STRINGOP_OVERFLOW}
@


1.5
log
@introduce some common variables for use in GCC warning disables:

GCC_NO_FORMAT_TRUNCATION    -Wno-format-truncation (GCC 7/8)
GCC_NO_STRINGOP_TRUNCATION  -Wno-stringop-truncation (GCC 8)
GCC_NO_STRINGOP_OVERFLOW    -Wno-stringop-overflow (GCC 8)
GCC_NO_CAST_FUNCTION_TYPE   -Wno-cast-function-type (GCC 8)

use these to turn off warnings for most GCC-8 complaints.  many
of these are false positives, most of the real bugs are already
commited, or are yet to come.


we plan to introduce versions of (some?) of these that use the
"-Wno-error=" form, which still displays the warnings but does
not make it an error, and all of the above will be re-considered
as either being "fix me" (warning still displayed) or "warning
is wrong."
@
text
@d1 1
a1 1
# $NetBSD: Makefile.ximcp,v 1.4 2016/06/13 20:03:07 ryoon Exp $
d48 1
a48 1
COPTS.imDefIm.c=	${GCC_NO_STRINGOP_OVERFLOW}
@


1.4
log
@Fix buld with clang, add warning option exceptions
@
text
@d1 1
a1 1
# $NetBSD: Makefile.ximcp,v 1.3 2016/06/02 22:41:26 mrg Exp $
d42 7
a48 5
CPPFLAGS.imDefLkup.c=	-Wno-error
CPPFLAGS.imRm.c=	-Wno-error
CPPFLAGS.imTrans.c=	-Wno-error
CPPFLAGS.imLcLkup.c=	-Wno-stack-protector
CPPFLAGS.imInsClbk.c=	-Wno-unused-value
@


1.4.8.1
log
@Sync external/mit/xorg/lib/libX11 with current, requested by maya in
ticket #1582:

	external/mit/xorg/lib/libX11/extensions/Makefile up to 1.2
	external/mit/xorg/lib/libX11/Makefile           up to 1.14
	external/mit/xorg/lib/libX11/Makefile.libx11    up to 1.19
	external/mit/xorg/lib/libX11/Makefile.ximcp     up to 1.5
	external/mit/xorg/lib/libX11/Makefile.xlibi18n  up to 1.3

Update libX11 from 1.6.5 to 1.6.10.
@
text
@d1 1
a1 1
# $NetBSD: Makefile.ximcp,v 1.5 2019/10/13 07:28:08 mrg Exp $
d42 5
a46 7
COPTS.imDefLkup.c=	-Wno-error
COPTS.imRm.c=	-Wno-error
COPTS.imTrans.c=	-Wno-error
COPTS.imLcLkup.c=	-Wno-stack-protector
COPTS.imInsClbk.c=	-Wno-unused-value

COPTS.imDefIm.c=	${GCC_NO_STRINGOP_OVERFLOW}
@


1.4.16.1
log
@Mostly merge changes from HEAD upto 20200411
@
text
@d1 1
a1 1
# $NetBSD$
d42 5
a46 7
COPTS.imDefLkup.c=	-Wno-error
COPTS.imRm.c=	-Wno-error
COPTS.imTrans.c=	-Wno-error
COPTS.imLcLkup.c=	-Wno-stack-protector
COPTS.imInsClbk.c=	-Wno-unused-value

COPTS.imDefIm.c=	${GCC_NO_STRINGOP_OVERFLOW}
@


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.ximcp,v 1.2 2008/10/06 16:24:33 tron Exp $
d46 1
@


1.2
log
@Fix the build if stack protection is enabled.
@
text
@d1 1
a1 1
# $NetBSD: Makefile.ximcp,v 1.1 2008/09/07 13:15:11 rtr Exp $
a45 2

.include <bsd.lib.mk>
@


1.2.44.1
log
@Sync with netbsd-5
@
text
@d1 1
a1 1
# $NetBSD: Makefile.ximcp,v 1.2.40.1 2016/12/23 08:04:04 snj Exp $
d46 2
@


1.2.40.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.ximcp,v 1.2 2008/10/06 16:24:33 tron Exp $
d46 2
@


1.2.2.1
log
@file Makefile.ximcp was added on branch haad-dm on 2008-10-19 22:41:08 +0000
@
text
@d1 47
@


1.2.2.2
log
@Sync with HEAD.
@
text
@a0 47
# $NetBSD: Makefile.ximcp,v 1.2 2008/10/06 16:24:33 tron Exp $

.PATH:	${X11SRCDIR.X11}/modules/im/ximcp
SRCS.ximcp= \
	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 \
	imRmAttr.c \
	imRm.c \
	imThaiFlt.c \
	imThaiIc.c \
	imThaiIm.c \
	imTrans.c \
	imTransR.c \
	imTrX.c

CPPFLAGS+= \
	-I${DESTDIR}${X11INCDIR}/X11 \
	-I${X11SRCDIR.X11}/src/xlibi18n

CPPFLAGS+= \
	${X11FLAGS.CONNECTION} \
	-DXIM_t \
	-DTRANS_CLIENT \
	-DHASXDMAUTH

CPPFLAGS.imDefLkup.c=	-Wno-error
CPPFLAGS.imRm.c=	-Wno-error
CPPFLAGS.imTrans.c=	-Wno-error
CPPFLAGS.imLcLkup.c=	-Wno-stack-protector

.include <bsd.lib.mk>
@


1.1
log
@* build and install locale modules
  this fixes the problem with copy & paste not working
@
text
@d1 1
a1 1
# $NetBSD$
d45 1
@


1.1.2.1
log
@file Makefile.ximcp was added on branch wrstuden-revivesa on 2008-09-18 05:18:36 +0000
@
text
@d1 46
@


1.1.2.2
log
@Sync with wrstuden-revivesa-base-2.
@
text
@a0 46
# $NetBSD: Makefile.ximcp,v 1.1 2008/09/07 13:15:11 rtr Exp $

.PATH:	${X11SRCDIR.X11}/modules/im/ximcp
SRCS.ximcp= \
	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 \
	imRmAttr.c \
	imRm.c \
	imThaiFlt.c \
	imThaiIc.c \
	imThaiIm.c \
	imTrans.c \
	imTransR.c \
	imTrX.c

CPPFLAGS+= \
	-I${DESTDIR}${X11INCDIR}/X11 \
	-I${X11SRCDIR.X11}/src/xlibi18n

CPPFLAGS+= \
	${X11FLAGS.CONNECTION} \
	-DXIM_t \
	-DTRANS_CLIENT \
	-DHASXDMAUTH

CPPFLAGS.imDefLkup.c=	-Wno-error
CPPFLAGS.imRm.c=	-Wno-error
CPPFLAGS.imTrans.c=	-Wno-error

.include <bsd.lib.mk>
@
