head	1.11;
access;
symbols
	netbsd-9-5-RELEASE:1.11
	netbsd-11-0-RELEASE:1.11
	netbsd-11-0-RC7:1.11
	netbsd-11-0-RC6:1.11
	netbsd-11-0-RC5:1.11
	netbsd-11-0-RC4:1.11
	netbsd-11-0-RC3:1.11
	netbsd-11-0-RC2:1.11
	netbsd-11-0-RC1:1.11
	perseant-exfatfs-base-20250801:1.11
	netbsd-11:1.11.0.14
	netbsd-11-base:1.11
	netbsd-10-1-RELEASE:1.11
	perseant-exfatfs-base-20240630:1.11
	perseant-exfatfs:1.11.0.12
	perseant-exfatfs-base:1.11
	netbsd-8-3-RELEASE:1.10
	netbsd-9-4-RELEASE:1.11
	netbsd-10-0-RELEASE:1.11
	netbsd-10-0-RC6:1.11
	netbsd-10-0-RC5:1.11
	netbsd-10-0-RC4:1.11
	netbsd-10-0-RC3:1.11
	netbsd-10-0-RC2:1.11
	netbsd-10-0-RC1:1.11
	netbsd-10:1.11.0.10
	netbsd-10-base:1.11
	netbsd-9-3-RELEASE:1.11
	cjep_sun2x-base1:1.11
	cjep_sun2x:1.11.0.8
	cjep_sun2x-base:1.11
	cjep_staticlib_x-base1:1.11
	netbsd-9-2-RELEASE:1.11
	cjep_staticlib_x:1.11.0.6
	cjep_staticlib_x-base:1.11
	netbsd-9-1-RELEASE:1.11
	phil-wifi-20200421:1.11
	phil-wifi-20200411:1.11
	is-mlppp:1.11.0.4
	is-mlppp-base:1.11
	phil-wifi-20200406:1.11
	netbsd-8-2-RELEASE:1.10
	netbsd-9-0-RELEASE:1.11
	netbsd-9-0-RC2:1.11
	netbsd-9-0-RC1:1.11
	phil-wifi-20191119:1.11
	netbsd-9:1.11.0.2
	netbsd-9-base:1.11
	phil-wifi-20190609:1.11
	netbsd-8-1-RELEASE:1.10
	netbsd-8-1-RC1:1.10
	pgoyette-compat-merge-20190127:1.10.12.1
	pgoyette-compat-20190127:1.11
	pgoyette-compat-20190118:1.11
	pgoyette-compat-1226:1.10
	pgoyette-compat-1126:1.10
	pgoyette-compat-1020:1.10
	pgoyette-compat-0930:1.10
	pgoyette-compat-0906:1.10
	netbsd-7-2-RELEASE:1.8
	pgoyette-compat-0728:1.10
	netbsd-8-0-RELEASE:1.10
	phil-wifi:1.10.0.14
	phil-wifi-base:1.10
	pgoyette-compat-0625:1.10
	netbsd-8-0-RC2:1.10
	pgoyette-compat-0521:1.10
	pgoyette-compat-0502:1.10
	pgoyette-compat-0422:1.10
	netbsd-8-0-RC1:1.10
	pgoyette-compat-0415:1.10
	pgoyette-compat-0407:1.10
	pgoyette-compat-0330:1.10
	pgoyette-compat-0322:1.10
	pgoyette-compat-0315:1.10
	netbsd-7-1-2-RELEASE:1.8
	pgoyette-compat:1.10.0.12
	pgoyette-compat-base:1.10
	netbsd-7-1-1-RELEASE:1.8
	matt-nb8-mediatek:1.10.0.10
	matt-nb8-mediatek-base:1.10
	perseant-stdc-iso10646:1.10.0.8
	perseant-stdc-iso10646-base:1.10
	netbsd-8:1.10.0.6
	netbsd-8-base:1.10
	prg-localcount2-base3:1.10
	prg-localcount2-base2:1.10
	prg-localcount2-base1:1.10
	prg-localcount2:1.10.0.4
	prg-localcount2-base:1.10
	pgoyette-localcount-20170426:1.10
	bouyer-socketcan-base1:1.10
	pgoyette-localcount-20170320:1.10
	netbsd-7-1:1.8.0.32
	netbsd-7-1-RELEASE:1.8
	netbsd-7-1-RC2:1.8
	netbsd-7-nhusb-base-20170116:1.8
	bouyer-socketcan:1.10.0.2
	bouyer-socketcan-base:1.10
	pgoyette-localcount-20170107:1.10
	netbsd-7-1-RC1:1.8
	pgoyette-localcount-20161104:1.10
	netbsd-7-0-2-RELEASE:1.8
	localcount-20160914:1.10
	netbsd-7-nhusb:1.8.0.30
	netbsd-7-nhusb-base:1.8
	pgoyette-localcount-20160806:1.8
	pgoyette-localcount-20160726:1.8
	pgoyette-localcount:1.8.0.28
	pgoyette-localcount-base:1.8
	netbsd-7-0-1-RELEASE:1.8
	netbsd-7-0:1.8.0.26
	netbsd-7-0-RELEASE:1.8
	netbsd-7-0-RC3:1.8
	netbsd-7-0-RC2:1.8
	netbsd-7-0-RC1:1.8
	netbsd-5-2-3-RELEASE:1.3.8.3
	netbsd-5-1-5-RELEASE:1.3.8.3
	netbsd-6-0-6-RELEASE:1.8
	netbsd-6-1-5-RELEASE:1.8
	netbsd-7:1.8.0.24
	netbsd-7-base:1.8
	yamt-pagecache-base9:1.8
	yamt-pagecache-tag8:1.8
	netbsd-6-1-4-RELEASE:1.8
	netbsd-6-0-5-RELEASE:1.8
	tls-earlyentropy:1.8.0.22
	tls-earlyentropy-base:1.8
	riastradh-xf86-video-intel-2-7-1-pre-2-21-15:1.8
	riastradh-drm2-base3:1.8
	netbsd-6-1-3-RELEASE:1.8
	netbsd-6-0-4-RELEASE:1.8
	netbsd-5-2-2-RELEASE:1.3.8.3
	netbsd-5-1-4-RELEASE:1.3.8.3
	netbsd-6-1-2-RELEASE:1.8
	netbsd-6-0-3-RELEASE:1.8
	netbsd-5-2-1-RELEASE:1.3.8.3
	netbsd-5-1-3-RELEASE:1.3.8.3
	netbsd-6-1-1-RELEASE:1.8
	riastradh-drm2-base2:1.8
	riastradh-drm2-base1:1.8
	riastradh-drm2:1.8.0.16
	riastradh-drm2-base:1.8
	netbsd-6-1:1.8.0.20
	netbsd-6-0-2-RELEASE:1.8
	netbsd-6-1-RELEASE:1.8
	netbsd-6-1-RC4:1.8
	netbsd-6-1-RC3:1.8
	agc-symver:1.8.0.18
	agc-symver-base:1.8
	netbsd-6-1-RC2:1.8
	netbsd-6-1-RC1:1.8
	yamt-pagecache-base8:1.8
	netbsd-5-2:1.3.8.3.0.6
	netbsd-6-0-1-RELEASE:1.8
	yamt-pagecache-base7:1.8
	netbsd-5-2-RELEASE:1.3.8.3
	netbsd-5-2-RC1:1.3.8.3
	matt-nb6-plus-nbase:1.8
	yamt-pagecache-base6:1.8
	netbsd-6-0:1.8.0.14
	netbsd-6-0-RELEASE:1.8
	netbsd-6-0-RC2:1.8
	tls-maxphys:1.8.0.12
	tls-maxphys-base:1.8
	matt-nb6-plus:1.8.0.10
	matt-nb6-plus-base:1.8
	netbsd-6-0-RC1:1.8
	yamt-pagecache-base5:1.8
	yamt-pagecache-base4:1.8
	netbsd-6:1.8.0.8
	netbsd-6-base:1.8
	netbsd-5-1-2-RELEASE:1.3.8.3
	netbsd-5-1-1-RELEASE:1.3.8.3
	yamt-pagecache-base3:1.8
	yamt-pagecache-base2:1.8
	yamt-pagecache:1.8.0.6
	yamt-pagecache-base:1.8
	cherry-xenmp:1.8.0.4
	cherry-xenmp-base:1.8
	bouyer-quota2-nbase:1.8
	bouyer-quota2:1.8.0.2
	bouyer-quota2-base:1.8
	matt-mips64-premerge-20101231:1.8
	matt-nb5-mips64-premerge-20101231:1.3.8.1.4.1
	matt-nb5-pq3:1.3.8.3.0.4
	matt-nb5-pq3-base:1.3.8.3
	pre-xorg-192:1.7
	netbsd-5-1:1.3.8.3.0.2
	netbsd-5-1-RELEASE:1.3.8.3
	netbsd-5-1-RC4:1.3.8.3
	matt-nb5-mips64-k15:1.3.8.1.4.1
	netbsd-5-1-RC3:1.3.8.3
	netbsd-5-1-RC2:1.3.8.3
	netbsd-5-1-RC1:1.3.8.3
	netbsd-5-0-2-RELEASE:1.3.8.1
	matt-nb5-mips64-premerge-20091211:1.3.8.1
	matt-premerge-20091211:1.6
	matt-nb5-mips64-u2-k2-k4-k7-k8-k9:1.3.8.1
	matt-nb4-mips64-k7-u2a-k9b:1.3.8.1
	matt-nb5-mips64-u1-k1-k5:1.3.8.1
	matt-nb5-mips64:1.3.8.1.0.4
	netbsd-5-0-1-RELEASE:1.3.8.1
	jym-xensuspend-nbase:1.4
	netbsd-5-0:1.3.8.1.0.2
	netbsd-5-0-RELEASE:1.3.8.1
	netbsd-5-0-RC4:1.3.8.1
	netbsd-5-0-RC3:1.3.8.1
	netbsd-5-0-RC2:1.3.8.1
	jym-xensuspend:1.4.0.2
	jym-xensuspend-base:1.4
	netbsd-5-0-RC1:1.3.8.1
	haad-dm-base:1.3
	haad-dm-base2:1.3
	haad-nbase2:1.3
	netbsd-5:1.3.0.8
	netbsd-5-base:1.3
	matt-mips64-base2:1.3
	haad-dm:1.3.0.6
	haad-dm-base1:1.3
	wrstuden-revivesa-base-3:1.3
	wrstuden-revivesa:1.3.0.2
	wrstuden-revivesa-base-2:1.3;
locks; strict;
comment	@# @;


1.11
date	2018.12.31.13.05.08;	author mrg;	state Exp;
branches;
next	1.10;
commitid	yM28SA7Vfo4d6X5B;

1.10
date	2016.08.14.00.03.59;	author mrg;	state Exp;
branches
	1.10.12.1
	1.10.14.1;
next	1.9;
commitid	GTnYSwjk1lG4Iciz;

1.9
date	2016.08.11.08.32.44;	author mrg;	state Exp;
branches;
next	1.8;
commitid	8krHm1L1UVyjzRhz;

1.8
date	2010.11.23.08.22.35;	author mrg;	state Exp;
branches;
next	1.7;

1.7
date	2010.05.20.12.51.17;	author christos;	state Exp;
branches;
next	1.6;

1.6
date	2009.09.25.06.07.06;	author mrg;	state Exp;
branches;
next	1.5;

1.5
date	2009.06.11.05.43.19;	author mrg;	state Exp;
branches;
next	1.4;

1.4
date	2008.12.22.01.04.27;	author jmcneill;	state Exp;
branches;
next	1.3;

1.3
date	2008.08.15.15.55.07;	author rtr;	state Exp;
branches
	1.3.2.1
	1.3.6.1
	1.3.8.1;
next	1.2;

1.2
date	2008.08.03.03.55.17;	author mrg;	state Exp;
branches;
next	1.1;

1.1
date	2008.08.02.20.41.29;	author mrg;	state Exp;
branches;
next	;

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

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

1.3.2.1
date	2008.08.15.15.55.07;	author wrstuden;	state dead;
branches;
next	1.3.2.2;

1.3.2.2
date	2008.09.18.05.18.48;	author wrstuden;	state Exp;
branches;
next	;

1.3.6.1
date	2008.08.15.15.55.07;	author haad;	state dead;
branches;
next	1.3.6.2;

1.3.6.2
date	2008.10.19.22.41.22;	author haad;	state Exp;
branches;
next	;

1.3.8.1
date	2008.12.24.16.48.25;	author snj;	state Exp;
branches
	1.3.8.1.4.1;
next	1.3.8.2;

1.3.8.2
date	2009.09.17.04.24.42;	author snj;	state Exp;
branches;
next	1.3.8.3;

1.3.8.3
date	2009.09.28.01.57.05;	author snj;	state Exp;
branches;
next	;

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


desc
@@


1.11
log
@more xorg-server 1.20 updates:

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

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

LIB=		xkb

.PATH:		${X11SRCDIR.xorg-server}/${LIB}
.PATH:		${X11SRCDIR.X11}/src
.PATH:		${X11SRCDIR.xkbfile}/src
DDXSRCS=	ddxBeep.c ddxCtrls.c \
		ddxLEDs.c ddxLoad.c
DIXSRCS=	xkb.c xkbUtils.c xkbEvents.c xkbAccessX.c xkbSwap.c \
		xkbLEDs.c xkbInit.c xkbActions.c xkbPrKeyEv.c
XKBFILESRCS=	maprules.c xkmread.c xkbtext.c xkbfmisc.c \
		xkbout.c
X11SRCS=	XKBMisc.c XKBAlloc.c XKBGAlloc.c XKBMAlloc.c

SRCS=		${DDXSRCS} ${DIXSRCS} ${XKBFILESRCS} ${X11SRCS}

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}/Xi \
		-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

# For ${XKBROOTDIR} and ${XKBCOMPDIR}
.include "../../../bin/xkbcomp/Makefile.common"

# XXX: ddxLoad.c expects XKM_OUTPUT_DIR to have a trailing '/'.

CPPFLAGS+=	-DXKB_IN_SERVER -DHAVE_XKB_CONFIG_H \
		-DXKB_BASE_DIRECTORY=\"${XKBROOTDIR}\" \
		-DXKB_BIN_DIRECTORY=\"${X11BINDIR}\" \
		-DXKM_OUTPUT_DIR=\"${XKBCOMPDIR}/\" \
		-DXKB_DFLT_DISABLED=0

COPTS.XKBAlloc.c=	-Wno-error	# XXX gcc 3.3
COPTS.XKBMAlloc.c=	-Wno-error	# XXX gcc 3.3
COPTS.xkb.c=		-Wno-error	# XXX gcc 3.3
COPTS.xkbUtils.c=	-Wno-error	# XXX gcc 3.3

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

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


1.10
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.9 2016/08/11 08:32:44 mrg Exp $
d24 1
@


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


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


1.9
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.8 2010/11/23 08:22:35 mrg Exp $
d28 2
@


1.8
log
@many build updates and fixes for xorg-server 1.9.2.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.7 2010/05/20 12:51:17 christos Exp $
d12 1
a12 2
		ddxLEDs.c ddxLoad.c \
		ddxList.c
a25 1
		-I${X11SRCDIR.xorg-server}/Xext/extmod \
@


1.7
log
@Allow the build to work on a read-only source tree. From Anon Ymous
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.6 2009/09/25 06:07:06 mrg Exp $
d11 3
a13 3
DDXSRCS=	ddxBeep.c ddxCtrls.c ddxFakeMtn.c \
		ddxInit.c ddxKeyClick.c ddxLEDs.c ddxLoad.c \
		ddxList.c ddxDevBtn.c
d29 1
@


1.6
log
@share XKBCOMPDIR between xkbcomp and xorg-server.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.5 2009/06/11 05:43:19 mrg Exp $
d33 1
a33 1
# For ${XKBCOMPDIR}
d36 2
d39 1
a39 1
		-DXKB_BASE_DIRECTORY=\"${X11LIBDIR}/xkb\" \
d41 1
a41 1
		-DXKM_OUTPUT_DIR=\"${XKBCOMPDIR}\" \
@


1.5
log
@upgrade the build framework for xorg-server 1.6.

this doesn't quite work yet.  Xvfb and Xnest attempt to link but
have missing symbols.  Xorg doesn't build all its components yet.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.4 2008/12/22 01:04:27 jmcneill Exp $
d33 2
a34 1
CPPFLAGS+=	-DXKB_IN_SERVER -DHAVE_XKB_CONFIG_H
d36 5
a40 4
CPPFLAGS.xkbInit.c=	-DXKB_BASE_DIRECTORY=\"${X11LIBDIR}/xkb\" \
			-DXKB_BIN_DIRECTORY=\"${X11BINDIR}\" \
			-DXKM_OUTPUT_DIR=\"${X11LIBDIR}/xkb/compiled\" \
			-DXKB_DFLT_DISABLED=0
@


1.4
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 $
d11 1
a11 1
DDXSRCS=	ddxBeep.c ddxCtrls.c ddxFakeBtn.c ddxFakeMtn.c \
d16 1
a16 1
XKBFILESRCS=	maprules.c xkmread.c xkbtext.c xkbfmisc.c xkberrs.c \
@


1.3
log
@stop using XSERVERINCDIR since it was referencing src/x11 reachover
this is not correct for xorg reachover
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.2 2008/08/03 03:55:17 mrg Exp $
d13 1
a13 2
		ddxList.c ddxDevBtn.c \
		ddxKillSrv.c ddxVT.c ddxPrivate.c
a44 7
# XXX?
.for _S in	ddxKillSrv.c \
		ddxVT.c \
		ddxPrivate.c
CPPFLAGS.${_S}=		-DXF86DDXACTIONS
.endfor

@


1.3.8.1
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
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.3 2008/08/15 15:55:07 rtr Exp $
d13 2
a14 1
		ddxList.c ddxDevBtn.c
d46 7
@


1.3.8.1.4.1
log
@sync to netbsd-5
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.3.8.3 2009/09/28 01:57:05 snj Exp $
d11 1
a11 1
DDXSRCS=	ddxBeep.c ddxCtrls.c ddxFakeMtn.c \
d16 1
a16 1
XKBFILESRCS=	maprules.c xkmread.c xkbtext.c xkbfmisc.c \
d33 1
a33 2
# For ${XKBCOMPDIR}
.include "../../../bin/xkbcomp/Makefile.common"
d35 4
a38 5
CPPFLAGS+=	-DXKB_IN_SERVER -DHAVE_XKB_CONFIG_H \
		-DXKB_BASE_DIRECTORY=\"${X11LIBDIR}/xkb\" \
		-DXKB_BIN_DIRECTORY=\"${X11BINDIR}\" \
		-DXKM_OUTPUT_DIR=\"${XKBCOMPDIR}\" \
		-DXKB_DFLT_DISABLED=0
@


1.3.8.2
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.5 2009/06/11 05:43:19 mrg Exp $
d11 1
a11 1
DDXSRCS=	ddxBeep.c ddxCtrls.c ddxFakeMtn.c \
d16 1
a16 1
XKBFILESRCS=	maprules.c xkmread.c xkbtext.c xkbfmisc.c \
@


1.3.8.3
log
@Pull up following revision(s) (requested by mrg in ticket #1033):
	external/mit/xorg/bin/xkbcomp/Makefile: revision 1.4
	external/mit/xorg/bin/xkbcomp/Makefile.common: revision 1.1
	external/mit/xorg/server/xorg-server/xkb/Makefile: revision 1.6
share XKBCOMPDIR between xkbcomp and xorg-server.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.3.8.2 2009/09/17 04:24:42 snj Exp $
d33 1
a33 2
# For ${XKBCOMPDIR}
.include "../../../bin/xkbcomp/Makefile.common"
d35 4
a38 5
CPPFLAGS+=	-DXKB_IN_SERVER -DHAVE_XKB_CONFIG_H \
		-DXKB_BASE_DIRECTORY=\"${X11LIBDIR}/xkb\" \
		-DXKB_BIN_DIRECTORY=\"${X11BINDIR}\" \
		-DXKM_OUTPUT_DIR=\"${XKBCOMPDIR}\" \
		-DXKB_DFLT_DISABLED=0
@


1.3.6.1
log
@file Makefile was added on branch haad-dm on 2008-10-19 22:41:22 +0000
@
text
@d1 57
@


1.3.6.2
log
@Sync with HEAD.
@
text
@a0 57
#	$NetBSD: Makefile,v 1.3 2008/08/15 15:55:07 rtr Exp $

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

LIB=		xkb

.PATH:		${X11SRCDIR.xorg-server}/${LIB}
.PATH:		${X11SRCDIR.X11}/src
.PATH:		${X11SRCDIR.xkbfile}/src
DDXSRCS=	ddxBeep.c ddxCtrls.c ddxFakeBtn.c ddxFakeMtn.c \
		ddxInit.c ddxKeyClick.c ddxLEDs.c ddxLoad.c \
		ddxList.c ddxDevBtn.c \
		ddxKillSrv.c ddxVT.c ddxPrivate.c
DIXSRCS=	xkb.c xkbUtils.c xkbEvents.c xkbAccessX.c xkbSwap.c \
		xkbLEDs.c xkbInit.c xkbActions.c xkbPrKeyEv.c
XKBFILESRCS=	maprules.c xkmread.c xkbtext.c xkbfmisc.c xkberrs.c \
		xkbout.c
X11SRCS=	XKBMisc.c XKBAlloc.c XKBGAlloc.c XKBMAlloc.c

SRCS=		${DDXSRCS} ${DIXSRCS} ${XKBFILESRCS} ${X11SRCS}

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

CPPFLAGS.xkbInit.c=	-DXKB_BASE_DIRECTORY=\"${X11LIBDIR}/xkb\" \
			-DXKB_BIN_DIRECTORY=\"${X11BINDIR}\" \
			-DXKM_OUTPUT_DIR=\"${X11LIBDIR}/xkb/compiled\" \
			-DXKB_DFLT_DISABLED=0

COPTS.XKBAlloc.c=	-Wno-error	# XXX gcc 3.3
COPTS.XKBMAlloc.c=	-Wno-error	# XXX gcc 3.3
COPTS.xkb.c=		-Wno-error	# XXX gcc 3.3
COPTS.xkbUtils.c=	-Wno-error	# XXX gcc 3.3

# XXX?
.for _S in	ddxKillSrv.c \
		ddxVT.c \
		ddxPrivate.c
CPPFLAGS.${_S}=		-DXF86DDXACTIONS
.endfor

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

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


1.3.2.1
log
@file Makefile was added on branch wrstuden-revivesa on 2008-09-18 05:18:48 +0000
@
text
@d1 57
@


1.3.2.2
log
@Sync with wrstuden-revivesa-base-2.
@
text
@a0 57
#	$NetBSD: Makefile,v 1.3 2008/08/15 15:55:07 rtr Exp $

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

LIB=		xkb

.PATH:		${X11SRCDIR.xorg-server}/${LIB}
.PATH:		${X11SRCDIR.X11}/src
.PATH:		${X11SRCDIR.xkbfile}/src
DDXSRCS=	ddxBeep.c ddxCtrls.c ddxFakeBtn.c ddxFakeMtn.c \
		ddxInit.c ddxKeyClick.c ddxLEDs.c ddxLoad.c \
		ddxList.c ddxDevBtn.c \
		ddxKillSrv.c ddxVT.c ddxPrivate.c
DIXSRCS=	xkb.c xkbUtils.c xkbEvents.c xkbAccessX.c xkbSwap.c \
		xkbLEDs.c xkbInit.c xkbActions.c xkbPrKeyEv.c
XKBFILESRCS=	maprules.c xkmread.c xkbtext.c xkbfmisc.c xkberrs.c \
		xkbout.c
X11SRCS=	XKBMisc.c XKBAlloc.c XKBGAlloc.c XKBMAlloc.c

SRCS=		${DDXSRCS} ${DIXSRCS} ${XKBFILESRCS} ${X11SRCS}

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

CPPFLAGS.xkbInit.c=	-DXKB_BASE_DIRECTORY=\"${X11LIBDIR}/xkb\" \
			-DXKB_BIN_DIRECTORY=\"${X11BINDIR}\" \
			-DXKM_OUTPUT_DIR=\"${X11LIBDIR}/xkb/compiled\" \
			-DXKB_DFLT_DISABLED=0

COPTS.XKBAlloc.c=	-Wno-error	# XXX gcc 3.3
COPTS.XKBMAlloc.c=	-Wno-error	# XXX gcc 3.3
COPTS.xkb.c=		-Wno-error	# XXX gcc 3.3
COPTS.xkbUtils.c=	-Wno-error	# XXX gcc 3.3

# XXX?
.for _S in	ddxKillSrv.c \
		ddxVT.c \
		ddxPrivate.c
CPPFLAGS.${_S}=		-DXF86DDXACTIONS
.endfor

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

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


1.2
log
@use the right files, and the right defines.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.1 2008/08/02 20:41:29 mrg Exp $
a23 1
		-I${XSERVERINCDIR} \
@


1.1
log
@build xorg-server xkb, dbe and mfb dirs.  maybe be ready to build afb.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.7.4.1 2004/11/21 10:01:28 rtr Exp $
d13 2
a14 1
		ddxList.c ddxDevBtn.c
d48 4
a51 6
.for _S _T in	ddxKillSrv.c xf86KillSrv.c \
		ddxVT.c xf86VT.c \
		ddxPrivate.c xf86Private.c
BUILDSYMLINKS+=		${_S} ${_T}
BUILDOBJS+=		${_T:R}.o
CPPFLAGS.${_T}=		-DXF86DDXACTIONS
@