head	1.4;
access;
symbols
	trunk-20040613:1.4
	mach64-last-merge:1.4
	driinterface-0-0-3-20040303-merge:1.4
	driinterface-0-0-3-20040303-premerge:1.4
	driinterface-0-0-3-20040303:1.4
	driinterface-0-0-3-branch:1.4.0.24
	mach64-0-0-7-branch:1.4.0.22
	driinterface-0-0-2-branch:1.4.0.20
	newmesa-0-0-1-20031209-merge:1.4
	trunk-20031209:1.4
	newmesa-0-0-1-20031209:1.4
	newmesa-0-0-1-branch:1.4.0.18
	driinterface-0-0-1-branch:1.4.0.16
	savage-2-0-0-branch:1.4.0.14
	savage-2-0-0-fork:1.4
	config-0-0-1-20031005-freeze:1.4
	savage-1_0_0-20031002-trunk-premerge:1.4
	cle266-0-0-1-branch:1.4.0.12
	i865-agp-0-1-20030929:1.4
	trunk-20030916:1.4
	XFree86-4_3_99_12-merge:1.4
	trunk-20030912:1.4
	i865-agp-0-1-20030905:1.4
	i865-agp-0-1-20030728:1.4
	i865-agp-0-1-20030707:1.4
	savage-1_0_0-branch:1.4.0.10
	newdrm-0-0-1-branch:1.4.0.8
	i865-agp-0-1-branch:1.4.0.6
	config-0-0-1-branch:1.4.0.4
	texmem-0-0-1-20030429-merge:1.4
	texmem-0-0-1-20030429-premerge:1.4
	texmem-0-0-1-20030407:1.3.4.2
	trident-0-0-2-branch:1.4.0.2
	mach64-0-0-6-20030330:1.3.12.1
	mach64-0-0-6-20030329-freeze:1.3
	texmem-0-0-1-20030328-freeze:1.3.4.1
	X_4_3_0-20030324-merge:1.1.1.4
	X_4_3_0-20020324-preimport:1.3
	drm-filp-0-1-branch:1.3.0.14
	mesa-4-0-4-20030222:1.3
	bsd-4-0-0-20030221-merge:1.3
	bsd-4-0-0-20030220:1.3
	bsd-4-0-0-20030220-freeze:1.3
	mesa-4-0-4-20030216:1.3
	mach64-0-0-6-branch:1.3.0.12
	mesa-4-0-4-20030208:1.3
	texmem-0-0-1-20030204-trunk-merge:1.3.4.1
	texmem-0-0-1-20030204-trunk-premerge:1.3.4.1
	mesa-4-0-4-20030203:1.3
	mesa-4-0-4-20030129:1.3
	texmem-0-0-1-20030125-trunk-merge:1.3.4.1
	texmem-0-0-1-20030123-trunk-premerge:1.3.4.1
	mesa-4-0-4-20030114:1.3
	agpgart_2_0_branch:1.3.0.10
	mesa-4-0-4-20021220:1.3
	mesa-4-0-4-20021216:1.3
	mesa-4-0-4-20021215:1.3
	mesa-4-0-4-20021214:1.3
	mesa-4-0-4-branch:1.3.0.8
	texmem-0-0-1-20021127-mesa-4-1-merge:1.3.4.1
	trunk-20021125:1.3
	mesa-4-1-branch:1.3.0.6
	texmem-0-0-1:1.3.0.4
	bsd-4-0-0-branch:1.3.0.2
	X_4_1_99_1-20010822-merge:1.1.1.3
	X_4_1_99_1:1.1.1.3
	X_4_1_99_1-20010822-preimport:1.1.1.3
	multihead-1-0-0-20010730:1.1.1.3
	multihead-1-0-0-20010730-merge:1.1.1.3
	multihead-1-0-0-20010727-freeze:1.1.1.3
	X_4_1_0-20010615-merge:1.1.1.3
	mesa-3-5-20010621-freeze:1.1.1.3
	X_4_1_0:1.1.1.3
	X_4_1_0-20010614-preimport:1.1.1.3
	multihead-1-0-0-branch:1.1.1.3.0.34
	X_4_0_99_3-20010502-merge:1.1.1.3
	X_4_0_99_3:1.1.1.3
	X_4_0_99_3-20010501-preimport:1.1.1.3
	bsd-2-0-0-branch:1.1.1.3.0.32
	X_4_0_99_2-20010410-merge:1.1.1.3
	X_4_0_99_2:1.1.1.3
	X_4_0_99_2-20010409-preimport:1.1.1.3
	ati-pcigart-1-0-0-20010405-merge:1.1.1.3
	ati-pcigart-1-0-0-20010405:1.1.1.3
	ati-pcigart-1-0-0-20010405-freeze:1.1.1.3
	ati-pcigart-1-0-0-branch:1.1.1.3.0.30
	mesa-3-5-20010323-freeze:1.1.1.3
	X_4_0_99_1-20010321-merge:1.1.1.3
	X_4_0_99_1:1.1.1.3
	X_4_0_99_1-20010319-preimport:1.1.1.3
	full-1-0-0-20010315-head:1.1.1.3
	sarea-1-0-0-20010314-merge:1.1.1.3
	sarea-1-0-0-20010314:1.1.1.3
	full-1-0-0-branch:1.1.1.3
	sarea-1-0-0-20010307:1.1.1.3
	sarea-1-0-0-20010307-freeze:1.1.1.3
	tdfx-3-1-0-20010306-merge:1.1.1.3
	tdfx-3-1-0-20010306-freeze:1.1.1.3
	tdfx-3-1-0-20010306:1.1.1.3
	tdfx-3-1-0-20010305-merge:1.1.1.3
	tdfx-3-1-0-20010305-freeze2:1.1.1.3
	tdfx-3-1-0-20010305-freeze:1.1.1.3
	tdfx-3-1-0-20010301-freeze:1.1.1.3
	ati-pcigart-0-0-1-branch-02282001-freeze:1.1.1.3
	ati-5-0-1-20010220-head:1.1.1.3
	ati-5-0-1-branch:1.1.1.3.0.28
	sarea-1-0-0-branch:1.1.1.3.0.26
	mga-1-0-0-20010215-merge:1.1.1.3
	mga-1-0-0-20010215-freeze:1.1.1.3
	tdfx-3-1-0-branch:1.1.1.3.0.24
	tdfx-3-0-1-branch:1.1.1.3
	ati-pcigart-0-0-1-branch:1.1.1.3.0.22
	mesa-3-5-branch:1.1.1.3.0.20
	tdfx-3-0-0-20010109-merge:1.1.1.3
	tdfx-3-0-0-20010108:1.1.1.3
	ati-5-0-0-20010105-merge:1.1.1.3
	ati-5-0-0-20010105:1.1.1.3
	ati-5-0-0-20000104-freeze:1.1.1.3
	tdfx-3-0-0-20010104-freeze:1.1.1.3
	ati-5-0-0-20001223-merge:1.1.1.3
	ati-5-0-0-20001223-freeze:1.1.1.3
	X_4_0_2-20001221-merge:1.1.1.3
	X_4_0_2:1.1.1.3
	mga-1-0-0-branch:1.1.1.3.0.18
	X_4_0_1h-20001207-merge:1.1.1.3
	X_4_0_1h-20001205-merge:1.1.1.3
	X_4_0_1h:1.1.1.3
	ati-4-1-1-20001202-merge-trunk:1.1.1.3
	sse-1-0-1-branch:1.1.1.3.0.16
	ati-4-1-1-20001202-merge:1.1.1.1
	tdfx-3-0-0-20001201:1.1.1.3
	ati-4-1-1-20001201-freeze:1.1.1.1
	tdfx-3-0-0-20001201-freeze:1.1.1.3
	X_4_0_1g-20001130-merge:1.1.1.3
	X_4_0_1g:1.1.1.3
	X_4_0_1f-20001130-merge:1.1.1.3
	X_4_0_1f:1.1.1.3
	ati-4-1-1-20001125-freeze:1.1.1.1
	mach64-0-0-1-branch:1.1.1.3.0.14
	ati-5-0-0-branch:1.1.1.3.0.12
	X_4_0_1e-20001107-merge:1.1.1.3
	X_4_0_1e:1.1.1.3
	X_4_0_1d-20001107-merge:1.1.1.3
	X_4_0_1d:1.1.1.3
	ppc-1-0-1-branch:1.1.1.3.0.10
	radeon-1-0-0-20001017:1.1.1.1
	full-0-0-2-branch:1.1.1.3.0.8
	full-0-0-1-branch:1.1.1.3.0.6
	ati-4-1-1-20001009-freeze:1.1.1.1
	mga-readpix-0-0-1-branch:1.1.1.3.0.4
	tdfx-3-0-0-branch:1.1.1.3.0.2
	X_4_0_1d-pre:1.1.1.3
	ati-4-1-1-20000919-stable:1.1.1.1
	radeon-1-0-0-branch:1.1.1.1.0.66
	ppc-1-0-0-20000912:1.1.1.1
	mga-lock-debug-0-2-0-branch:1.1.1.1.0.64
	sse-1-0-0-branch:1.1.1.1.0.62
	mga-lock-debug-0-0-1-branch:1.1.1.1.0.60
	gamma-2-0-0-branch:1.1.1.1.0.58
	tdfx-2-1-20000907-merge:1.1.1.1
	tdfx-2-1-20000906:1.1.1.1
	tdfx-2-1-20000905-freeze:1.1.1.1
	ppc-1-0-0-2000-09-01-freeze:1.1.1.1
	m3-0-0-1-branch:1.1.1.1.0.56
	mach64-0-0-0-branch:1.1.1.1.0.54
	ati-4-1-1-branch:1.1.1.1.0.52
	X_4_0_1b-20000816-merge:1.1.1.1
	X_4_0_1b:1.1.1.1
	ati-4-0-2-branch:1.1.1.1.0.50
	ppc-1-0-0-branch:1.1.1.1.0.48
	tdfx-2-1-20000711:1.1.1.1
	tdfx-2-1-20000711-freeze:1.1.1.1
	X_4_0_1:1.1.1.1
	tdfx-2-1-branch:1.1.1.1.0.46
	pre401-20000613-freeze:1.1.1.1
	bsd-1-0-1-20000613-merge:1.1.1.1
	bsd-1-0-1-20000613:1.1.1.1
	bsd-1-0-1-20000612-freeze:1.1.1.1
	tdfx-2-0-20000612-merge:1.1.1.1
	ati-4-1-0-20000613-merge:1.1.1.1
	ati-4-1-0-20000613:1.1.1.1
	tdfx-2-0-20000608-merge:1.1.1.1
	tdfx-2-0-20000608-freeze:1.1.1.1
	ati-4-1-0-branch:1.1.1.1.0.44
	glxmisc-3-0-0-20000608-merge:1.1.1.1
	glxmisc-3-0-0-20000607:1.1.1.1
	glxmisc-3-0-0-20000606-freeze:1.1.1.1
	bsd-1-0-1-branch:1.1.1.1.0.42
	bsd-1-0-0-20000531-merge:1.1.1.1
	bsd-1-0-0-20000530-merge:1.1.1.1
	bsd-1-0-0-20000530-freeze:1.1.1.1
	tdfx-2-0-20000222-merge:1.1.1.1
	tdfx-2-0-20000222-freeze:1.1.1.1
	ati-4-0-1-20000518-merge:1.1.1.1
	ati-4-0-1-20000518:1.1.1.1
	video-1-0-0-branch:1.1.1.1.0.40
	gamma-1-0-0-branch:1.1.1.1.0.38
	mgadh-0-0-3-branch:1.1.1.1.0.36
	glxmisc-3-0-0-branch:1.1.1.1.0.34
	glxmisc-2-0-0-20000503-merge:1.1.1.1
	bsd-1-0-0-branch:1.1.1.1.0.32
	glxmisc-2-0-0-20000503:1.1.1.1
	glxmisc-2-0-0-branch:1.1.1.1.0.30
	tdfx-2-0-branch:1.1.1.1.0.28
	tdfx-2-0-trunk:1.1.1.1
	glxmisc-1-0-0-20000420-merge:1.1.1.1
	glxmisc-1-0-0-20000420:1.1.1.1
	ati-4-0-1-beta:1.1.1.1
	glxmisc-1-0-0-branch:1.1.1.1.0.26
	mga-0-0-3-branch:1.1.1.1.0.24
	mga-0-0-2-20000404-merge:1.1.1.1
	ati-4-0-1-alpha:1.1.1.1
	ati-4-0-1-20000319-base:1.1.1.1
	ati-4-0-1-branch:1.1.1.1.0.22
	ati-4-0-0-20000319:1.1.1.1
	X_4_0-20000315-merge:1.1.1.1
	X_4_0:1.1.1.1
	freeze-20000226:1.1.1.1
	dispatch-0-0-3-20000225-merge:1.1.1.1
	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.1.0.20
	smt-0-0-2-branch:1.1.1.1.0.18
	smt-0-0-1-20000222-freeze:1.1.1.1
	X_3_9_18-20000222-merge:1.1.1.1
	X_3_9_18:1.1.1.1
	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.4
date	2003.03.25.14.01.16;	author alanh;	state Exp;
branches;
next	1.3;

1.3
date	2002.10.30.10.08.51;	author alanh;	state Exp;
branches
	1.3.4.1
	1.3.6.1
	1.3.12.1;
next	1.2;

1.2
date	2001.08.23.21.35.17;	author dawes;	state dead;
branches;
next	1.1;

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

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

1.1.1.2
date	2000.09.22.17.24.55;	author alanh;	state Exp;
branches;
next	1.1.1.3;

1.1.1.3
date	2000.09.23.20.56.43;	author alanh;	state Exp;
branches
	1.1.1.3.32.1;
next	1.1.1.4;

1.1.1.4
date	2003.03.25.00.09.31;	author alanh;	state Exp;
branches;
next	;

1.1.1.3.32.1
date	2001.08.29.17.24.57;	author alanh;	state dead;
branches;
next	;

1.3.4.1
date	2002.11.11.23.32.02;	author idr;	state Exp;
branches;
next	1.3.4.2;

1.3.4.2
date	2003.04.02.04.29.21;	author idr;	state Exp;
branches;
next	;

1.3.6.1
date	2002.11.15.01.58.23;	author brianp;	state Exp;
branches;
next	;

1.3.12.1
date	2003.03.30.04.51.27;	author ldelgass;	state Exp;
branches;
next	;


desc
@@


1.4
log
@merge in rest of Mesa changes
merge radeon driver (this doesn't build - probably due to Mesa 5.1 import)
@
text
@XCOMM $XFree86: xc/lib/Xv/Imakefile,v 1.8 2003/01/04 02:48:24 dawes Exp $

#define DoNormalLib NormalLibXv
#define DoSharedLib SharedLibXv
#define DoDebugLib DebugLibXv
#define DoProfileLib ProfileLibXv
#define LibName Xv
#define SoRev SOXVREV
#define LibHeaders NO

#include <Threads.tmpl>

#ifdef SharedXvReqs
REQUIREDLIBS = SharedXvReqs
#endif

#if Malloc0ReturnsNull
ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL
#endif

      DEFINES = $(ALLOC_DEFINES)
         SRCS = Xv.c
         OBJS = Xv.o
     LINTLIBS = $(LINTXLIB)

#define IncludeSharedObjectInNormalLib

#include <Library.tmpl>

DependTarget()
@


1.3
log
@re-import the XvMC libraries from 4.2.0
build the XvMC library by default as it uses the DRM (for build testing)
Fix up XvMC to use the drmCommand interface
@
text
@d1 1
a1 1
XCOMM $XFree86: xc/lib/Xv/Imakefile,v 1.7 2002/10/16 00:37:33 dawes Exp $
d26 1
a26 1
#define IncludeNormalLibInSharedObject
@


1.3.12.1
log
@Merge trunk - 4.3.0, filp
@
text
@d1 1
a1 1
XCOMM $XFree86: xc/lib/Xv/Imakefile,v 1.8 2003/01/04 02:48:24 dawes Exp $
d26 1
a26 1
#define IncludeSharedObjectInNormalLib
@


1.3.6.1
log
@merge from trunk
@
text
@@


1.3.4.1
log
@Massive merge from trunk.
@
text
@@


1.3.4.2
log
@First part of trunk-to-branch merge.  More to follow.
@
text
@d1 1
a1 1
XCOMM $XFree86: xc/lib/Xv/Imakefile,v 1.8 2003/01/04 02:48:24 dawes Exp $
d26 1
a26 1
#define IncludeSharedObjectInNormalLib
@


1.2
log
@Remove client-side libraries not needed for the DRI components.
@
text
@d1 1
a1 1
XCOMM $XFree86: xc/lib/Xv/Imakefile,v 1.5 1999/05/23 08:23:10 dawes Exp $
a21 1
     INCLUDES = -I$(XLIBSRC) -I$(EXTINCSRC)
d25 2
@


1.1
log
@Initial revision
@
text
@@


1.1.1.1
log
@Import XFree 3.9.16
@
text
@@


1.1.1.2
log
@Import of XFree86 4.0.1d-pre
@
text
@d1 1
a1 1
XCOMM $XFree86: xc/lib/Xv/Imakefile,v 1.4 1999/05/23 06:33:31 dawes Exp $
@


1.1.1.3
log
@Import of XFree86 4.0.1d-pre (2)
@
text
@d1 1
a1 1
XCOMM $XFree86: xc/lib/Xv/Imakefile,v 1.5 1999/05/23 08:23:10 dawes Exp $
@


1.1.1.4
log
@XFree86 4.3.0 merge
@
text
@d1 1
a1 1
XCOMM $XFree86: xc/lib/Xv/Imakefile,v 1.8 2003/01/04 02:48:24 dawes Exp $
d22 1
a25 2

#define IncludeSharedObjectInNormalLib
@


1.1.1.3.32.1
log
@merge from trunk.
@
text
@@