[xorg-commit-diffs] xc/programs Imakefile,1.1.4.3,1.1.4.4

[Egbert Eich]

Committed by: eich

Update of /cvs/xorg/xc/programs
In directory pdx:/home/eich/tstbuild/xc/programs

Modified Files:
      Tag: XORG-CURRENT
	Imakefile 
Log Message:
2004-04-15  Egbert Eich  <eich at freedesktop.org>
        Merged changes from RELEASE-1 branch
	


Index: Imakefile
===================================================================
RCS file: /cvs/xorg/xc/programs/Imakefile,v
retrieving revision 1.1.4.3
retrieving revision 1.1.4.4
diff -u -d -r1.1.4.3 -r1.1.4.4
--- a/Imakefile	5 Mar 2004 13:39:47 -0000	1.1.4.3
+++ b/Imakefile	15 Apr 2004 10:15:12 -0000	1.1.4.4
@@ -92,9 +92,7 @@
       GLXCLIENTDIRS = glxinfo glxgears
 #endif
 
-#ifndef cygwinArchitecture
         XLOADDIR = xload
-#endif
 
 #if BuildRandRLibrary
        XRANDRDIR = xrandr
@@ -115,7 +113,7 @@
 SUBDIRS = $(XSSRCDIR)
 #else
 SUBDIRS = \
-	appres bdftopcf fonttosfnt bitmap \
+	appres bdftopcf bitmap \
 	$(SCREENSAVESRCDIR) editres $(FCDIRS) $(FCLANGDIR) fslsfonts fstobdf \
 	iceauth ico listres luit \
 	$(MAKEPSRESDIR) $(DPSCLIENTDIRS) \