head	1.13;
access;
symbols
	perseant-exfatfs-base-20250801:1.13
	perseant-exfatfs-base-20240630:1.13
	perseant-exfatfs:1.13.0.14
	perseant-exfatfs-base:1.13
	cjep_sun2x:1.13.0.12
	cjep_sun2x-base:1.13
	cjep_staticlib_x-base1:1.13
	cjep_staticlib_x:1.13.0.10
	cjep_staticlib_x-base:1.13
	phil-wifi-20200421:1.13
	phil-wifi-20200411:1.13
	phil-wifi-20200406:1.13
	pgoyette-compat-merge-20190127:1.13
	pgoyette-compat-20190127:1.13
	pgoyette-compat-20190118:1.13
	pgoyette-compat-1226:1.13
	pgoyette-compat-1126:1.13
	pgoyette-compat-1020:1.13
	pgoyette-compat-0930:1.13
	pgoyette-compat-0906:1.13
	netbsd-7-2-RELEASE:1.9
	pgoyette-compat-0728:1.13
	pgoyette-compat-0625:1.13
	pgoyette-compat-0521:1.13
	pgoyette-compat-0502:1.13
	pgoyette-compat-0422:1.13
	pgoyette-compat-0415:1.13
	pgoyette-compat-0407:1.13
	pgoyette-compat-0330:1.13
	pgoyette-compat-0322:1.13
	pgoyette-compat-0315:1.13
	netbsd-7-1-2-RELEASE:1.9
	pgoyette-compat:1.13.0.8
	pgoyette-compat-base:1.13
	netbsd-7-1-1-RELEASE:1.9
	perseant-stdc-iso10646:1.13.0.6
	perseant-stdc-iso10646-base:1.13
	prg-localcount2-base3:1.13
	prg-localcount2-base2:1.13
	prg-localcount2-base1:1.13
	prg-localcount2:1.13.0.4
	prg-localcount2-base:1.13
	pgoyette-localcount-20170426:1.13
	bouyer-socketcan-base1:1.13
	pgoyette-localcount-20170320:1.13
	netbsd-7-1:1.9.0.12
	netbsd-7-1-RELEASE:1.9
	netbsd-7-1-RC2:1.9
	netbsd-7-nhusb-base-20170116:1.9
	bouyer-socketcan:1.13.0.2
	bouyer-socketcan-base:1.13
	pgoyette-localcount-20170107:1.13
	netbsd-7-1-RC1:1.9
	pgoyette-localcount-20161104:1.11
	netbsd-7-0-2-RELEASE:1.9
	localcount-20160914:1.10
	netbsd-7-nhusb:1.9.0.10
	netbsd-7-nhusb-base:1.9
	pgoyette-localcount-20160806:1.9
	pgoyette-localcount-20160726:1.9
	pgoyette-localcount:1.9.0.8
	pgoyette-localcount-base:1.9
	netbsd-7-0-1-RELEASE:1.9
	netbsd-7-0:1.9.0.6
	netbsd-7-0-RELEASE:1.9
	netbsd-7-0-RC3:1.9
	netbsd-7-0-RC2:1.9
	netbsd-7-0-RC1:1.9
	netbsd-5-2-3-RELEASE:1.3.8.1
	netbsd-5-1-5-RELEASE:1.3.8.1
	netbsd-6-0-6-RELEASE:1.8
	netbsd-6-1-5-RELEASE:1.8
	netbsd-7:1.9.0.4
	netbsd-7-base:1.9
	yamt-pagecache-base9:1.9
	yamt-pagecache-tag8:1.8
	netbsd-6-1-4-RELEASE:1.8
	netbsd-6-0-5-RELEASE:1.8
	tls-earlyentropy:1.9.0.2
	tls-earlyentropy-base:1.9
	riastradh-xf86-video-intel-2-7-1-pre-2-21-15:1.9
	riastradh-drm2-base3:1.9
	netbsd-6-1-3-RELEASE:1.8
	netbsd-6-0-4-RELEASE:1.8
	netbsd-5-2-2-RELEASE:1.3.8.1
	netbsd-5-1-4-RELEASE:1.3.8.1
	netbsd-6-1-2-RELEASE:1.8
	netbsd-6-0-3-RELEASE:1.8
	netbsd-5-2-1-RELEASE:1.3.8.1
	netbsd-5-1-3-RELEASE:1.3.8.1
	netbsd-6-1-1-RELEASE:1.8
	riastradh-drm2-base2:1.8
	riastradh-drm2-base1:1.8
	riastradh-drm2:1.8.0.14
	riastradh-drm2-base:1.8
	netbsd-6-1:1.8.0.18
	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.16
	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.1.0.6
	netbsd-6-0-1-RELEASE:1.8
	yamt-pagecache-base7:1.8
	netbsd-5-2-RELEASE:1.3.8.1
	netbsd-5-2-RC1:1.3.8.1
	matt-nb6-plus-nbase:1.8
	yamt-pagecache-base6:1.8
	netbsd-6-0:1.8.0.12
	netbsd-6-0-RELEASE:1.8
	netbsd-6-0-RC2:1.8
	tls-maxphys:1.8.0.10
	tls-maxphys-base:1.9
	matt-nb6-plus:1.8.0.8
	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.6
	netbsd-6-base:1.8
	netbsd-5-1-2-RELEASE:1.3.8.1
	netbsd-5-1-1-RELEASE:1.3.8.1
	yamt-pagecache-base3:1.8
	yamt-pagecache-base2:1.8
	yamt-pagecache:1.8.0.4
	yamt-pagecache-base:1.8
	cherry-xenmp:1.8.0.2
	cherry-xenmp-base:1.8
	bouyer-quota2-nbase:1.8
	bouyer-quota2:1.7.0.2
	bouyer-quota2-base:1.7
	matt-mips64-premerge-20101231:1.7
	matt-nb5-mips64-premerge-20101231:1.3.14.1
	matt-nb5-pq3:1.3.8.1.0.4
	matt-nb5-pq3-base:1.3.8.1
	pre-xorg-192:1.5
	netbsd-5-1:1.3.8.1.0.2
	netbsd-5-1-RELEASE:1.3.8.1
	netbsd-5-1-RC4:1.3.8.1
	matt-nb5-mips64-k15:1.3.14.1
	netbsd-5-1-RC3:1.3.8.1
	netbsd-5-1-RC2:1.3.8.1
	netbsd-5-1-RC1:1.3.8.1
	netbsd-5-0-2-RELEASE:1.3
	matt-nb5-mips64-premerge-20091211:1.3
	matt-premerge-20091211:1.5
	matt-nb5-mips64-u2-k2-k4-k7-k8-k9:1.3
	matt-nb4-mips64-k7-u2a-k9b:1.3
	matt-nb5-mips64-u1-k1-k5:1.3
	matt-nb5-mips64:1.3.0.14
	netbsd-5-0-1-RELEASE:1.3
	jym-xensuspend-nbase:1.4
	netbsd-5-0:1.3.0.12
	netbsd-5-0-RELEASE:1.3
	netbsd-5-0-RC4:1.3
	netbsd-5-0-RC3:1.3
	netbsd-5-0-RC2:1.3
	jym-xensuspend:1.3.0.10
	jym-xensuspend-base:1.4
	netbsd-5-0-RC1:1.3
	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.13
date	2016.11.22.10.34.57;	author snj;	state dead;
branches;
next	1.12;
commitid	q7B2LidviPbZY6vz;

1.12
date	2016.11.22.06.51.14;	author snj;	state Exp;
branches;
next	1.11;
commitid	LLHmtGFa7BRoK5vz;

1.11
date	2016.10.08.20.08.57;	author mrg;	state Exp;
branches;
next	1.10;
commitid	iFcxVQZlV1TOBnpz;

1.10
date	2016.08.11.08.32.43;	author mrg;	state Exp;
branches;
next	1.9;
commitid	8krHm1L1UVyjzRhz;

1.9
date	2014.01.16.01.15.33;	author christos;	state Exp;
branches
	1.9.8.1;
next	1.8;
commitid	eohV5AOa1lR3mhlx;

1.8
date	2011.02.21.04.42.17;	author mrg;	state Exp;
branches
	1.8.4.1
	1.8.10.1;
next	1.7;

1.7
date	2010.11.29.09.34.41;	author skrll;	state Exp;
branches
	1.7.2.1;
next	1.6;

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

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

1.4
date	2009.02.14.13.32.13;	author abs;	state Exp;
branches;
next	1.3;

1.3
date	2008.08.24.13.47.05;	author rtr;	state Exp;
branches
	1.3.2.1
	1.3.6.1
	1.3.8.1
	1.3.10.1
	1.3.14.1;
next	1.2;

1.2
date	2008.08.15.15.55.06;	author rtr;	state Exp;
branches;
next	1.1;

1.1
date	2008.08.09.01.16.39;	author rtr;	state Exp;
branches;
next	;

1.9.8.1
date	2016.11.04.14.48.49;	author pgoyette;	state Exp;
branches;
next	1.9.8.2;
commitid	2m1JRwYmpwPkOOsz;

1.9.8.2
date	2017.01.07.08.56.01;	author pgoyette;	state dead;
branches;
next	;
commitid	uEL0C1YuiJrlV0Bz;

1.8.4.1
date	2014.05.22.14.09.47;	author yamt;	state Exp;
branches;
next	;
commitid	FFQX08bYGKywAxBx;

1.8.10.1
date	2014.08.20.00.00.15;	author tls;	state Exp;
branches;
next	;
commitid	jTnpym9Qu0o4R1Nx;

1.7.2.1
date	2011.03.05.15.09.12;	author bouyer;	state Exp;
branches;
next	;

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

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

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

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

1.3.8.1
date	2009.09.17.04.24.40;	author snj;	state Exp;
branches;
next	;

1.3.10.1
date	2009.05.13.18.53.29;	author jym;	state Exp;
branches;
next	;

1.3.14.1
date	2010.04.21.05.24.45;	author matt;	state Exp;
branches;
next	;


desc
@@


1.13
log
@follow upstream change from 2009: build xf86Init.c with the rest of the
common code.

remove not-reproducible-build-friendly goop that set a build date for
the the x server.  the static date (which we've already been using) in
xf86Build.h does just fine, although all it really does is add one
useless line to the X log.

fix whitespace around OSVENDOR
@
text
@#	$NetBSD: Makefile,v 1.12 2016/11/22 06:51:14 snj Exp $

.include <bsd.own.mk>

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

LIB=	init

.PATH:	${X11SRCDIR.xorg-server}/hw/xfree86/common
SRCS=	xf86Init.c

CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/hw/xfree86/common \
		-I${X11SRCDIR.xorg-server}/hw/xfree86/os-support \
		-I${X11SRCDIR.xorg-server}/hw/xfree86/os-support/bus \
                -I${X11SRCDIR.xorg-server}/mfb \
                -I${X11SRCDIR.xorg-server}/mi \
		-I${X11SRCDIR.xorg-server}/include \
		-I${X11SRCDIR.xorg-server}/os \
		-I${X11SRCDIR.xorg-server}/Xext \
		-I${DESTDIR}${X11INCDIR}/X11 \
		-I${DESTDIR}${X11INCDIR}/X11/extensions \
		-I${DESTDIR}${X11INCDIR}/pixman-1 \
		-I${DESTDIR}${X11INCDIR}/xorg \
                -I${X11SRCDIR.xorg-server}/Xi \
                -I${X11SRCDIR.xorg-server}/hw/xfree86/ddc \
		-I${X11SRCDIR.xorg-server}/hw/xfree86/i2c \
		-I${X11SRCDIR.xorg-server}/hw/xfree86 \
                -I${X11SRCDIR.xorg-server}/hw/xfree86/parser \
                -I${X11SRCDIR.xorg-server}/hw/xfree86/loader \
		-I${X11SRCDIR.xorg-server}/hw/xfree86/vgahw \
		-I${X11SRCDIR.xorg-server}/hw/xfree86/rac \
		-I${X11SRCDIR.xorg-server}/hw/xfree86/scanpci \
		-I${X11SRCDIR.xorg-server}/hw/xfree86/vbe \
		-I${X11SRCDIR.xorg-server}/hw/xfree86/int10 \
		-I${X11SRCDIR.xorg-server}/render \
		-I${X11SRCDIR.xorg-server}/randr \
		-I${X11SRCDIR.xorg-server}/../include \
		-I.

CPPFLAGS+=	${X11FLAGS.EXTENSION} ${X11FLAGS.OS_DEFINES} \
		${X11FLAGS.DIX} \
		-DWSCONS_SUPPORT -D__XKBDEFRULES__='"xorg"' \
		-D__XSERVERNAME__='"Xorg"' -D__XCONFIGFILE__='"xorg.conf"' \
		-D__VENDORDWEBSUPPORT__='"http://wiki.X.Org"' \
		-DXVENDORNAME='"The X.Org Foundation"' \
		-DHAVE_XORG_CONFIG_H

.if ${MACHINE_ARCH} == "i386"
CPPFLAGS+=	-DPCCONS_SUPPORT -DPCVT_SUPPORT
.endif

.if ${MACHINE} == "cats" || ${MACHINE} == "ofppc"
CPPFLAGS+=	-DPCVT_SUPPORT
.endif

CPPFLAGS.xf86Init.c=	-DOSNAME='"NetBSD/${MACHINE} ${OS_RELEASE} -"' \
			-DBUILDERADDR='"xorg@@xorg.org"' \
			-DDEFAULT_MODULE_PATH=\"${X11USRLIBDIR}/modules\" \
			-DDEFAULT_LIBRARY_PATH=\"${X11USRLIBDIR}\"

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


1.12
log
@remove another outdated and unused XORG_RELEASE define
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.11 2016/10/08 20:08:57 mrg Exp $
@


1.11
log
@set XFree86LOADER for all xorg-server driver builds again,
it's still needed for many drivers and would normally be
set in xorg-server.h.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.10 2016/08/11 08:32:43 mrg Exp $
a57 1
			-DXORG_RELEASE='"Release 1.4.2"' \
@


1.10
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.9 2014/01/16 01:15:33 christos Exp $
d43 1
a43 1
		-DXFree86LOADER -DWSCONS_SUPPORT -D__XKBDEFRULES__='"xorg"' \
@


1.9
log
@eliminate use of bsd.sys.mk from Makefiles
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.8 2011/02/21 04:42:17 mrg Exp $
a26 1
		-I${X11SRCDIR.xorg-server}/hw/xfree86/dixmods/extmod \
@


1.9.8.1
log
@Sync with HEAD
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.11 2016/10/08 20:08:57 mrg Exp $
d44 1
a44 1
		-DWSCONS_SUPPORT -D__XKBDEFRULES__='"xorg"' \
@


1.9.8.2
log
@Sync with HEAD.  (Note that most of these changes are simply $NetBSD$
tag issues.)
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.9.8.1 2016/11/04 14:48:49 pgoyette Exp $
@


1.8
log
@define PCVT_SUPPORT ofppc anywhere other ppc platforms do.
part of the way to getting xorg working on ofppc.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.7 2010/11/29 09:34:41 skrll Exp $
d3 1
a3 1
.include <bsd.sys.mk> # for HOST_SH
@


1.8.10.1
log
@Rebase to HEAD as of a few days ago.
@
text
@d1 1
a1 1
#	$NetBSD$
d3 1
a3 1
.include <bsd.own.mk>
@


1.8.4.1
log
@sync with head.

for a reference, the tree before this commit was tagged
as yamt-pagecache-tag8.

this commit was splitted into small chunks to avoid
a limitation of cvs.  ("Protocol error: too many arguments")
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.8 2011/02/21 04:42:17 mrg Exp $
d3 1
a3 1
.include <bsd.own.mk>
@


1.7
log
@Define PCVT_SUPPORT for cats.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.6 2010/11/23 08:22:33 mrg Exp $
d54 1
a54 1
.if ${MACHINE} == "cats"
@


1.7.2.1
log
@Sync with HEAD
@
text
@d1 1
a1 1
#	$NetBSD$
d54 1
a54 1
.if ${MACHINE} == "cats" || ${MACHINE} == "ofppc"
@


1.6
log
@many build updates and fixes for xorg-server 1.9.2.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.5 2009/06/12 01:59:06 mrg Exp $
d54 4
@


1.5
log
@build updates for xorg-server 1.6.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.4 2009/02/14 13:32:13 abs Exp $
d47 2
a48 1
		-DXVENDORNAME='"The X.Org Foundation"'
@


1.4
log
@Use MACHINE_ARCH rather than MACHINE where relevant. At least one file had a nice mixture of amd64 and x86_64 tests...
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.3 2008/08/24 13:47:05 rtr Exp $
d39 1
@


1.3
log
@use XORG_VERSION_CURRENT defined in Makefile.serverlib instead of
defining it all over the shop
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.2 2008/08/15 15:55:06 rtr Exp $
d48 1
a48 1
.if ${MACHINE} == "i386"
@


1.3.14.1
log
@sync to netbsd-5
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.3.8.1 2009/09/17 04:24:40 snj Exp $
a38 1
		-I${X11SRCDIR.xorg-server}/../include \
d48 1
a48 1
.if ${MACHINE_ARCH} == "i386"
@


1.3.8.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.5 2009/06/12 01:59:06 mrg Exp $
a38 1
		-I${X11SRCDIR.xorg-server}/../include \
d48 1
a48 1
.if ${MACHINE_ARCH} == "i386"
@


1.3.10.1
log
@Sync with HEAD.

Second commit. See http://mail-index.netbsd.org/source-changes/2009/05/13/msg221222.html
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.4 2009/02/14 13:32:13 abs Exp $
d48 1
a48 1
.if ${MACHINE_ARCH} == "i386"
@


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


1.3.6.2
log
@Sync with HEAD.
@
text
@a0 59
#	$NetBSD: Makefile,v 1.3 2008/08/24 13:47:05 rtr Exp $

.include <bsd.sys.mk> # for HOST_SH

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

LIB=	init

.PATH:	${X11SRCDIR.xorg-server}/hw/xfree86/common
SRCS=	xf86Init.c

CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/hw/xfree86/common \
		-I${X11SRCDIR.xorg-server}/hw/xfree86/os-support \
		-I${X11SRCDIR.xorg-server}/hw/xfree86/os-support/bus \
                -I${X11SRCDIR.xorg-server}/mfb \
                -I${X11SRCDIR.xorg-server}/mi \
		-I${X11SRCDIR.xorg-server}/include \
		-I${X11SRCDIR.xorg-server}/os \
		-I${X11SRCDIR.xorg-server}/Xext \
		-I${DESTDIR}${X11INCDIR}/X11 \
		-I${DESTDIR}${X11INCDIR}/X11/extensions \
		-I${DESTDIR}${X11INCDIR}/pixman-1 \
		-I${DESTDIR}${X11INCDIR}/xorg \
                -I${X11SRCDIR.xorg-server}/Xi \
                -I${X11SRCDIR.xorg-server}/hw/xfree86/ddc \
		-I${X11SRCDIR.xorg-server}/hw/xfree86/dixmods/extmod \
		-I${X11SRCDIR.xorg-server}/hw/xfree86/i2c \
		-I${X11SRCDIR.xorg-server}/hw/xfree86 \
                -I${X11SRCDIR.xorg-server}/hw/xfree86/parser \
                -I${X11SRCDIR.xorg-server}/hw/xfree86/loader \
		-I${X11SRCDIR.xorg-server}/hw/xfree86/vgahw \
		-I${X11SRCDIR.xorg-server}/hw/xfree86/rac \
		-I${X11SRCDIR.xorg-server}/hw/xfree86/scanpci \
		-I${X11SRCDIR.xorg-server}/hw/xfree86/vbe \
		-I${X11SRCDIR.xorg-server}/hw/xfree86/int10 \
		-I${X11SRCDIR.xorg-server}/render \
		-I${X11SRCDIR.xorg-server}/randr \
		-I.

CPPFLAGS+=	${X11FLAGS.EXTENSION} ${X11FLAGS.OS_DEFINES} \
		${X11FLAGS.DIX} \
		-DXFree86LOADER -DWSCONS_SUPPORT -D__XKBDEFRULES__='"xorg"' \
		-D__XSERVERNAME__='"Xorg"' -D__XCONFIGFILE__='"xorg.conf"' \
		-D__VENDORDWEBSUPPORT__='"http://wiki.X.Org"' \
		-DXVENDORNAME='"The X.Org Foundation"'

.if ${MACHINE} == "i386"
CPPFLAGS+=	-DPCCONS_SUPPORT -DPCVT_SUPPORT
.endif

CPPFLAGS.xf86Init.c=	-DOSNAME='"NetBSD/${MACHINE} ${OS_RELEASE} -"' \
			-DXORG_RELEASE='"Release 1.4.2"' \
			-DBUILDERADDR='"xorg@@xorg.org"' \
			-DDEFAULT_MODULE_PATH=\"${X11USRLIBDIR}/modules\" \
			-DDEFAULT_LIBRARY_PATH=\"${X11USRLIBDIR}\"

.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:46 +0000
@
text
@d1 59
@


1.3.2.2
log
@Sync with wrstuden-revivesa-base-2.
@
text
@a0 59
#	$NetBSD: Makefile,v 1.3 2008/08/24 13:47:05 rtr Exp $

.include <bsd.sys.mk> # for HOST_SH

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

LIB=	init

.PATH:	${X11SRCDIR.xorg-server}/hw/xfree86/common
SRCS=	xf86Init.c

CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/hw/xfree86/common \
		-I${X11SRCDIR.xorg-server}/hw/xfree86/os-support \
		-I${X11SRCDIR.xorg-server}/hw/xfree86/os-support/bus \
                -I${X11SRCDIR.xorg-server}/mfb \
                -I${X11SRCDIR.xorg-server}/mi \
		-I${X11SRCDIR.xorg-server}/include \
		-I${X11SRCDIR.xorg-server}/os \
		-I${X11SRCDIR.xorg-server}/Xext \
		-I${DESTDIR}${X11INCDIR}/X11 \
		-I${DESTDIR}${X11INCDIR}/X11/extensions \
		-I${DESTDIR}${X11INCDIR}/pixman-1 \
		-I${DESTDIR}${X11INCDIR}/xorg \
                -I${X11SRCDIR.xorg-server}/Xi \
                -I${X11SRCDIR.xorg-server}/hw/xfree86/ddc \
		-I${X11SRCDIR.xorg-server}/hw/xfree86/dixmods/extmod \
		-I${X11SRCDIR.xorg-server}/hw/xfree86/i2c \
		-I${X11SRCDIR.xorg-server}/hw/xfree86 \
                -I${X11SRCDIR.xorg-server}/hw/xfree86/parser \
                -I${X11SRCDIR.xorg-server}/hw/xfree86/loader \
		-I${X11SRCDIR.xorg-server}/hw/xfree86/vgahw \
		-I${X11SRCDIR.xorg-server}/hw/xfree86/rac \
		-I${X11SRCDIR.xorg-server}/hw/xfree86/scanpci \
		-I${X11SRCDIR.xorg-server}/hw/xfree86/vbe \
		-I${X11SRCDIR.xorg-server}/hw/xfree86/int10 \
		-I${X11SRCDIR.xorg-server}/render \
		-I${X11SRCDIR.xorg-server}/randr \
		-I.

CPPFLAGS+=	${X11FLAGS.EXTENSION} ${X11FLAGS.OS_DEFINES} \
		${X11FLAGS.DIX} \
		-DXFree86LOADER -DWSCONS_SUPPORT -D__XKBDEFRULES__='"xorg"' \
		-D__XSERVERNAME__='"Xorg"' -D__XCONFIGFILE__='"xorg.conf"' \
		-D__VENDORDWEBSUPPORT__='"http://wiki.X.Org"' \
		-DXVENDORNAME='"The X.Org Foundation"'

.if ${MACHINE} == "i386"
CPPFLAGS+=	-DPCCONS_SUPPORT -DPCVT_SUPPORT
.endif

CPPFLAGS.xf86Init.c=	-DOSNAME='"NetBSD/${MACHINE} ${OS_RELEASE} -"' \
			-DXORG_RELEASE='"Release 1.4.2"' \
			-DBUILDERADDR='"xorg@@xorg.org"' \
			-DDEFAULT_MODULE_PATH=\"${X11USRLIBDIR}/modules\" \
			-DDEFAULT_LIBRARY_PATH=\"${X11USRLIBDIR}\"

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


1.2
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.1 2008/08/09 01:16:39 rtr Exp $
d46 1
a46 2
		-DXVENDORNAME='"The X.Org Foundation"' \
		-DXORG_VERSION_CURRENT=${XORG_VERSION_CURRENT}
@


1.1
log
@add some more libs we need for linking and running Xorg server
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.1 2008/08/05 04:50:18 mrg Exp $
d39 1
a39 2
		-I. \
		-I${XSERVERINCDIR}
@