[Xorg-commit] xc/fonts/scaled/TTF Imakefile,1.1,1.1.4.1 fonts.scale,1.1,NONE

[Kaleb Keithley]

Committed by: kaleb

Update of /cvs/xorg/xc/fonts/scaled/TTF
In directory pdx:/home/kaleb/xorg/xc.XORG-CURRENT/fonts/scaled/TTF

Modified Files:
      Tag: XORG-CURRENT
	Imakefile 
Removed Files:
      Tag: XORG-CURRENT
	fonts.scale 
Log Message:
merge most of XFree86 RC3 (4.3.99.903) from vendor branch.
bug #214


Index: Imakefile
===================================================================
RCS file: /cvs/xorg/xc/fonts/scaled/TTF/Imakefile,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -d -r1.1 -r1.1.4.1
--- a/Imakefile	14 Nov 2003 16:48:42 -0000	1.1
+++ b/Imakefile	23 Feb 2004 21:33:42 -0000	1.1.4.1
@@ -1,13 +1,19 @@
-XCOMM $XFree86: xc/fonts/scaled/TTF/Imakefile,v 1.4 2002/05/22 04:30:13 keithp Exp $
+XCOMM $XFree86: xc/fonts/scaled/TTF/Imakefile,v 1.5 2003/12/31 19:30:39 dawes Exp $
 
-FONTS = luximb.ttf luximbi.ttf luximr.ttf luximri.ttf \
-        luxirb.ttf luxirbi.ttf luxirr.ttf luxirri.ttf \
-        luxisb.ttf luxisbi.ttf luxisr.ttf luxisri.ttf
+LUXIFONTS = luximb.ttf luximbi.ttf luximr.ttf luximri.ttf \
+	luxirb.ttf luxirbi.ttf luxirr.ttf luxirri.ttf \
+	luxisb.ttf luxisbi.ttf luxisr.ttf luxisri.ttf
 
+VERASRCDIR = $(TOP)/extras/fonts/Bitstream-Vera
+VERAFONTS = Vera.ttf VeraBI.ttf VeraBd.ttf VeraMoBI.ttf VeraMoBd.ttf \
+	VeraMoIt.ttf VeraMono.ttf VeraSe.ttf VeraSeBd.ttf
+
+FONTS = $(LUXIFONTS) $(VERAFONTS)
 OBJS = $(FONTS)
 
 FONTINSTDIR = $(FONTDIR)/TTF
 
+MakeFontsScale($(OBJS))
 MakeFontsDir(fonts.scale)
 
 #if UseFreetype2
@@ -15,7 +21,6 @@
 #endif
 
 InstallFonts($(FONTINSTDIR))
-InstallFontScale($(FONTINSTDIR))
 InstallEncodingsDir($(ENCODINGSSRC),$(FONTINSTDIR))
 #if UseFreetype2
 InstallFcCache($(FONTINSTDIR))
@@ -25,3 +30,15 @@
 MakeSubdirs($(SUBDIRS))
 DependSubdirs($(SUBDIRS))
 #endif
+
+LinkSourceFile(Vera.ttf,$(VERASRCDIR))
+LinkSourceFile(VeraBI.ttf,$(VERASRCDIR))
+LinkSourceFile(VeraBd.ttf,$(VERASRCDIR))
+LinkSourceFile(VeraIt.ttf,$(VERASRCDIR))
+LinkSourceFile(VeraMoBI.ttf,$(VERASRCDIR))
+LinkSourceFile(VeraMoBd.ttf,$(VERASRCDIR))
+LinkSourceFile(VeraMoIt.ttf,$(VERASRCDIR))
+LinkSourceFile(VeraMono.ttf,$(VERASRCDIR))
+LinkSourceFile(VeraSe.ttf,$(VERASRCDIR))
+LinkSourceFile(VeraSeBd.ttf,$(VERASRCDIR))
+

--- fonts.scale DELETED ---