head	1.4;
access;
symbols
	netbsd-11-0-RC4:1.4
	netbsd-11-0-RC3:1.4
	netbsd-11-0-RC2:1.4
	netbsd-11-0-RC1:1.4
	perseant-exfatfs-base-20250801:1.4
	netbsd-11:1.4.0.14
	netbsd-11-base:1.4
	netbsd-10-1-RELEASE:1.4
	perseant-exfatfs-base-20240630:1.4
	perseant-exfatfs:1.4.0.12
	perseant-exfatfs-base:1.4
	netbsd-8-3-RELEASE:1.3
	netbsd-9-4-RELEASE:1.4
	netbsd-10-0-RELEASE:1.4
	netbsd-10-0-RC6:1.4
	netbsd-10-0-RC5:1.4
	netbsd-10-0-RC4:1.4
	netbsd-10-0-RC3:1.4
	netbsd-10-0-RC2:1.4
	netbsd-10-0-RC1:1.4
	netbsd-10:1.4.0.10
	netbsd-10-base:1.4
	netbsd-9-3-RELEASE:1.4
	cjep_sun2x-base1:1.4
	cjep_sun2x:1.4.0.8
	cjep_sun2x-base:1.4
	cjep_staticlib_x-base1:1.4
	netbsd-9-2-RELEASE:1.4
	cjep_staticlib_x:1.4.0.6
	cjep_staticlib_x-base:1.4
	netbsd-9-1-RELEASE:1.4
	phil-wifi-20200421:1.4
	phil-wifi-20200411:1.4
	is-mlppp:1.4.0.4
	is-mlppp-base:1.4
	phil-wifi-20200406:1.4
	netbsd-8-2-RELEASE:1.3
	netbsd-9-0-RELEASE:1.4
	netbsd-9-0-RC2:1.4
	netbsd-9-0-RC1:1.4
	phil-wifi-20191119:1.4
	netbsd-9:1.4.0.2
	netbsd-9-base:1.4
	phil-wifi-20190609:1.4
	netbsd-8-1-RELEASE:1.3
	netbsd-8-1-RC1:1.3
	pgoyette-compat-merge-20190127:1.3.12.1
	pgoyette-compat-20190127:1.4
	pgoyette-compat-20190118:1.4
	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.1
	pgoyette-compat-0728:1.3
	netbsd-8-0-RELEASE:1.3
	phil-wifi:1.3.0.14
	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.1
	pgoyette-compat:1.3.0.12
	pgoyette-compat-base:1.3
	netbsd-7-1-1-RELEASE:1.1
	matt-nb8-mediatek:1.3.0.10
	matt-nb8-mediatek-base:1.3
	perseant-stdc-iso10646:1.3.0.8
	perseant-stdc-iso10646-base:1.3
	netbsd-8:1.3.0.6
	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.4
	prg-localcount2-base:1.3
	pgoyette-localcount-20170426:1.3
	bouyer-socketcan-base1:1.3
	pgoyette-localcount-20170320:1.3
	netbsd-7-1:1.1.0.36
	netbsd-7-1-RELEASE:1.1
	netbsd-7-1-RC2:1.1
	netbsd-7-nhusb-base-20170116:1.1
	bouyer-socketcan:1.3.0.2
	bouyer-socketcan-base:1.3
	pgoyette-localcount-20170107:1.3
	netbsd-7-1-RC1:1.1
	pgoyette-localcount-20161104:1.3
	netbsd-7-0-2-RELEASE:1.1
	localcount-20160914:1.3
	netbsd-7-nhusb:1.1.0.34
	netbsd-7-nhusb-base:1.1
	pgoyette-localcount-20160806:1.1
	pgoyette-localcount-20160726:1.1
	pgoyette-localcount:1.1.0.32
	pgoyette-localcount-base:1.1
	netbsd-7-0-1-RELEASE:1.1
	netbsd-7-0:1.1.0.30
	netbsd-7-0-RELEASE:1.1
	netbsd-7-0-RC3:1.1
	netbsd-7-0-RC2:1.1
	netbsd-7-0-RC1:1.1
	netbsd-5-2-3-RELEASE:1.1.2.3
	netbsd-5-1-5-RELEASE:1.1.2.3
	netbsd-6-0-6-RELEASE:1.1
	netbsd-6-1-5-RELEASE:1.1
	netbsd-7:1.1.0.28
	netbsd-7-base:1.1
	yamt-pagecache-base9:1.1
	yamt-pagecache-tag8:1.1
	netbsd-6-1-4-RELEASE:1.1
	netbsd-6-0-5-RELEASE:1.1
	tls-earlyentropy:1.1.0.26
	tls-earlyentropy-base:1.1
	riastradh-xf86-video-intel-2-7-1-pre-2-21-15:1.1
	riastradh-drm2-base3:1.1
	netbsd-6-1-3-RELEASE:1.1
	netbsd-6-0-4-RELEASE:1.1
	netbsd-5-2-2-RELEASE:1.1.2.3
	netbsd-5-1-4-RELEASE:1.1.2.3
	netbsd-6-1-2-RELEASE:1.1
	netbsd-6-0-3-RELEASE:1.1
	netbsd-5-2-1-RELEASE:1.1.2.3
	netbsd-5-1-3-RELEASE:1.1.2.3
	netbsd-6-1-1-RELEASE:1.1
	riastradh-drm2-base2:1.1
	riastradh-drm2-base1:1.1
	riastradh-drm2:1.1.0.20
	riastradh-drm2-base:1.1
	netbsd-6-1:1.1.0.24
	netbsd-6-0-2-RELEASE:1.1
	netbsd-6-1-RELEASE:1.1
	netbsd-6-1-RC4:1.1
	netbsd-6-1-RC3:1.1
	agc-symver:1.1.0.22
	agc-symver-base:1.1
	netbsd-6-1-RC2:1.1
	netbsd-6-1-RC1:1.1
	yamt-pagecache-base8:1.1
	netbsd-5-2:1.1.2.3.0.6
	netbsd-6-0-1-RELEASE:1.1
	yamt-pagecache-base7:1.1
	netbsd-5-2-RELEASE:1.1.2.3
	netbsd-5-2-RC1:1.1.2.3
	matt-nb6-plus-nbase:1.1
	yamt-pagecache-base6:1.1
	netbsd-6-0:1.1.0.18
	netbsd-6-0-RELEASE:1.1
	netbsd-6-0-RC2:1.1
	tls-maxphys:1.1.0.16
	tls-maxphys-base:1.1
	matt-nb6-plus:1.1.0.14
	matt-nb6-plus-base:1.1
	netbsd-6-0-RC1:1.1
	yamt-pagecache-base5:1.1
	yamt-pagecache-base4:1.1
	netbsd-6:1.1.0.12
	netbsd-6-base:1.1
	netbsd-5-1-2-RELEASE:1.1.2.3
	netbsd-5-1-1-RELEASE:1.1.2.3
	yamt-pagecache-base3:1.1
	yamt-pagecache-base2:1.1
	yamt-pagecache:1.1.0.10
	yamt-pagecache-base:1.1
	cherry-xenmp:1.1.0.8
	cherry-xenmp-base:1.1
	bouyer-quota2-nbase:1.1
	bouyer-quota2:1.1.0.6
	bouyer-quota2-base:1.1
	matt-mips64-premerge-20101231:1.1
	matt-nb5-mips64-premerge-20101231:1.1.2.2.4.1
	matt-nb5-pq3:1.1.2.3.0.4
	matt-nb5-pq3-base:1.1.2.3
	pre-xorg-192:1.1
	netbsd-5-1:1.1.2.3.0.2
	netbsd-5-1-RELEASE:1.1.2.3
	netbsd-5-1-RC4:1.1.2.3
	matt-nb5-mips64-k15:1.1.2.2.4.1
	netbsd-5-1-RC3:1.1.2.3
	netbsd-5-1-RC2:1.1.2.3
	netbsd-5-1-RC1:1.1.2.3
	netbsd-5-0-2-RELEASE:1.1.2.2
	matt-nb5-mips64-premerge-20091211:1.1.2.2
	matt-premerge-20091211:1.1
	matt-nb5-mips64-u2-k2-k4-k7-k8-k9:1.1.2.2
	matt-nb4-mips64-k7-u2a-k9b:1.1.2.2
	matt-nb5-mips64-u1-k1-k5:1.1.2.2
	matt-nb5-mips64:1.1.2.2.0.4
	netbsd-5-0-1-RELEASE:1.1.2.2
	jym-xensuspend-nbase:1.1
	netbsd-5-0:1.1.2.2.0.2
	netbsd-5-0-RELEASE:1.1.2.2
	netbsd-5-0-RC4:1.1.2.2
	netbsd-5-0-RC3:1.1.2.2
	netbsd-5-0-RC2:1.1.2.2
	jym-xensuspend:1.1.0.4
	jym-xensuspend-base:1.1
	netbsd-5-0-RC1:1.1.2.2
	netbsd-5:1.1.0.2;
locks; strict;
comment	@# @;


1.4
date	2018.12.31.13.05.08;	author mrg;	state Exp;
branches;
next	1.3;
commitid	yM28SA7Vfo4d6X5B;

1.3
date	2016.08.14.00.03.59;	author mrg;	state Exp;
branches
	1.3.12.1
	1.3.14.1;
next	1.2;
commitid	GTnYSwjk1lG4Iciz;

1.2
date	2016.08.11.08.32.44;	author mrg;	state Exp;
branches;
next	1.1;
commitid	8krHm1L1UVyjzRhz;

1.1
date	2008.12.22.01.04.27;	author jmcneill;	state Exp;
branches
	1.1.2.1;
next	;

1.3.12.1
date	2019.01.18.08.49.09;	author pgoyette;	state Exp;
branches;
next	;
commitid	Lmlzg3OVT2cd6f8B;

1.3.14.1
date	2019.06.10.22.02.50;	author christos;	state Exp;
branches;
next	;
commitid	jtc8rnCzWiEEHGqB;

1.1.2.1
date	2008.12.22.01.04.27;	author snj;	state dead;
branches;
next	1.1.2.2;

1.1.2.2
date	2008.12.24.16.48.25;	author snj;	state Exp;
branches
	1.1.2.2.4.1;
next	1.1.2.3;

1.1.2.3
date	2009.09.17.04.24.42;	author snj;	state Exp;
branches;
next	;

1.1.2.2.4.1
date	2010.04.21.05.24.47;	author matt;	state Exp;
branches;
next	;


desc
@@


1.4
log
@more xorg-server 1.20 updates:

- more -Wno-error for deprecated functions
- add missing header paths
@
text
@#	$NetBSD: Makefile,v 1.3 2016/08/14 00:03:59 mrg Exp $

.include "../Makefile.serverlib"
.include "../Makefile.servermod"

LIB=		xkbstubs

.PATH:		${X11SRCDIR.xorg-server}/xkb
DDXSRCS=	ddxVT.c ddxPrivate.c ddxKillSrv.c

SRCS=		${DDXSRCS}

CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/include \
		-I${DESTDIR}${X11INCDIR}/X11 \
		-I${DESTDIR}${X11INCDIR}/X11/extensions \
		-I${DESTDIR}${X11INCDIR}/xorg \
		-I${DESTDIR}${X11INCDIR}/pixman-1 \
		-I${X11SRCDIR.xorg-server}/Xext \
		-I${X11SRCDIR.xorg-server}/mi \
		-I${X11SRCDIR.xorg-server}/miext/damage \
		-I${X11SRCDIR.xorg-server}/render \
		-I${X11SRCDIR.xorg-server}/${LIB} \
		-I${X11SRCDIR.xorg-server}/hw/xfree86/common \
		-I${X11SRCDIR.xorg-server}/../include

CPPFLAGS+=	-DXKB_IN_SERVER -DHAVE_XKB_CONFIG_H

CLEANFILES+=		${BUILDOBJS}
realall: ${BUILDOBJS}

.include <bsd.x11.mk>
.include <bsd.lib.mk>
@


1.3
log
@various build updates for xorg-server 1.18.  with this and some other
uncommited work, Xvfb and Xnest both link.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.2 2016/08/11 08:32:44 mrg Exp $
d16 1
@


1.3.14.1
log
@Sync with HEAD
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.4 2018/12/31 13:05:08 mrg Exp $
a15 1
		-I${DESTDIR}${X11INCDIR}/xorg \
@


1.3.12.1
log
@Synch with HEAD
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.3 2016/08/14 00:03:59 mrg Exp $
a15 1
		-I${DESTDIR}${X11INCDIR}/xorg \
@


1.2
log
@first merge of xorg-server 1.18.4 reach over.  not tested, and
missing at these new subdirs, some which may not be needed:

	dri2
	glamor
	hw/xfree86/drivers/modesetting
	hw/xfree86/parser
	present
	pseudoramiX
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.1 2008/12/22 01:04:27 jmcneill Exp $
d19 2
@


1.1
log
@PR# xsrc/40150: unable to use Ctr-Alt-Fx to switch out of X server

Break libxkb into two separate libraries (libxkb and libxbkstubs). Pull
in libxkbstubs for Xvfb and Xnest, and for Xorg use dixmods/libxorgxkb.
Now Xorg no longer uses the stub XkbDDXSwitchScreen from xkb/ddxVT.c so
display switching works again.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.3 2008/08/15 15:55:07 rtr Exp $
a17 1
		-I${X11SRCDIR.xorg-server}/Xext/extmod \
@


1.1.2.1
log
@file Makefile was added on branch netbsd-5 on 2008-12-24 16:48:25 +0000
@
text
@d1 30
@


1.1.2.2
log
@Pull up following revision(s) (requested by jmcneill in ticket #200):
	external/mit/xorg/server/xorg-server/Makefile: revision 1.18
	external/mit/xorg/server/xorg-server/Makefile.Xserver: revision 1.8
	external/mit/xorg/server/xorg-server/hw/vfb/Makefile: revision 1.5
	external/mit/xorg/server/xorg-server/hw/xfree86/Makefile: revision 1.23
	external/mit/xorg/server/xorg-server/hw/xnest/Makefile: revision 1.7
	external/mit/xorg/server/xorg-server/xkb/Makefile: revision 1.4
	external/mit/xorg/server/xorg-server/xkbstubs/Makefile: revision 1.1
PR# xsrc/40150: unable to use Ctr-Alt-Fx to switch out of X server
Break libxkb into two separate libraries (libxkb and libxbkstubs). Pull
in libxkbstubs for Xvfb and Xnest, and for Xorg use dixmods/libxorgxkb.
Now Xorg no longer uses the stub XkbDDXSwitchScreen from xkb/ddxVT.c so
display switching works again.
@
text
@a0 30
#	$NetBSD$

.include "../Makefile.serverlib"
.include "../Makefile.servermod"

LIB=		xkbstubs

.PATH:		${X11SRCDIR.xorg-server}/xkb
DDXSRCS=	ddxVT.c ddxPrivate.c ddxKillSrv.c

SRCS=		${DDXSRCS}

CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/include \
		-I${DESTDIR}${X11INCDIR}/X11 \
		-I${DESTDIR}${X11INCDIR}/X11/extensions \
		-I${DESTDIR}${X11INCDIR}/pixman-1 \
		-I${X11SRCDIR.xorg-server}/Xext \
		-I${X11SRCDIR.xorg-server}/Xext/extmod \
		-I${X11SRCDIR.xorg-server}/mi \
		-I${X11SRCDIR.xorg-server}/${LIB} \
		-I${X11SRCDIR.xorg-server}/hw/xfree86/common \
		-I${X11SRCDIR.xorg-server}/../include

CPPFLAGS+=	-DXKB_IN_SERVER -DHAVE_XKB_CONFIG_H

CLEANFILES+=		${BUILDOBJS}
realall: ${BUILDOBJS}

.include <bsd.x11.mk>
.include <bsd.lib.mk>
@


1.1.2.2.4.1
log
@sync to netbsd-5
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.1.2.3 2009/09/17 04:24:42 snj Exp $
@


1.1.2.3
log
@Apply patch (requested by mrg in ticket #958):
Sync X.Org reachover build framework and setlists with the new X.Org.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.1 2008/12/22 01:04:27 jmcneill Exp $
@