head	1.2;
access;
symbols
	netbsd-5-2-3-RELEASE:1.2
	netbsd-5-1-5-RELEASE:1.2
	riastradh-xf86-video-intel-2-7-1-pre-2-21-15:1.2
	riastradh-drm2-base:1.2
	netbsd-5-2-2-RELEASE:1.2
	netbsd-5-1-4-RELEASE:1.2
	netbsd-5-2-1-RELEASE:1.2
	netbsd-5-1-3-RELEASE:1.2
	netbsd-5-2:1.2.0.8
	netbsd-5-2-RELEASE:1.2
	netbsd-5-2-RC1:1.2
	netbsd-5-1-2-RELEASE:1.2
	netbsd-5-1-1-RELEASE:1.2
	netbsd-5-1:1.2.0.6
	netbsd-5-1-RELEASE:1.2
	netbsd-5-1-RC4:1.2
	netbsd-5-1-RC3:1.2
	netbsd-5-1-RC2:1.2
	netbsd-5-1-RC1:1.2
	netbsd-5-0-2-RELEASE:1.2
	netbsd-5-0-1-RELEASE:1.2
	netbsd-5-0:1.2.0.4
	netbsd-5-0-RELEASE:1.2
	netbsd-5-0-RC4:1.2
	netbsd-5-0-RC3:1.2
	netbsd-5-0-RC2:1.2
	netbsd-5-0-RC1:1.2
	netbsd-5:1.2.0.2
	netbsd-5-base:1.2
	v4-4-0_beforeimport:1.1.1.1
	netbsd-1-6-PATCH002-RELEASE:1.1.1.1
	netbsd-1-6-PATCH002:1.1.1.1
	netbsd-1-6-PATCH002-RC4:1.1.1.1
	v4-3-0-2003-12-19:1.1.1.1
	netbsd-1-6-PATCH002-RC3:1.1.1.1
	netbsd-1-6-PATCH002-RC2:1.1.1.1
	netbsd-1-6-PATCH002-RC1:1.1.1.1
	netbsd-1-6:1.1.1.1.0.2
	netbsd-1-6-base:1.1.1.1
	v4-3-0:1.1.1.1
	XF86:1.1.1;
locks; strict;
comment	@# @;


1.2
date	2004.03.05.16.32.53;	author tron;	state dead;
branches;
next	1.1;

1.1
date	2003.02.28.13.18.56;	author tron;	state Exp;
branches
	1.1.1.1;
next	;

1.1.1.1
date	2003.02.28.13.18.56;	author tron;	state Exp;
branches;
next	;


desc
@@


1.2
log
@Resolve conflicts from import of XFree86 4.4.0.
@
text
@#ifndef SharedLibFontconfig
#define SharedLibFontconfig 		YES
#endif

#ifndef NormalLibFontconfig
#define NormalLibFontconfig (!SharedLibFontconfig | ForceNormalLib)
#endif

#ifndef DebugLibFontconfig
#define DebugLibFontconfig		NO
#endif

#ifndef ProfileLibFontconfig
#define ProfileLibFontconfig		NO
#endif

#define _FUse(a,b) b hello
#if (defined(__STDC__) && !defined(UnixCpp)) || defined(AnsiCpp)
# define _FUseCat(a,b,c) b##c fllop
#else
# define _FUseCat(a,b,c) b/**/c
#endif

#undef _Use
#undef _UseCat
#define _Use    _FUse
#define _UseCat _FUseCat

#ifndef ExpatClientLibs
#define ExpatClientLibs -lexpat
#endif
#ifndef ExpatClientDepLibs
#define ExpatClientDepLibs
#endif

#ifndef FontconfigClientDepLibs
#define FontconfigClientDepLibs $(DEPFONTCONFIGLIB) $(DEPFREETYPE2LIB) ExpatClientDepLibs
#endif
#ifndef FontconfigClientLibs
#define FontconfigClientLibs $(FONTCONFIGLIB) $(FREETYPE2LIB) ExpatClientLibs
#endif

#if SharedLibFontconfig
#define SharedFontconfigRev 1.0
SharedLibReferences(FONTCONFIG,fontconfig,$(FONTCONFIGSRC),SOXLIBREV,SharedFontconfigRev)
#else
ProjectUnsharedLibReferences(FONTCONFIG,fontconfig,$(FONTCONFIGSRC),BuildLibDir)
#endif

FCCACHE=$(TOP)/fc-cache/fc-cache

#undef LinkBuildLibrary
#define LinkBuildLibrary(lib) MakeDir($(BUILDLIBDIR))			@@@@\
	RemoveFile($(BUILDLIBDIR)/lib)					@@@@\
	cd $(BUILDLIBDIR) && $(LN) $(BUILDLIBTOP)/$(CURRENT_DIR)/lib .
#undef _LinkBuildLibrary
#define _LinkBuildLibrary(lib) LinkBuildLibrary(lib)

#undef LinkBuildLibraryMaybe
#define LinkBuildLibraryMaybe(lib,doit) MakeDir($(BUILDLIBDIR))		@@@@\
	@@if doit; then (set -x; \					@@@@\
	  RemoveFile($(BUILDLIBDIR)/lib); \				@@@@\
	  cd $(BUILDLIBDIR) && $(LN) $(BUILDLIBTOP)/$(CURRENT_DIR)/lib .); fi

#ifdef LdPreLibs
# undef LdPreLibs
#endif
#define LdPreLibs -L$(BUILDLIBDIR) LdPreLib XLdPreLibs

LDPRELIBS=LdPreLibs
@


1.1
log
@Initial revision
@
text
@@


1.1.1.1
log
@Import of XFree86 4.3.0.
@
text
@@