Index: Makefile.ximcp =================================================================== RCS file: /cvsroot/src/external/mit/xorg/lib/libX11/Makefile.ximcp,v retrieving revision 1.2 diff -p -u -u -r1.2 Makefile.ximcp --- Makefile.ximcp 6 Oct 2008 16:24:33 -0000 1.2 +++ Makefile.ximcp 1 Jun 2016 18:02:49 -0000 @@ -43,5 +43,3 @@ CPPFLAGS.imDefLkup.c= -Wno-error CPPFLAGS.imRm.c= -Wno-error CPPFLAGS.imTrans.c= -Wno-error CPPFLAGS.imLcLkup.c= -Wno-stack-protector - -.include Index: Makefile.xlcDef =================================================================== RCS file: /cvsroot/src/external/mit/xorg/lib/libX11/Makefile.xlcDef,v retrieving revision 1.1 diff -p -u -u -r1.1 Makefile.xlcDef --- Makefile.xlcDef 7 Sep 2008 13:15:11 -0000 1.1 +++ Makefile.xlcDef 1 Jun 2016 18:02:49 -0000 @@ -9,5 +9,3 @@ CPPFLAGS+= \ CPPFLAGS+= \ -DHASXDMAUTH - -.include Index: Makefile.xlcUTF8Load =================================================================== RCS file: /cvsroot/src/external/mit/xorg/lib/libX11/Makefile.xlcUTF8Load,v retrieving revision 1.1 diff -p -u -u -r1.1 Makefile.xlcUTF8Load --- Makefile.xlcUTF8Load 7 Sep 2008 13:15:11 -0000 1.1 +++ Makefile.xlcUTF8Load 1 Jun 2016 18:02:49 -0000 @@ -11,5 +11,3 @@ CPPFLAGS+= \ CPPFLAGS+= \ -DHASXDMAUTH - -.include Index: Makefile.xlibi18n =================================================================== RCS file: /cvsroot/src/external/mit/xorg/lib/libX11/Makefile.xlibi18n,v retrieving revision 1.1 diff -p -u -u -r1.1 Makefile.xlibi18n --- Makefile.xlibi18n 7 Sep 2008 13:15:11 -0000 1.1 +++ Makefile.xlibi18n 1 Jun 2016 18:02:49 -0000 @@ -10,5 +10,3 @@ CPPFLAGS+= \ CPPFLAGS+= \ ${XLOCALE.DEFINES} \ -DHASXDMAUTH - -.include Index: Makefile.xlocale =================================================================== RCS file: /cvsroot/src/external/mit/xorg/lib/libX11/Attic/Makefile.xlocale,v retrieving revision 1.1 diff -p -u -u -r1.1 Makefile.xlocale --- Makefile.xlocale 7 Sep 2008 13:15:11 -0000 1.1 +++ Makefile.xlocale 1 Jun 2016 18:02:49 -0000 @@ -14,5 +14,3 @@ CPPFLAGS+= \ CPPFLAGS+= \ ${X11FLAGS.THREADS} \ -DHASXDMAUTH - -.include Index: Makefile.xomGeneric =================================================================== RCS file: /cvsroot/src/external/mit/xorg/lib/libX11/Makefile.xomGeneric,v retrieving revision 1.1 diff -p -u -u -r1.1 Makefile.xomGeneric --- Makefile.xomGeneric 7 Sep 2008 13:15:11 -0000 1.1 +++ Makefile.xomGeneric 1 Jun 2016 18:02:49 -0000 @@ -19,5 +19,3 @@ CPPFLAGS+= \ CPPFLAGS+= \ -DHASXDMAUTH - -.include Index: static/Makefile =================================================================== RCS file: /cvsroot/src/external/mit/xorg/lib/libX11/static/Makefile,v retrieving revision 1.2 diff -p -u -u -r1.2 Makefile --- static/Makefile 11 Aug 2011 23:15:38 -0000 1.2 +++ static/Makefile 1 Jun 2016 18:02:49 -0000 @@ -5,16 +5,18 @@ NOPIC= 1 .include .include "../Makefile.libx11" +.include "../Makefile.ximcp" +.include "../Makefile.xlcDef" +.include "../Makefile.xlcUTF8Load" +.include "../Makefile.xlibi18n" +.include "../Makefile.xomGeneric" -.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+= \ + ${SRCS.ximcp} \ + ${SRCS.xlcDef} \ + ${SRCS.xlcUTF8Load} \ + ${SRCS.xlibi18n} \ + ${SRCS.xomGeneric} SRCS+= \ XlcDL.c \ Index: ximcp/Makefile =================================================================== RCS file: /cvsroot/src/external/mit/xorg/lib/libX11/ximcp/Makefile,v retrieving revision 1.3 diff -p -u -u -r1.3 Makefile --- ximcp/Makefile 30 May 2013 23:42:19 -0000 1.3 +++ ximcp/Makefile 1 Jun 2016 18:02:49 -0000 @@ -15,3 +15,4 @@ CFLAGS+=-I${X11SRCDIR.X11}/src CWARNFLAGS.clang+= -Wno-unused .include "../Makefile.ximcp" +.include Index: xlcDef/Makefile =================================================================== RCS file: /cvsroot/src/external/mit/xorg/lib/libX11/xlcDef/Makefile,v retrieving revision 1.1 diff -p -u -u -r1.1 Makefile --- xlcDef/Makefile 7 Sep 2008 13:15:11 -0000 1.1 +++ xlcDef/Makefile 1 Jun 2016 18:02:49 -0000 @@ -12,3 +12,4 @@ LIBDIR= ${X11LIBDIR}/locale/lib/common SRCS= ${SRCS.xlcDef} .include "../Makefile.xlcDef" +.include Index: xlcUTF8Load/Makefile =================================================================== RCS file: /cvsroot/src/external/mit/xorg/lib/libX11/xlcUTF8Load/Makefile,v retrieving revision 1.1 diff -p -u -u -r1.1 Makefile --- xlcUTF8Load/Makefile 7 Sep 2008 13:15:11 -0000 1.1 +++ xlcUTF8Load/Makefile 1 Jun 2016 18:02:49 -0000 @@ -12,3 +12,4 @@ LIBDIR= ${X11LIBDIR}/locale/lib/common SRCS= ${SRCS.xlcUTF8Load} .include "../Makefile.xlcUTF8Load" +.include Index: xlibi18n/Makefile =================================================================== RCS file: /cvsroot/src/external/mit/xorg/lib/libX11/xlibi18n/Makefile,v retrieving revision 1.1 diff -p -u -u -r1.1 Makefile --- xlibi18n/Makefile 7 Sep 2008 13:15:11 -0000 1.1 +++ xlibi18n/Makefile 1 Jun 2016 18:02:49 -0000 @@ -12,3 +12,4 @@ LIBDIR= ${X11LIBDIR}/locale/lib/common SRCS= ${SRCS.xlibi18n} .include "../Makefile.xlibi18n" +.include Index: xlocale/Makefile =================================================================== RCS file: /cvsroot/src/external/mit/xorg/lib/libX11/xlocale/Attic/Makefile,v retrieving revision 1.1 diff -p -u -u -r1.1 Makefile --- xlocale/Makefile 7 Sep 2008 13:15:11 -0000 1.1 +++ xlocale/Makefile 1 Jun 2016 18:02:49 -0000 @@ -12,3 +12,4 @@ LIBDIR= ${X11LIBDIR}/locale/lib/common SRCS= ${SRCS.xlocale} .include "../Makefile.xlocale" +.include Index: xomGeneric/Makefile =================================================================== RCS file: /cvsroot/src/external/mit/xorg/lib/libX11/xomGeneric/Makefile,v retrieving revision 1.1 diff -p -u -u -r1.1 Makefile --- xomGeneric/Makefile 7 Sep 2008 13:15:11 -0000 1.1 +++ xomGeneric/Makefile 1 Jun 2016 18:02:49 -0000 @@ -12,3 +12,4 @@ LIBDIR= ${X11LIBDIR}/locale/lib/common SRCS= ${SRCS.xomGeneric} .include "../Makefile.xomGeneric" +.include