[Xorg-commit] xc/lib/font Imakefile,1.1.4.2,1.1.4.3

[Kaleb Keithley]

Committed by: kaleb

Update of /cvs/xorg/xc/lib/font
In directory pdx:/home/kaleb/xorg/xc.XORG-CURRENT/lib/font

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


Index: Imakefile
===================================================================
RCS file: /cvs/xorg/xc/lib/font/Imakefile,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- a/Imakefile	26 Nov 2003 22:48:40 -0000	1.1.4.2
+++ b/Imakefile	23 Feb 2004 21:34:38 -0000	1.1.4.3
@@ -3,7 +3,7 @@
 
 
 
-XCOMM $XFree86: xc/lib/font/Imakefile,v 3.37 2003/10/24 16:21:12 tsi Exp $
+XCOMM $XFree86: xc/lib/font/Imakefile,v 3.38 2004/02/07 04:45:18 dawes Exp $
 
 #include <Server.tmpl>
 
@@ -71,13 +71,6 @@
 #endif
 #if BuildXTrueType
             XTTDIRS = X-TrueType
-#if XTTInLibXFont
-      XTTSHAREDOBJS = X-TrueType/?*.o
-      XTTSTATICOBJS = X-TrueType/$(STATIC_OBJSDIR)?*.o
-       XTTDEBUGOBJS = X-TrueType/debugger/?*.o
-     XTTPROFILEOBJS = X-TrueType/profiled/?*.o
-           XTTDONES = X-TrueType/DONE
-#endif
 #endif
 #if BuildBuiltinFonts
         BUILTINDIRS = builtins
@@ -102,26 +95,26 @@
 		 util $(STUBDIRS)
    SHARED_OBJS = bitmap/?*.o fontfile/?*.o fc/?*.o $(FONTCACHESHAREDOBJS) \
 		 $(SPEEDOSHAREDOBJS) $(TYPE1SHAREDOBJS) \
-		 $(FREETYPESHAREDOBJS) $(XTTSHAREDOBJS) \
+		 $(FREETYPESHAREDOBJS) \
 		 $(BUILTINSHAREDOBJS) util/?*.o
    STATIC_OBJS = bitmap/$(STATIC_OBJSDIR)?*.o fontfile/$(STATIC_OBJSDIR)?*.o \
 		 fc/$(STATIC_OBJSDIR)?*.o $(FONTCACHESTATICOBJS) \
 		 $(SPEEDOSTATICOBJS) $(TYPE1STATICOBJS) \
-		 $(FREETYPESTATICOBJS) $(XTTSTATICOBJS) \
+		 $(FREETYPESTATICOBJS) \
 		 $(BUILTINSTATICOBJS) util/$(STATIC_OBJSDIR)?*.o
     DEBUG_OBJS = bitmap/debugger/?*.o fontfile/debugger/?*.o fc/debugger/?*.o \
 		 $(FONTCACHEDEBUGOBJS) \
 		 $(SPEEDODEBUGOBJS) $(TYPE1DEBUGOBJS) \
-		 $(FREETYPEDEBUGOBJS) $(XTTDEBUGOBJS) \
+		 $(FREETYPEDEBUGOBJS) \
 		 $(BUILTINDEBUGOBJS) util/debugger/?*.o
   PROFILE_OBJS = bitmap/profiled/?*.o fontfile/profiled/?*.o fc/profiled/?*.o \
 		 $(FONTCACHEPROFILEOBJS) \
 		 $(SPEEDOPROFILEOBJS) $(TYPE1PROFILEOBJS) \
-		 $(FREETYPEPROFILEOBJS) $(XTTPROFILEOBJS) \
+		 $(FREETYPEPROFILEOBJS) \
 		 $(BUILTINPROFILEOBJS) util/profiled/?*.o
          DONES = bitmap/DONE fontfile/DONE fc/DONE $(FONTCACHEDONES) \
 		 $(SPEEDODONES) $(TYPE1DONES) \
-		 $(FREETYPEDONES) $(XTTDONES) \
+		 $(FREETYPEDONES) \
 		 $(BUILTINDONES) util/DONE
 
 #if BuildServer && DoLoadableServer