head	1.19;
access;
symbols
	netbsd-11-0-RC4:1.19
	netbsd-11-0-RC3:1.19
	netbsd-11-0-RC2:1.19
	netbsd-11-0-RC1:1.19
	perseant-exfatfs-base-20250801:1.19
	netbsd-11:1.19.0.6
	netbsd-11-base:1.19
	netbsd-10-1-RELEASE:1.19
	perseant-exfatfs-base-20240630:1.19
	perseant-exfatfs:1.19.0.4
	perseant-exfatfs-base:1.19
	netbsd-8-3-RELEASE:1.17
	netbsd-9-4-RELEASE:1.18
	netbsd-10-0-RELEASE:1.19
	netbsd-10-0-RC6:1.19
	netbsd-10-0-RC5:1.19
	netbsd-10-0-RC4:1.19
	netbsd-10-0-RC3:1.19
	netbsd-10-0-RC2:1.19
	netbsd-10-0-RC1:1.19
	netbsd-10:1.19.0.2
	netbsd-10-base:1.19
	netbsd-9-3-RELEASE:1.18
	cjep_sun2x-base1:1.18
	cjep_sun2x:1.18.0.8
	cjep_sun2x-base:1.18
	cjep_staticlib_x-base1:1.18
	netbsd-9-2-RELEASE:1.18
	cjep_staticlib_x:1.18.0.6
	cjep_staticlib_x-base:1.18
	netbsd-9-1-RELEASE:1.18
	phil-wifi-20200421:1.18
	phil-wifi-20200411:1.18
	is-mlppp:1.18.0.4
	is-mlppp-base:1.18
	phil-wifi-20200406:1.18
	netbsd-8-2-RELEASE:1.17
	netbsd-9-0-RELEASE:1.18
	netbsd-9-0-RC2:1.18
	netbsd-9-0-RC1:1.18
	phil-wifi-20191119:1.18
	netbsd-9:1.18.0.2
	netbsd-9-base:1.18
	phil-wifi-20190609:1.18
	netbsd-8-1-RELEASE:1.17
	netbsd-8-1-RC1:1.17
	pgoyette-compat-merge-20190127:1.17.12.1
	pgoyette-compat-20190127:1.18
	pgoyette-compat-20190118:1.18
	pgoyette-compat-1226:1.17
	pgoyette-compat-1126:1.17
	pgoyette-compat-1020:1.17
	pgoyette-compat-0930:1.17
	pgoyette-compat-0906:1.17
	netbsd-7-2-RELEASE:1.12
	pgoyette-compat-0728:1.17
	netbsd-8-0-RELEASE:1.17
	phil-wifi:1.17.0.14
	phil-wifi-base:1.17
	pgoyette-compat-0625:1.17
	netbsd-8-0-RC2:1.17
	pgoyette-compat-0521:1.17
	pgoyette-compat-0502:1.17
	pgoyette-compat-0422:1.17
	netbsd-8-0-RC1:1.17
	pgoyette-compat-0415:1.17
	pgoyette-compat-0407:1.17
	pgoyette-compat-0330:1.17
	pgoyette-compat-0322:1.17
	pgoyette-compat-0315:1.17
	netbsd-7-1-2-RELEASE:1.12
	pgoyette-compat:1.17.0.12
	pgoyette-compat-base:1.17
	netbsd-7-1-1-RELEASE:1.12
	matt-nb8-mediatek:1.17.0.10
	matt-nb8-mediatek-base:1.17
	perseant-stdc-iso10646:1.17.0.8
	perseant-stdc-iso10646-base:1.17
	netbsd-8:1.17.0.6
	netbsd-8-base:1.17
	prg-localcount2-base3:1.17
	prg-localcount2-base2:1.17
	prg-localcount2-base1:1.17
	prg-localcount2:1.17.0.4
	prg-localcount2-base:1.17
	pgoyette-localcount-20170426:1.17
	bouyer-socketcan-base1:1.17
	pgoyette-localcount-20170320:1.17
	netbsd-7-1:1.12.0.18
	netbsd-7-1-RELEASE:1.12
	netbsd-7-1-RC2:1.12
	netbsd-7-nhusb-base-20170116:1.12
	bouyer-socketcan:1.17.0.2
	bouyer-socketcan-base:1.17
	pgoyette-localcount-20170107:1.17
	netbsd-7-1-RC1:1.12
	pgoyette-localcount-20161104:1.15
	netbsd-7-0-2-RELEASE:1.12
	localcount-20160914:1.15
	netbsd-7-nhusb:1.12.0.16
	netbsd-7-nhusb-base:1.12
	pgoyette-localcount-20160806:1.12
	pgoyette-localcount-20160726:1.12
	pgoyette-localcount:1.12.0.14
	pgoyette-localcount-base:1.12
	netbsd-7-0-1-RELEASE:1.12
	netbsd-7-0:1.12.0.12
	netbsd-7-0-RELEASE:1.12
	netbsd-7-0-RC3:1.12
	netbsd-7-0-RC2:1.12
	netbsd-7-0-RC1:1.12
	netbsd-5-2-3-RELEASE:1.6.2.1
	netbsd-5-1-5-RELEASE:1.6.2.1
	netbsd-6-0-6-RELEASE:1.11
	netbsd-6-1-5-RELEASE:1.11
	netbsd-7:1.12.0.10
	netbsd-7-base:1.12
	yamt-pagecache-base9:1.12
	yamt-pagecache-tag8:1.11.2.1
	netbsd-6-1-4-RELEASE:1.11
	netbsd-6-0-5-RELEASE:1.11
	tls-earlyentropy:1.12.0.8
	tls-earlyentropy-base:1.12
	riastradh-xf86-video-intel-2-7-1-pre-2-21-15:1.12
	riastradh-drm2-base3:1.12
	netbsd-6-1-3-RELEASE:1.11
	netbsd-6-0-4-RELEASE:1.11
	netbsd-5-2-2-RELEASE:1.6.2.1
	netbsd-5-1-4-RELEASE:1.6.2.1
	netbsd-6-1-2-RELEASE:1.11
	netbsd-6-0-3-RELEASE:1.11
	netbsd-5-2-1-RELEASE:1.6.2.1
	netbsd-5-1-3-RELEASE:1.6.2.1
	netbsd-6-1-1-RELEASE:1.11
	riastradh-drm2-base2:1.12
	riastradh-drm2-base1:1.12
	riastradh-drm2:1.12.0.4
	riastradh-drm2-base:1.12
	netbsd-6-1:1.11.0.10
	netbsd-6-0-2-RELEASE:1.11
	netbsd-6-1-RELEASE:1.11
	netbsd-6-1-RC4:1.11
	netbsd-6-1-RC3:1.11
	agc-symver:1.12.0.6
	agc-symver-base:1.12
	netbsd-6-1-RC2:1.11
	netbsd-6-1-RC1:1.11
	yamt-pagecache-base8:1.12
	netbsd-5-2:1.6.2.1.0.6
	netbsd-6-0-1-RELEASE:1.11
	yamt-pagecache-base7:1.12
	netbsd-5-2-RELEASE:1.6.2.1
	netbsd-5-2-RC1:1.6.2.1
	matt-nb6-plus-nbase:1.11
	yamt-pagecache-base6:1.12
	netbsd-6-0:1.11.0.8
	netbsd-6-0-RELEASE:1.11
	netbsd-6-0-RC2:1.11
	tls-maxphys:1.12.0.2
	tls-maxphys-base:1.12
	matt-nb6-plus:1.11.0.6
	matt-nb6-plus-base:1.11
	netbsd-6-0-RC1:1.11
	yamt-pagecache-base5:1.12
	yamt-pagecache-base4:1.12
	netbsd-6:1.11.0.4
	netbsd-6-base:1.11
	netbsd-5-1-2-RELEASE:1.6.2.1
	netbsd-5-1-1-RELEASE:1.6.2.1
	yamt-pagecache-base3:1.11
	yamt-pagecache-base2:1.11
	yamt-pagecache:1.11.0.2
	yamt-pagecache-base:1.11
	cherry-xenmp:1.10.0.4
	cherry-xenmp-base:1.10
	bouyer-quota2-nbase:1.10
	bouyer-quota2:1.10.0.2
	bouyer-quota2-base:1.10
	matt-mips64-premerge-20101231:1.10
	matt-nb5-mips64-premerge-20101231:1.6.8.1
	matt-nb5-pq3:1.6.2.1.0.4
	matt-nb5-pq3-base:1.6.2.1
	pre-xorg-192:1.9
	netbsd-5-1:1.6.2.1.0.2
	netbsd-5-1-RELEASE:1.6.2.1
	netbsd-5-1-RC4:1.6.2.1
	matt-nb5-mips64-k15:1.6.8.1
	netbsd-5-1-RC3:1.6.2.1
	netbsd-5-1-RC2:1.6.2.1
	netbsd-5-1-RC1:1.6.2.1
	netbsd-5-0-2-RELEASE:1.6
	matt-nb5-mips64-premerge-20091211:1.6
	matt-premerge-20091211:1.9
	matt-nb5-mips64-u2-k2-k4-k7-k8-k9:1.6
	matt-nb4-mips64-k7-u2a-k9b:1.6
	matt-nb5-mips64-u1-k1-k5:1.6
	matt-nb5-mips64:1.6.0.8
	netbsd-5-0-1-RELEASE:1.6
	jym-xensuspend-nbase:1.6
	netbsd-5-0:1.6.0.6
	netbsd-5-0-RELEASE:1.6
	netbsd-5-0-RC4:1.6
	netbsd-5-0-RC3:1.6
	netbsd-5-0-RC2:1.6
	jym-xensuspend:1.6.0.4
	jym-xensuspend-base:1.6
	netbsd-5-0-RC1:1.6
	haad-dm-base:1.6
	haad-dm-base2:1.6
	haad-nbase2:1.6
	netbsd-5:1.6.0.2
	netbsd-5-base:1.6
	matt-mips64-base2:1.6
	haad-dm:1.5.0.2
	haad-dm-base1:1.5
	wrstuden-revivesa-base-3:1.2
	wrstuden-revivesa:1.2.0.2
	wrstuden-revivesa-base-2:1.2;
locks; strict;
comment	@# @;


1.19
date	2022.07.15.04.18.54;	author mrg;	state Exp;
branches;
next	1.18;
commitid	o4A4jy8xMVZZEWLD;

1.18
date	2018.12.31.11.14.03;	author mrg;	state Exp;
branches;
next	1.17;
commitid	TUVjjF1MdjrmtW5B;

1.17
date	2016.11.17.07.58.24;	author snj;	state Exp;
branches
	1.17.12.1
	1.17.14.1;
next	1.16;
commitid	5AD0ymHoBETDhsuz;

1.16
date	2016.11.17.06.58.39;	author snj;	state Exp;
branches;
next	1.15;
commitid	2DHEoNf5R8pvVruz;

1.15
date	2016.08.14.03.43.04;	author mrg;	state Exp;
branches;
next	1.14;
commitid	J271e7p9sa4wUdiz;

1.14
date	2016.08.14.00.03.58;	author mrg;	state Exp;
branches;
next	1.13;
commitid	GTnYSwjk1lG4Iciz;

1.13
date	2016.08.11.08.32.42;	author mrg;	state Exp;
branches;
next	1.12;
commitid	8krHm1L1UVyjzRhz;

1.12
date	2012.03.22.23.46.28;	author joerg;	state Exp;
branches
	1.12.14.1;
next	1.11;

1.11
date	2011.08.11.23.15.41;	author joerg;	state Exp;
branches
	1.11.2.1;
next	1.10;

1.10
date	2010.11.23.08.22.30;	author mrg;	state Exp;
branches;
next	1.9;

1.9
date	2009.08.23.09.05.44;	author mrg;	state Exp;
branches;
next	1.8;

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

1.7
date	2009.06.11.05.43.15;	author mrg;	state Exp;
branches;
next	1.6;

1.6
date	2008.10.20.16.25.06;	author cube;	state Exp;
branches
	1.6.2.1
	1.6.8.1;
next	1.5;

1.5
date	2008.10.18.22.44.26;	author cube;	state Exp;
branches
	1.5.2.1;
next	1.4;

1.4
date	2008.10.14.23.37.19;	author cube;	state Exp;
branches;
next	1.3;

1.3
date	2008.09.25.15.14.06;	author jmcneill;	state Exp;
branches;
next	1.2;

1.2
date	2008.08.03.03.17.16;	author mrg;	state Exp;
branches
	1.2.2.1;
next	1.1;

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

1.17.12.1
date	2019.01.18.08.49.06;	author pgoyette;	state Exp;
branches;
next	;
commitid	Lmlzg3OVT2cd6f8B;

1.17.14.1
date	2019.06.10.22.02.46;	author christos;	state Exp;
branches;
next	;
commitid	jtc8rnCzWiEEHGqB;

1.12.14.1
date	2017.01.07.08.56.00;	author pgoyette;	state Exp;
branches;
next	;
commitid	uEL0C1YuiJrlV0Bz;

1.11.2.1
date	2012.04.17.00.04.50;	author yamt;	state Exp;
branches;
next	;

1.6.2.1
date	2009.09.17.04.24.38;	author snj;	state Exp;
branches;
next	;

1.6.8.1
date	2010.04.21.05.24.43;	author matt;	state Exp;
branches;
next	;

1.5.2.1
date	2008.10.18.22.44.26;	author haad;	state dead;
branches;
next	1.5.2.2;

1.5.2.2
date	2008.10.19.22.41.18;	author haad;	state Exp;
branches;
next	;

1.2.2.1
date	2008.08.03.03.17.16;	author wrstuden;	state dead;
branches;
next	1.2.2.2;

1.2.2.2
date	2008.09.18.05.18.44;	author wrstuden;	state Exp;
branches;
next	;


desc
@@


1.19
log
@various updates to build with xorg-server 21.1.3.

- the s3, tga, and trident drivers use old functionality and are disabled
- dixmods/fb is removed, main fb has all these now (we retain our revert
  of an upstream change here.)
- adjust source lists as necessary
- remove vbe module, now part of int10
- use -lxcvt
- misc clean up
- ramdac loses IBM, BT and TI support (this is one of the problems for
  the disabled drivers, but also some structures in RamDac.h are gone
  entirely, not copied anywhere.)
- old apm code is gone, all bsd uses pm_noop. now

this probably require a clean build in at least xorg-server and the
drivers, and perhaps the DESTDIR as well.  will update src/UPDATING with
details when they are fully known.
@
text
@#	$NetBSD: Makefile,v 1.18 2018/12/31 11:14:03 mrg Exp $

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

LIB=		dix

.PATH:		${X11SRCDIR.xorg-server}/dix
SRCS=		atom.c colormap.c cursor.c devices.c dispatch.c dixfonts.c \
		dixutils.c events.c extension.c gc.c getevents.c gestures.c \
		globals.c glyphcurs.c grabs.c initatoms.c main.c pixmap.c \
		privates.c property.c resource.c swaprep.c swapreq.c \
		tables.c window.c stubmain.c \
		enterleave.c ptrveloc.c registry.c selection.c \
		eventconvert.c inpututils.c region.c touch.c


CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/pixman-1
CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/xorg
CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/miext/sync
CPPFLAGS+=	${X11FLAGS.PERVASIVE_EXTENSION}
CPPFLAGS+=	${X11FLAGS.DIX} ${X11INCS.DIX}

CPPFLAGS.globals.c=	-DCOMPILEDDEFAULTFONTPATH=\"${X11DEFAULTFONTPATH:ts,}\"

# XXX make user variables
CPPFLAGS.main.c=	-DVENDOR_STRING="\"The Xorg Group\"" \
			-DVENDOR_RELEASE=${XORG_VERSION_CURRENT} \

FILES=		protocol.txt
FILESDIR=	${X11ROOTDIR}/lib/xorg

COPTS.dixutils.c=	-Wno-error
COPTS.colormap.c=	-Wno-error
COPTS.cursor.c=		-Wno-error
COPTS.dispatch.c=	-Wno-error
COPTS.dixfonts.c=	-Wno-error
COPTS.events.c=		-Wno-error
COPTS.resource.c=	-Wno-error
COPTS.window.c=		-Wno-error
COPTS.inpututils.c=	-Wno-error

CWARNFLAGS.clang+=	-Wno-switch

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


1.18
log
@build updates for xorg-server 1.20.3:
- moved/removed/new files
- don't define HAVE_XORG_CONFIG_H or HAVE_DIX_CONFIG_H if using
  ${X11FLAGS.DIX} -- already included.

put glxvnd into glx itself for now.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.17 2016/11/17 07:58:24 snj Exp $
d11 1
a11 1
		dixutils.c events.c extension.c gc.c getevents.c \
a27 1
CPPFLAGS.dispatch.c=	-DVENDOR_NAME="\"The Xorg Foundation\""
a29 1
			-DVENDOR_NAME="\"The Xorg Foundation\""
@


1.17
log
@let there be a sane font path!
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.16 2016/11/17 06:58:39 snj Exp $
d11 1
a11 1
		dixutils.c events.c extension.c ffs.c gc.c getevents.c \
@


1.17.14.1
log
@Sync with HEAD
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.18 2018/12/31 11:14:03 mrg Exp $
d11 1
a11 1
		dixutils.c events.c extension.c gc.c getevents.c \
@


1.17.12.1
log
@Synch with HEAD
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.17 2016/11/17 07:58:24 snj Exp $
d11 1
a11 1
		dixutils.c events.c extension.c gc.c getevents.c \
@


1.16
log
@the last release of xorg-server that cared about RGB_DB was 1.4.2,
back in 2008
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.15 2016/08/14 03:43:04 mrg Exp $
a24 1
.if 0
a25 1
.endif
@


1.15
log
@various updates:
- port pkgsrc libxshmfence patches
- Xextbuiltin/module is no longer a thing, make it normal
- always need xorg-config.h/xorg-server.h for server components now
- add present, damage, render, Xi, dri, pixman,  extension where needed
- fix various CPPFLAGS issues
- deal with moved sdksyms.sh
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.14 2016/08/14 00:03:58 mrg Exp $
d26 1
a26 2
CPPFLAGS.globals.c=	-DCOMPILEDDEFAULTFONTPATH=\"${X11DEFAULTFONTPATH:ts,}\" \
			-DRGB_DB=\"${X11LIBDIR}/rgb\"
@


1.14
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.13 2016/08/11 08:32:42 mrg Exp $
d25 1
d28 1
@


1.13
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.12 2012/03/22 23:46:28 joerg Exp $
d21 1
@


1.12
log
@Disable a bunch of additional warnings for now for the clang build.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.11 2011/08/11 23:15:41 joerg Exp $
d14 3
a16 3
		tables.c window.c \
		deprecated.c enterleave.c ptrveloc.c registry.c selection.c \
		eventconvert.c inpututils.c region.c
a38 1
COPTS.deprecated.c=	-Wno-error
@


1.12.14.1
log
@Sync with HEAD.  (Note that most of these changes are simply $NetBSD$
tag issues.)
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.17 2016/11/17 07:58:24 snj Exp $
d24 2
a25 1
CPPFLAGS.globals.c=	-DCOMPILEDDEFAULTFONTPATH=\"${X11DEFAULTFONTPATH:ts,}\"
@


1.11
log
@Various warning adjustments for clang
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.10 2010/11/23 08:22:30 mrg Exp $
d47 1
a47 1
CWARNFLAGS.clang+=	-Wno-switch-enum
@


1.11.2.1
log
@sync with head
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.11 2011/08/11 23:15:41 joerg Exp $
d47 1
a47 1
CWARNFLAGS.clang+=	-Wno-switch
@


1.10
log
@many build updates and fixes for xorg-server 1.9.2.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.9 2009/08/23 09:05:44 mrg Exp $
d47 2
@


1.9
log
@install the xorg "protocol.txt" file.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.8 2009/08/22 02:40:27 mrg Exp $
d15 2
a16 1
		deprecated.c enterleave.c ptrveloc.c registry.c selection.c
d28 1
d45 1
@


1.8
log
@add -Wno-error for a bunch of files that use (xorg) deprecated symbols.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.7 2009/06/11 05:43:15 mrg Exp $
a8 1

d31 3
@


1.7
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.6 2008/10/20 16:25:06 cube Exp $
d33 8
@


1.6
log
@No need for quotes around XORG_VERSION_CURRENT.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.5 2008/10/18 22:44:26 cube Exp $
d15 3
a17 1
		tables.c window.c
a35 3

SUBDIR=	xpstubs
.include <bsd.subdir.mk>
@


1.6.8.1
log
@sync to netbsd-5
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.6.2.1 2009/09/17 04:24:38 snj Exp $
d9 1
d15 1
a15 3
		tables.c window.c \
		deprecated.c enterleave.c ptrveloc.c registry.c selection.c

a29 3
FILES=		protocol.txt
FILESDIR=	${X11ROOTDIR}/lib/xorg

a30 8
COPTS.colormap.c=	-Wno-error
COPTS.cursor.c=		-Wno-error
COPTS.deprecated.c=	-Wno-error
COPTS.dispatch.c=	-Wno-error
COPTS.dixfonts.c=	-Wno-error
COPTS.events.c=		-Wno-error
COPTS.resource.c=	-Wno-error
COPTS.window.c=		-Wno-error
d34 3
@


1.6.2.1
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.7 2009/06/11 05:43:15 mrg Exp $
d9 1
d15 1
a15 3
		tables.c window.c \
		deprecated.c enterleave.c ptrveloc.c registry.c selection.c

a29 3
FILES=		protocol.txt
FILESDIR=	${X11ROOTDIR}/lib/xorg

a30 8
COPTS.colormap.c=	-Wno-error
COPTS.cursor.c=		-Wno-error
COPTS.deprecated.c=	-Wno-error
COPTS.dispatch.c=	-Wno-error
COPTS.dixfonts.c=	-Wno-error
COPTS.events.c=		-Wno-error
COPTS.resource.c=	-Wno-error
COPTS.window.c=		-Wno-error
d34 3
@


1.5
log
@Avoid using PRINTX11VERSION which doesn't give the expected result.  Use
the somewhat hackish XORG_VERSION_CURRENT instead.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.4 2008/10/14 23:37:19 cube Exp $
d27 1
a27 1
			-DVENDOR_RELEASE="${XORG_VERSION_CURRENT}" \
@


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


1.5.2.2
log
@Sync with HEAD.
@
text
@a0 36
#	$NetBSD: Makefile,v 1.5 2008/10/18 22:44:26 cube Exp $

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

LIB=		dix


.PATH:		${X11SRCDIR.xorg-server}/dix
SRCS=		atom.c colormap.c cursor.c devices.c dispatch.c dixfonts.c \
		dixutils.c events.c extension.c ffs.c gc.c getevents.c \
		globals.c glyphcurs.c grabs.c initatoms.c main.c pixmap.c \
		privates.c property.c resource.c swaprep.c swapreq.c \
		tables.c window.c

CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/pixman-1
CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/xorg
CPPFLAGS+=	${X11FLAGS.PERVASIVE_EXTENSION}
CPPFLAGS+=	${X11FLAGS.DIX} ${X11INCS.DIX}

CPPFLAGS.globals.c=	-DCOMPILEDDEFAULTFONTPATH=\"${X11DEFAULTFONTPATH:ts,}\" \
			-DRGB_DB=\"${X11LIBDIR}/rgb\"

# XXX make user variables
CPPFLAGS.main.c=	-DVENDOR_STRING="\"The Xorg Group\"" \
			-DVENDOR_RELEASE="${XORG_VERSION_CURRENT}" \
			-DVENDOR_NAME="\"The Xorg Foundation\""

COPTS.dixutils.c=	-Wno-error

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

SUBDIR=	xpstubs
.include <bsd.subdir.mk>
@


1.4
log
@- Adapt to changes on bsd.x11.mk
- Remove unnecessary targets that handled .man.pre files
- Add transformations for package-specific patterns in man page templates.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.3 2008/09/25 15:14:06 jmcneill Exp $
d27 1
a27 1
			-DVENDOR_RELEASE="${XVERSION}" \
a32 1
XVERSION!=	${PRINTX11VERSION}
@


1.3
log
@Add ${X11FONTDIR}/TTF/ to COMPILEDDEFAULTFONTPATH
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.2 2008/08/03 03:17:16 mrg Exp $
d5 1
d22 1
a22 1
CPPFLAGS.globals.c=	-DCOMPILEDDEFAULTFONTPATH=\"${X11FONTDIR}/misc/,${X11FONTDIR}/TTF/,${X11FONTDIR}/Speedo/,${X11FONTDIR}/Type1/,${X11FONTDIR}/CID/,${X11FONTDIR}/75dpi/,${X11FONTDIR}/100dpi/\" \
@


1.2
log
@add X11INCDIR/xorg to the include path
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.1 2008/08/02 04:32:00 mrg Exp $
d21 1
a21 1
CPPFLAGS.globals.c=	-DCOMPILEDDEFAULTFONTPATH=\"${X11FONTDIR}/misc/,${X11FONTDIR}/Speedo/,${X11FONTDIR}/Type1/,${X11FONTDIR}/CID/,${X11FONTDIR}/75dpi/,${X11FONTDIR}/100dpi/\" \
@


1.2.2.1
log
@file Makefile was added on branch wrstuden-revivesa on 2008-09-18 05:18:44 +0000
@
text
@d1 36
@


1.2.2.2
log
@Sync with wrstuden-revivesa-base-2.
@
text
@a0 36
#	$NetBSD: Makefile,v 1.2 2008/08/03 03:17:16 mrg Exp $

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

LIB=		dix


.PATH:		${X11SRCDIR.xorg-server}/dix
SRCS=		atom.c colormap.c cursor.c devices.c dispatch.c dixfonts.c \
		dixutils.c events.c extension.c ffs.c gc.c getevents.c \
		globals.c glyphcurs.c grabs.c initatoms.c main.c pixmap.c \
		privates.c property.c resource.c swaprep.c swapreq.c \
		tables.c window.c

CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/pixman-1
CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/xorg
CPPFLAGS+=	${X11FLAGS.PERVASIVE_EXTENSION}
CPPFLAGS+=	${X11FLAGS.DIX} ${X11INCS.DIX}

CPPFLAGS.globals.c=	-DCOMPILEDDEFAULTFONTPATH=\"${X11FONTDIR}/misc/,${X11FONTDIR}/Speedo/,${X11FONTDIR}/Type1/,${X11FONTDIR}/CID/,${X11FONTDIR}/75dpi/,${X11FONTDIR}/100dpi/\" \
			-DRGB_DB=\"${X11LIBDIR}/rgb\"

# XXX make user variables
CPPFLAGS.main.c=	-DVENDOR_STRING="\"The Xorg Group\"" \
			-DVENDOR_RELEASE="${XVERSION}" \
			-DVENDOR_NAME="\"The Xorg Foundation\""

COPTS.dixutils.c=	-Wno-error

.include <bsd.x11.mk>
XVERSION!=	${PRINTX11VERSION}
.include <bsd.lib.mk>

SUBDIR=	xpstubs
.include <bsd.subdir.mk>
@


1.1
log
@start of build-glue support for xorg-server bits.
building so far:
	doc include dix fb mi miext randr render


again based on the work rtr made for xorg support, and of course this
is very much based on the work lukem did originally for src/x11, as is
all the stuff in src/external/mit/xorg.

hi luke! :)
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.9.4.2 2004/11/21 10:01:26 rtr Exp $
d17 1
@