head	1.9;
access;
symbols
	trunk-20040613:1.9
	mach64-last-merge:1.9
	driinterface-0-0-3-20040303-merge:1.9
	driinterface-0-0-3-20040303-premerge:1.9
	driinterface-0-0-3-20040303:1.9
	driinterface-0-0-3-branch:1.9.0.82
	mach64-0-0-7-branch:1.9.0.80
	driinterface-0-0-2-branch:1.9.0.78
	newmesa-0-0-1-20031209-merge:1.9
	trunk-20031209:1.9
	newmesa-0-0-1-20031209:1.9
	newmesa-0-0-1-branch:1.9.0.76
	driinterface-0-0-1-branch:1.9.0.74
	savage-2-0-0-branch:1.9.0.72
	savage-2-0-0-fork:1.9
	dynamic-0-0-1-branch:1.9.0.70
	config-0-0-1-20031005-freeze:1.9
	savage-1_0_0-20031002-trunk-premerge:1.9
	cle266-0-0-1-branch:1.9.0.68
	i865-agp-0-1-20030929:1.9
	trunk-20030916:1.9
	XFree86-4_3_99_12-merge:1.9
	trunk-20030912:1.9
	i865-agp-0-1-20030905:1.9
	i865-agp-0-1-20030728:1.9
	i865-agp-0-1-20030707:1.9
	savage-1_0_0-branch:1.9.0.66
	newdrm-0-0-1-branch:1.9.0.64
	i865-agp-0-1-branch:1.9.0.62
	config-0-0-1-branch:1.9.0.60
	texmem-0-0-1-20030429-merge:1.9
	texmem-0-0-1-20030429-premerge:1.9
	texmem-0-0-1-20030407:1.9
	trident-0-0-2-branch:1.9.0.58
	mach64-0-0-6-20030330:1.9
	mach64-0-0-6-20030329-freeze:1.9
	texmem-0-0-1-20030328-freeze:1.9
	X_4_3_0-20030324-merge:1.1.1.9
	X_4_3_0-20020324-preimport:1.9
	drm-filp-0-1-branch:1.9.0.56
	mesa-4-0-4-20030222:1.9
	bsd-4-0-0-20030221-merge:1.9
	bsd-4-0-0-20030220:1.9
	bsd-4-0-0-20030220-freeze:1.9
	mesa-4-0-4-20030216:1.9
	mach64-0-0-6-branch:1.9.0.54
	mesa-4-0-4-20030208:1.9
	texmem-0-0-1-20030204-trunk-merge:1.9
	texmem-0-0-1-20030204-trunk-premerge:1.9
	mesa-4-0-4-20030203:1.9
	mesa-4-0-4-20030129:1.9
	texmem-0-0-1-20030125-trunk-merge:1.9
	texmem-0-0-1-20030123-trunk-premerge:1.9
	mesa-4-0-4-20030114:1.9
	agpgart_2_0_branch:1.9.0.52
	mesa-4-0-4-20021220:1.9
	mesa-4-0-4-20021216:1.9
	mesa-4-0-4-20021215:1.9
	mesa-4-0-4-20021214:1.9
	mesa-4-0-4-branch:1.9.0.50
	dmx-1-0-20021129-final:1.9
	texmem-0-0-1-20021127-mesa-4-1-merge:1.9
	trunk-20021125:1.9
	dmx-1-0-20021115-beta:1.9
	bsd-4-0-0-branch:1.9.0.48
	nv-0-0-1-branch:1.9.0.46
	savage-0-0-1-branch:1.9.0.44
	stable-1-0-branch:1.9.0.42
	r200-stable-1-0-20021028:1.9
	dmx-1-0-20021025-alpha:1.9
	X_4_2_99_2-20021023-merge:1.9
	X_4_2_99_2:1.1.1.9
	trunk-20021022:1.9
	r200-stable-1-0-branch:1.9.0.40
	mesa-4-1-branch:1.9.0.38
	texmem-0-0-1:1.9.0.36
	trunk-20021002:1.9
	dmx-1-0-20020926-final:1.9
	dmx-1-0-20020830-beta:1.9
	r200-0-2-branch:1.9.0.34
	r200-0-1-20020822-merge:1.9
	r200-0-1-20020822:1.9
	r200-0-1-20020826-freeze:1.9
	xv845g-0-1-branch:1.9.0.32
	xv845g-0-1-bp:1.9
	GEODE-BASE-DRIVER:1.9
	geode-0-0-1-branch:1.9.0.30
	tdlabs-0-0-1-branch:1.9.0.28
	reinit-0-0-1-branch:1.9.0.26
	dmx-1-0-20020719-alpha:1.9
	r200-0-1-20020715:1.9
	r200-0-1-20020714-freeze:1.9
	bsd-3-0-0-20020705-merge:1.9
	bsd-3-0-0-freeze:1.9
	trunk-20020705:1.9
	bsd-3-0-0-20020705:1.9
	trunk-20020703:1.9
	mach64-0-0-5-branch:1.9.0.22
	trunk-20020626:1.9
	trunk-20020617:1.9
	tcl-0-0-20020612-merge:1.9
	tcl-0-0-20020612:1.9
	tcl-0-0-20020612-freeze:1.9
	r200-0-1-branch:1.9.0.24
	dmx-1-0-20020604-phase1:1.9
	dmx-1-0-20020603-base:1.9
	dmx-1-0-branch:1.9.0.20
	dmx-0-1-20020531-final:1.8
	mach64-0-0-4-dma-branch:1.9.0.18
	dmx-0-1-20020419-beta:1.8
	mach64-0-0-4-branch:1.9.0.16
	drmcommand-0-0-1-20020409-merge:1.9
	drmcommand-0-0-1-20020409:1.9
	drmcommand-0-0-1-20020409-freeze:1.9
	trunk-20020328:1.9
	s3virge-0-0-1-branch:1.9.0.14
	drmcommand-0-0-1-branch:1.9.0.12
	trident-0-0-1-branch:1.9.0.10
	mach64-0-0-3-dma-branch:1.9.0.8
	bsd-3-0-0-branch:1.9.0.6
	dmx-0-1-20020228-alpha:1.8
	mach64-0-0-3-branch:1.9.0.4
	trunk-20020221:1.9
	tcl-0-0-branch:1.9.0.2
	mesa-4-0-20020214-merge:1.9
	mesa-4-0-20020214:1.8.2.1
	mesa-4-0-20020213:1.8.2.1
	mesa-4-0-20020211-freeze:1.8
	X_4_2_0-20020128-merge:1.9
	X_4_2_0:1.1.1.9
	X_4_2_0-20020127-preimport:1.8
	X_4_2_0-20020123-preimport:1.8
	dmx-0-1-20020112:1.8
	dmx-0-1-20011128-snapshot:1.8
	dmx-0-1-20011115:1.8
	dmx-0-1-branch:1.8.0.6
	mach64-0-0-2-branch:1.8.0.4
	mesa-4-0-branch:1.8.0.2
	X_4_1_99_1-20010822-merge:1.7
	X_4_1_99_1:1.1.1.8
	X_4_1_99_1-20010822-preimport:1.7
	multihead-1-0-0-20010730:1.6.6.1
	multihead-1-0-0-20010730-merge:1.7
	multihead-1-0-0-20010727-freeze:1.6
	X_4_1_0-20010615-merge:1.7
	mesa-3-5-20010621-freeze:1.5.36.1
	X_4_1_0:1.1.1.8
	X_4_1_0-20010614-preimport:1.6
	multihead-1-0-0-branch:1.6.0.6
	X_4_0_99_3-20010502-merge:1.6
	X_4_0_99_3:1.1.1.7
	X_4_0_99_3-20010501-preimport:1.6
	bsd-2-0-0-branch:1.6.0.4
	X_4_0_99_2-20010410-merge:1.6
	X_4_0_99_2:1.1.1.7
	X_4_0_99_2-20010409-preimport:1.6
	ati-pcigart-1-0-0-20010405-merge:1.6
	ati-pcigart-1-0-0-20010405:1.6
	ati-pcigart-1-0-0-20010405-freeze:1.6
	ati-pcigart-1-0-0-branch:1.6.0.2
	mesa-3-5-20010323-freeze:1.5
	X_4_0_99_1-20010321-merge:1.6
	X_4_0_99_1:1.1.1.7
	X_4_0_99_1-20010319-preimport:1.5
	full-1-0-0-20010315-head:1.5
	sarea-1-0-0-20010314-merge:1.5
	sarea-1-0-0-20010314:1.5
	full-1-0-0-branch:1.5
	sarea-1-0-0-20010307:1.5
	sarea-1-0-0-20010307-freeze:1.5
	tdfx-3-1-0-20010306-merge:1.5
	tdfx-3-1-0-20010306-freeze:1.5
	tdfx-3-1-0-20010306:1.5
	tdfx-3-1-0-20010305-merge:1.5
	tdfx-3-1-0-20010305-freeze2:1.5
	tdfx-3-1-0-20010305-freeze:1.5
	tdfx-3-1-0-20010301-freeze:1.5
	ati-pcigart-0-0-1-branch-02282001-freeze:1.5
	ati-5-0-1-20010220-head:1.5
	ati-5-0-1-branch:1.5.0.44
	sarea-1-0-0-branch:1.5.0.42
	mga-1-0-0-20010215-merge:1.5
	mga-1-0-0-20010215-freeze:1.5
	tdfx-3-1-0-branch:1.5.0.40
	tdfx-3-0-1-branch:1.5
	ati-pcigart-0-0-1-branch:1.5.0.38
	mesa-3-5-branch:1.5.0.36
	tdfx-3-0-0-20010109-merge:1.5
	tdfx-3-0-0-20010108:1.5
	ati-5-0-0-20010105-merge:1.5
	ati-5-0-0-20010105:1.5
	ati-5-0-0-20000104-freeze:1.5
	tdfx-3-0-0-20010104-freeze:1.5
	ati-5-0-0-20001223-merge:1.5
	ati-5-0-0-20001223-freeze:1.5
	X_4_0_2-20001221-merge:1.5
	X_4_0_2:1.1.1.6
	mga-1-0-0-branch:1.5.0.34
	X_4_0_1h-20001207-merge:1.5
	X_4_0_1h-20001205-merge:1.5
	X_4_0_1h:1.1.1.6
	ati-4-1-1-20001202-merge-trunk:1.5
	sse-1-0-1-branch:1.5.0.32
	ati-4-1-1-20001202-merge:1.5
	tdfx-3-0-0-20001201:1.5
	ati-4-1-1-20001201-freeze:1.5
	tdfx-3-0-0-20001201-freeze:1.5
	X_4_0_1g-20001130-merge:1.5
	X_4_0_1g:1.1.1.6
	X_4_0_1f-20001130-merge:1.5
	X_4_0_1f:1.1.1.6
	ati-4-1-1-20001125-freeze:1.5
	mach64-0-0-1-branch:1.5.0.30
	ati-5-0-0-branch:1.5.0.28
	X_4_0_1e-20001107-merge:1.5
	X_4_0_1e:1.1.1.6
	X_4_0_1d-20001107-merge:1.5
	X_4_0_1d:1.1.1.6
	ppc-1-0-1-branch:1.5.0.26
	radeon-1-0-0-20001017:1.5
	full-0-0-2-branch:1.5.0.24
	full-0-0-1-branch:1.5.0.22
	ati-4-1-1-20001009-freeze:1.5
	mga-readpix-0-0-1-branch:1.5.0.20
	tdfx-3-0-0-branch:1.5.0.18
	X_4_0_1d-pre:1.1.1.6
	ati-4-1-1-20000919-stable:1.5
	radeon-1-0-0-branch:1.5.0.16
	ppc-1-0-0-20000912:1.4.6.1
	mga-lock-debug-0-2-0-branch:1.5.0.14
	sse-1-0-0-branch:1.5.0.12
	mga-lock-debug-0-0-1-branch:1.5.0.10
	gamma-2-0-0-branch:1.5.0.8
	tdfx-2-1-20000907-merge:1.5
	tdfx-2-1-20000906:1.3.2.2
	tdfx-2-1-20000905-freeze:1.3.2.1
	ppc-1-0-0-2000-09-01-freeze:1.4
	m3-0-0-1-branch:1.5.0.6
	mach64-0-0-0-branch:1.5.0.4
	ati-4-1-1-branch:1.5.0.2
	X_4_0_1b-20000816-merge:1.5
	X_4_0_1b:1.1.1.4
	ati-4-0-2-branch:1.4.0.8
	ppc-1-0-0-branch:1.4.0.6
	tdfx-2-1-20000711:1.3.2.1
	tdfx-2-1-20000711-freeze:1.3
	X_4_0_1-20000711-merge:1.4.0.4
	xc_4_0_1-20000711-merge:1.4.0.2
	X_4_0_1:1.1.1.3
	tdfx-2-1-branch:1.3.0.2
	pre401-20000613-freeze:1.3
	bsd-1-0-1-20000613-merge:1.2
	bsd-1-0-1-20000613:1.1.1.2
	bsd-1-0-1-20000612-freeze:1.1.1.2
	tdfx-2-0-20000612-merge:1.1.1.2
	ati-4-1-0-20000613-merge:1.1.1.2
	ati-4-1-0-20000613:1.1.1.2
	tdfx-2-0-20000608-merge:1.1.1.2
	tdfx-2-0-20000608-freeze:1.1.1.2
	ati-4-1-0-branch:1.1.1.2.0.28
	glxmisc-3-0-0-20000608-merge:1.1.1.2
	glxmisc-3-0-0-20000607:1.1.1.2
	glxmisc-3-0-0-20000606-freeze:1.1.1.2
	bsd-1-0-1-branch:1.1.1.2.0.26
	bsd-1-0-0-20000531-merge:1.1.1.2
	bsd-1-0-0-20000530-merge:1.1.1.2
	bsd-1-0-0-20000530-freeze:1.1.1.2
	tdfx-2-0-20000222-merge:1.1.1.2
	tdfx-2-0-20000222-freeze:1.1.1.2
	ati-4-0-1-20000518-merge:1.1.1.2
	ati-4-0-1-20000518:1.1.1.2
	video-1-0-0-branch:1.1.1.2.0.24
	gamma-1-0-0-branch:1.1.1.2.0.22
	mgadh-0-0-3-branch:1.1.1.2.0.20
	glxmisc-3-0-0-branch:1.1.1.2.0.18
	glxmisc-2-0-0-20000503-merge:1.1.1.2
	bsd-1-0-0-branch:1.1.1.2.0.16
	glxmisc-2-0-0-20000503:1.1.1.2
	glxmisc-2-0-0-branch:1.1.1.2.0.14
	tdfx-2-0-branch:1.1.1.2.0.12
	tdfx-2-0-trunk:1.1.1.2
	glxmisc-1-0-0-20000420-merge:1.1.1.2
	glxmisc-1-0-0-20000420:1.1.1.2
	ati-4-0-1-beta:1.1.1.2
	glxmisc-1-0-0-branch:1.1.1.2.0.10
	mga-0-0-3-branch:1.1.1.2.0.8
	mga-0-0-2-20000404-merge:1.1.1.2
	ati-4-0-1-alpha:1.1.1.2
	ati-4-0-1-20000319-base:1.1.1.2
	ati-4-0-1-branch:1.1.1.2.0.6
	ati-4-0-0-20000319:1.1.1.1
	X_4_0-20000315-merge:1.1.1.2
	X_4_0:1.1.1.2
	freeze-20000226:1.1.1.2
	dispatch-0-0-3-20000225-merge:1.1.1.2
	dispatch-0-0-3-20000225:1.1.1.1
	mga-0-0-1-20000225-merge:1.1.1.1
	mga-0-0-2-branch:1.1.1.2.0.4
	smt-0-0-2-branch:1.1.1.2.0.2
	smt-0-0-1-20000222-freeze:1.1.1.1
	X_3_9_18-20000222-merge:1.1.1.2
	X_3_9_18:1.1.1.2
	smt-0-0-1-stage2c:1.1.1.1
	smt-0-0-1-stage2b:1.1.1.1.0.16
	dispatch-0-0-3-branch:1.1.1.1.0.14
	i810-20000214-beta2:1.1.1.1
	dispatch-0-0-2-20000212:1.1.1.1
	dispatch-0-0-2-branch:1.1.1.1.0.12
	i810-20000201-beta1:1.1.1.1
	dispatch-0-0-1-20000129-merge:1.1.1.1
	dispatch-0-0-1-20000128:1.1.1.1
	smt-0-0-1-20000112-base:1.1.1.1
	smt-0-0-1-branch:1.1.1.1.0.6
	dispatch-0-0-1-branch:1.1.1.1.0.10
	tdfx-1-1:1.1.1.1.0.4
	X_3_9_17:1.1.1.1
	ati-4-0-0-branch:1.1.1.1.0.8
	mga-0-0-1-branch:1.1.1.1.0.2
	X_3_9_16:1.1.1.1
	XFree:1.1.1;
locks; strict;
comment	@# @;


1.9
date	2002.01.27.20.05.21;	author dawes;	state Exp;
branches;
next	1.8;

1.8
date	2001.08.25.03.13.01;	author dawes;	state Exp;
branches
	1.8.2.1;
next	1.7;

1.7
date	2001.06.14.22.23.38;	author dawes;	state Exp;
branches;
next	1.6;

1.6
date	2001.03.19.21.38.53;	author dawes;	state Exp;
branches
	1.6.4.1
	1.6.6.1;
next	1.5;

1.5
date	2000.08.16.18.29.05;	author dawes;	state Exp;
branches
	1.5.36.1;
next	1.4;

1.4
date	2000.07.11.11.41.04;	author alanh;	state Exp;
branches
	1.4.6.1;
next	1.3;

1.3
date	2000.06.13.17.03.28;	author brianp;	state Exp;
branches
	1.3.2.1;
next	1.2;

1.2
date	2000.06.13.00.46.23;	author brianp;	state Exp;
branches;
next	1.1;

1.1
date	99.12.05.01.05.44;	author daryll;	state Exp;
branches
	1.1.1.1;
next	;

1.1.1.1
date	99.12.05.01.05.44;	author daryll;	state Exp;
branches;
next	1.1.1.2;

1.1.1.2
date	2000.02.22.15.39.15;	author kem;	state Exp;
branches;
next	1.1.1.3;

1.1.1.3
date	2000.07.10.20.49.36;	author alanh;	state Exp;
branches;
next	1.1.1.4;

1.1.1.4
date	2000.08.16.17.22.14;	author dawes;	state Exp;
branches;
next	1.1.1.5;

1.1.1.5
date	2000.09.22.17.14.58;	author alanh;	state Exp;
branches;
next	1.1.1.6;

1.1.1.6
date	2000.09.23.20.48.11;	author alanh;	state Exp;
branches;
next	1.1.1.7;

1.1.1.7
date	2001.03.19.17.45.15;	author dawes;	state Exp;
branches;
next	1.1.1.8;

1.1.1.8
date	2001.06.14.21.52.36;	author dawes;	state Exp;
branches;
next	1.1.1.9;

1.1.1.9
date	2002.01.27.18.21.36;	author dawes;	state Exp;
branches;
next	;

1.3.2.1
date	2000.07.11.19.36.06;	author daryll;	state Exp;
branches;
next	1.3.2.2;

1.3.2.2
date	2000.09.06.12.11.20;	author alanh;	state Exp;
branches;
next	;

1.4.6.1
date	2000.09.12.19.17.26;	author mdaenzer;	state Exp;
branches;
next	;

1.5.36.1
date	2001.03.27.20.01.38;	author gareth;	state Exp;
branches;
next	1.5.36.2;

1.5.36.2
date	2001.06.26.02.07.51;	author brianp;	state Exp;
branches;
next	;

1.6.4.1
date	2001.06.24.22.19.35;	author alanh;	state Exp;
branches;
next	1.6.4.2;

1.6.4.2
date	2001.08.29.17.24.47;	author alanh;	state Exp;
branches;
next	;

1.6.6.1
date	2001.07.30.14.29.29;	author dawes;	state Exp;
branches;
next	;

1.8.2.1
date	2002.02.12.00.31.55;	author dawes;	state Exp;
branches;
next	;


desc
@@


1.9
log
@First pass merge of XFree86 4.2.0 import.
@
text
@XCOMM $Xorg: Imakefile,v 1.3 2000/08/18 04:05:43 coskrey Exp $




XCOMM $XFree86: xc/include/Imakefile,v 3.29 2001/08/27 17:40:56 dawes Exp $
#define IHaveSubdirs
#define PassCDebugFlags /**/

#if BuildGlxExt || BuildGLXLibrary
GLXDIR = GL
#endif

#if BuildDPSLibrary
DPSDIR = DPS
#endif

SUBDIRS = bitmaps extensions fonts $(GLXDIR) $(DPSDIR)

#ifdef Win32Architecture
EXTRA_HEADERS = Xw32defs.h Xwinsock.h
#endif

HEADERS = DECkeysym.h \
	HPkeysym.h \
	Sunkeysym.h \
	X.h \
	XF86keysym.h \
	XWDFile.h \
	Xalloca.h \
	Xarch.h \
	Xatom.h \
	Xdefs.h \
	Xfuncproto.h \
	Xfuncs.h \
	Xmd.h \
	Xos.h \
	Xos_r.h \
	Xosdefs.h \
	Xpoll.h \
	Xproto.h \
	Xprotostr.h \
	Xthreads.h \
	ap_keysym.h \
	keysym.h \
	keysymdef.h \
	$(EXTRA_HEADERS)

all::

BuildIncludes($(HEADERS),X11,..)

#if BuildLibraries
InstallMultipleFlags($(HEADERS),$(INCDIR)/X11,$(INSTINCFLAGS))
#endif
MakeSubdirs($(SUBDIRS))
DependSubdirs($(SUBDIRS))

InstallDriverSDKNonExecFile(X.h,$(DRIVERSDKINCLUDEDIR))
InstallDriverSDKNonExecFile(Xalloca.h,$(DRIVERSDKINCLUDEDIR))
InstallDriverSDKNonExecFile(Xarch.h,$(DRIVERSDKINCLUDEDIR))
InstallDriverSDKNonExecFile(Xdefs.h,$(DRIVERSDKINCLUDEDIR))
InstallDriverSDKNonExecFile(Xdefs.h,$(DRIVERSDKINCLUDEDIR)/X11)
InstallDriverSDKNonExecFile(Xfuncproto.h,$(DRIVERSDKINCLUDEDIR))
InstallDriverSDKNonExecFile(Xfuncs.h,$(DRIVERSDKINCLUDEDIR))
InstallDriverSDKNonExecFile(Xmd.h,$(DRIVERSDKINCLUDEDIR))
InstallDriverSDKNonExecFile(Xosdefs.h,$(DRIVERSDKINCLUDEDIR))
InstallDriverSDKNonExecFile(Xproto.h,$(DRIVERSDKINCLUDEDIR))
InstallDriverSDKNonExecFile(Xprotostr.h,$(DRIVERSDKINCLUDEDIR))

XCOMM For the Linux/OpenGL base standard
#if LinkGLToUsrInclude && AlternateIncRoot
install::
	MakeDir($(DESTDIR)$(SYSTEMUSRINCDIR))
	-$(RM) $(DESTDIR)$(SYSTEMUSRINCDIR)/GL
	@@if [ ! -d $(DESTDIR)$(SYSTEMUSRINCDIR)/GL ]; then \
		set -x; $(LN) $(INCDIR)/GL $(DESTDIR)$(SYSTEMUSRINCDIR)/GL; \
	fi
#endif
@


1.8
log
@- Remove the rest of the unneeded client-side libraries.
- Use installed libraries that are not built here.
- Don't build/install client-library related file and headers.
@
text
@d6 1
a6 1
XCOMM $XFree86: xc/include/Imakefile,v 3.28 2001/04/28 23:52:31 dawes Exp $
@


1.8.2.1
log
@Initial merge of trunk into mesa-4-0 branch.
@
text
@d6 1
a6 1
XCOMM $XFree86: xc/include/Imakefile,v 3.29 2001/08/27 17:40:56 dawes Exp $
@


1.7
log
@First pass of 4.1.0 merge.
@
text
@d53 1
d55 1
@


1.6
log
@Initial XFree86 4.0.99.1 merge.
@
text
@d6 1
a6 1
XCOMM $XFree86: xc/include/Imakefile,v 3.27 2001/01/21 21:19:08 tsi Exp $
d10 1
a10 1
#if BuildGLXLibrary
@


1.6.6.1
log
@Merge from trunk.
@
text
@d6 1
a6 1
XCOMM $XFree86: xc/include/Imakefile,v 3.28 2001/04/28 23:52:31 dawes Exp $
d10 1
a10 1
#if BuildGlxExt || BuildGLXLibrary
@


1.6.4.1
log
@merge from trunk into bsd-2-0-0 branch (4.1.0)
@
text
@d6 1
a6 1
XCOMM $XFree86: xc/include/Imakefile,v 3.28 2001/04/28 23:52:31 dawes Exp $
d10 1
a10 1
#if BuildGlxExt || BuildGLXLibrary
@


1.6.4.2
log
@merge from trunk.
@
text
@a52 1
#if BuildLibraries
a53 1
#endif
@


1.5
log
@first part of 4.0.1b merge
@
text
@d1 1
a1 1
XCOMM $TOG: Imakefile /main/93 1997/06/13 15:34:58 kaleb $
d6 1
a6 1
XCOMM $XFree86: xc/include/Imakefile,v 3.25 2000/07/02 19:23:34 dawes Exp $
d55 1
a55 5

depend::

clean::

@


1.5.36.1
log
@Initial merge of trunk onto branch.
@
text
@d1 1
a1 1
XCOMM $Xorg: Imakefile,v 1.3 2000/08/18 04:05:43 coskrey Exp $
d6 1
a6 1
XCOMM $XFree86: xc/include/Imakefile,v 3.27 2001/01/21 21:19:08 tsi Exp $
d55 5
a59 1
DependSubdirs($(SUBDIRS))
@


1.5.36.2
log
@merge from DRI trunk (first pass)
@
text
@d6 1
a6 1
XCOMM $XFree86: xc/include/Imakefile,v 3.28 2001/04/28 23:52:31 dawes Exp $
d10 1
a10 1
#if BuildGlxExt || BuildGLXLibrary
@


1.4
log
@Merge XFree86 4.0.1
@
text
@d6 1
a6 1
XCOMM $XFree86: xc/include/Imakefile,v 3.24 2000/06/30 21:51:51 dawes Exp $
d76 4
a79 3
/*	-$(RM) $(SYSTEMUSRINCDIR)/GL */
	@@if [ ! -d $(SYSTEMUSRINCDIR)/GL ]; then \
		set -x; $(LN) $(INCDIR)/GL $(SYSTEMUSRINCDIR)/GL; \
@


1.4.6.1
log
@merge trunk to ppc-1-0-0-branch
@
text
@d6 1
a6 1
XCOMM $XFree86: xc/include/Imakefile,v 3.25 2000/07/02 19:23:34 dawes Exp $
d76 3
a78 4
	MakeDir($(DESTDIR)$(SYSTEMUSRINCDIR))
	-$(RM) $(DESTDIR)$(SYSTEMUSRINCDIR)/GL
	@@if [ ! -d $(DESTDIR)$(SYSTEMUSRINCDIR)/GL ]; then \
		set -x; $(LN) $(INCDIR)/GL $(DESTDIR)$(SYSTEMUSRINCDIR)/GL; \
@


1.3
log
@check LinkGLToUsrInclude to make /usr/include/GL/
@
text
@d6 1
a6 1
XCOMM $XFree86: xc/include/Imakefile,v 3.19 2000/02/13 00:12:37 dawes Exp $
a72 1

d74 1
a74 1
#if LinkGLToUsrInclude
d76 4
a79 2
	$(RM) /usr/include/GL
	$(LN) $(INCDIR)/GL /usr/include/GL
@


1.3.2.1
log
@
Merge the trunk onto the tdfx-2-1 branch. Now up to date with 4.0.1.
@
text
@d6 1
a6 1
XCOMM $XFree86: xc/include/Imakefile,v 3.24 2000/06/30 21:51:51 dawes Exp $
d73 1
d75 1
a75 1
#if LinkGLToUsrInclude && AlternateIncRoot
d77 2
a78 4
/*	-$(RM) $(SYSTEMUSRINCDIR)/GL */
	@@if [ ! -d $(SYSTEMUSRINCDIR)/GL ]; then \
		set -x; $(LN) $(INCDIR)/GL $(SYSTEMUSRINCDIR)/GL; \
	fi
@


1.3.2.2
log
@Merge trunk into tdfx-2-1-branch
@
text
@d6 1
a6 1
XCOMM $XFree86: xc/include/Imakefile,v 3.25 2000/07/02 19:23:34 dawes Exp $
d76 3
a78 4
	MakeDir($(DESTDIR)$(SYSTEMUSRINCDIR))
	-$(RM) $(DESTDIR)$(SYSTEMUSRINCDIR)/GL
	@@if [ ! -d $(DESTDIR)$(SYSTEMUSRINCDIR)/GL ]; then \
		set -x; $(LN) $(INCDIR)/GL $(DESTDIR)$(SYSTEMUSRINCDIR)/GL; \
@


1.2
log
@make /usr/include/GL symlink on Linux
@
text
@d75 1
a75 1
#if defined(LinuxArchitecture)
@


1.1
log
@Initial revision
@
text
@d6 1
a6 1
XCOMM $XFree86: xc/include/Imakefile,v 3.17 1999/08/28 09:00:22 dawes Exp $
d14 5
a18 1
SUBDIRS = bitmaps extensions fonts $(GLXDIR)
d28 1
d72 8
@


1.1.1.1
log
@Import XFree 3.9.16
@
text
@@


1.1.1.2
log
@Import of XFree86 3.9.18
@
text
@d6 1
a6 1
XCOMM $XFree86: xc/include/Imakefile,v 3.19 2000/02/13 00:12:37 dawes Exp $
d14 1
a14 5
#if BuildDPSLibrary
DPSDIR = DPS
#endif

SUBDIRS = bitmaps extensions fonts $(GLXDIR) $(DPSDIR)
a23 1
	XF86keysym.h \
@


1.1.1.3
log
@Import of XFree86 4.0.1
@
text
@d6 1
a6 1
XCOMM $XFree86: xc/include/Imakefile,v 3.24 2000/06/30 21:51:51 dawes Exp $
a71 9

XCOMM For the Linux/OpenGL base standard
#if LinkGLToUsrInclude && AlternateIncRoot
install::
/*	-$(RM) $(SYSTEMUSRINCDIR)/GL */
	@@if [ ! -d $(SYSTEMUSRINCDIR)/GL ]; then \
		set -x; $(LN) $(INCDIR)/GL $(SYSTEMUSRINCDIR)/GL; \
	fi
#endif
@


1.1.1.4
log
@Import of XFree86 4.0.1b
@
text
@d6 1
a6 1
XCOMM $XFree86: xc/include/Imakefile,v 3.25 2000/07/02 19:23:34 dawes Exp $
d76 3
a78 4
	MakeDir($(DESTDIR)$(SYSTEMUSRINCDIR))
	-$(RM) $(DESTDIR)$(SYSTEMUSRINCDIR)/GL
	@@if [ ! -d $(DESTDIR)$(SYSTEMUSRINCDIR)/GL ]; then \
		set -x; $(LN) $(INCDIR)/GL $(DESTDIR)$(SYSTEMUSRINCDIR)/GL; \
@


1.1.1.5
log
@Import of XFree86 4.0.1d-pre
@
text
@d6 1
a6 1
XCOMM $XFree86: xc/include/Imakefile,v 3.24 2000/06/30 21:51:51 dawes Exp $
@


1.1.1.6
log
@Import of XFree86 4.0.1d-pre (2)
@
text
@d6 1
a6 1
XCOMM $XFree86: xc/include/Imakefile,v 3.25 2000/07/02 19:23:34 dawes Exp $
@


1.1.1.7
log
@Import of XFree86 4.0.99.1
@
text
@d1 1
a1 1
XCOMM $Xorg: Imakefile,v 1.3 2000/08/18 04:05:43 coskrey Exp $
d6 1
a6 1
XCOMM $XFree86: xc/include/Imakefile,v 3.27 2001/01/21 21:19:08 tsi Exp $
d55 5
a59 1
DependSubdirs($(SUBDIRS))
@


1.1.1.8
log
@Import of XFree86 4.1.0
@
text
@d6 1
a6 1
XCOMM $XFree86: xc/include/Imakefile,v 3.28 2001/04/28 23:52:31 dawes Exp $
d10 1
a10 1
#if BuildGlxExt || BuildGLXLibrary
@


1.1.1.9
log
@Import of XFree86 4.2.0
@
text
@d6 1
a6 1
XCOMM $XFree86: xc/include/Imakefile,v 3.29 2001/08/27 17:40:56 dawes Exp $
a52 1
#if BuildLibraries
a53 1
#endif
@