(file) Return to Imakefile CVS log (file) (dir) Up to [XFree86 CVS] / xc / programs / Xserver / hw / xfree86

Diff for /xc/programs/Xserver/hw/xfree86/Imakefile between version 3.28.2.3 and 3.29

version 3.28.2.3, 1998/11/01 11:19:26 version 3.29, 1997/02/14 12:16:36
Line 3 
Line 3 
  
  
  
 XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/Imakefile,v 3.28.2.2 1998/09/13 12:28:59 hohndel Exp $  XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/Imakefile,v 3.28 1996/12/23 06:30:29 dawes Exp $
  
 #include <Server.tmpl> #include <Server.tmpl>
 #define IHaveSubdirs #define IHaveSubdirs
Line 16 
Line 16 
 MONOSCREEN = mono MONOSCREEN = mono
 #endif #endif
  
 #if XF86SVGAServer  #if XF86SVGAServer || XF86SVGAModule
 VGA256SCREEN = vga256 VGA256SCREEN = vga256
 #endif #endif
  
Line 28 
Line 28 
 ACCELDIRS = accel ACCELDIRS = accel
 #endif #endif
  
 #if XF86FBDevServer  #if !defined(OsfArchitecture) && !defined(AmoebaArchitecture)
 FBDEVSCREEN = fbdev  
 #endif  
   
 #if !defined(OsfArchitecture) && !defined(AmoebaArchitecture) && !defined(ArcArchitecture)  
 SUPERPROBE = SuperProbe SUPERPROBE = SuperProbe
 #endif #endif
  
Line 40 
Line 36 
 XF86SETUPDIR = XF86Setup XF86SETUPDIR = XF86Setup
 #endif #endif
  
 SCREENS = $(VGA2SCREEN) $(MONOSCREEN) $(VGA16SCREEN) $(VGA256SCREEN) \  SCREENS = $(VGA2SCREEN) $(MONOSCREEN) $(VGA16SCREEN) $(VGA256SCREEN)
           $(FBDEVSCREEN)  
  
 SUBDIRS = os-support common common_hw xaa $(SCREENS) $(ACCELDIRS) doc \ SUBDIRS = os-support common common_hw xaa $(SCREENS) $(ACCELDIRS) doc \
           reconfig xf86config $(XF86SETUPDIR) etc LinkKit \           reconfig xf86config $(XF86SETUPDIR) etc LinkKit \
           VGADriverDoc $(SUPERPROBE)            VGADriverDoc $(SUPERPROBE) loader
  
 #ifndef OS2Architecture #ifndef OS2Architecture
 XF86CONFIG = XF86Config XF86CONFIG = XF86Config
Line 62 
Line 57 
 #endif #endif
  
 RGBPATH=\"DefaultRGBDatabase\" RGBPATH=\"DefaultRGBDatabase\"
 LOCALFONTPATH=\"$(LIBDIR)/fonts/local/\"  
 MISCFONTPATH=\"$(LIBDIR)/fonts/misc/\" MISCFONTPATH=\"$(LIBDIR)/fonts/misc/\"
 T1FONTPATH=\"$(LIBDIR)/fonts/Type1/\" T1FONTPATH=\"$(LIBDIR)/fonts/Type1/\"
 SPFONTPATH=\"$(LIBDIR)/fonts/Speedo/\" SPFONTPATH=\"$(LIBDIR)/fonts/Speedo/\"
Line 71 
Line 65 
 DPI75USFONTPATH=\"$(LIBDIR)/fonts/75dpi/:unscaled\" DPI75USFONTPATH=\"$(LIBDIR)/fonts/75dpi/:unscaled\"
 DPI100USFONTPATH=\"$(LIBDIR)/fonts/100dpi/:unscaled\" DPI100USFONTPATH=\"$(LIBDIR)/fonts/100dpi/:unscaled\"
  
 #if MakeLocalFontDir  
   USE_LOCALFONTS="    FontPath"  
 #else  
   USE_LOCALFONTS="XCOMM    FontPath"  
 #endif  
 #if Build75DpiFonts #if Build75DpiFonts
   USE_75FONTS="    FontPath"   USE_75FONTS="    FontPath"
 #else #else
Line 118 
Line 107 
 #ifdef MinixArchitecture #ifdef MinixArchitecture
 CppFileTarget($(XF86CONFIG), XF86Conf.cpp, CppFileTarget($(XF86CONFIG), XF86Conf.cpp,
     -DRGBPATH=$(RGBPATH) -DMISCFONTPATH=$(MISCFONTPATH)     -DRGBPATH=$(RGBPATH) -DMISCFONTPATH=$(MISCFONTPATH)
     -DUSE_LOCALFONT=$(USELOCALFONT) -DLOCALFONTPATH=$(LOCALFONTPATH)  
     -DUSE_T1FONTS=$(USE_T1FONTS) -DT1FONTPATH=$(T1FONTPATH)     -DUSE_T1FONTS=$(USE_T1FONTS) -DT1FONTPATH=$(T1FONTPATH)
     -DUSE_SPFONTS=$(USE_SPFONTS) -DSPFONTPATH=$(SPFONTPATH)     -DUSE_SPFONTS=$(USE_SPFONTS) -DSPFONTPATH=$(SPFONTPATH)
     -DUSE_75FONTS=$(USE_75FONTS) -DDPI75FONTPATH=$(DPI75FONTPATH)     -DUSE_75FONTS=$(USE_75FONTS) -DDPI75FONTPATH=$(DPI75FONTPATH)
Line 129 
Line 117 
 #else #else
 CppFileTarget($(XF86CONFIG), XF86Conf.cpp, \ CppFileTarget($(XF86CONFIG), XF86Conf.cpp, \
     -DRGBPATH=$(RGBPATH) -DMISCFONTPATH=$(MISCFONTPATH) \     -DRGBPATH=$(RGBPATH) -DMISCFONTPATH=$(MISCFONTPATH) \
     -DUSE_LOCALFONTS=$(USE_LOCALFONTS) -DLOCALFONTPATH=$(LOCALFONTPATH) \  
     -DUSE_T1FONTS=$(USE_T1FONTS) -DT1FONTPATH=$(T1FONTPATH) \     -DUSE_T1FONTS=$(USE_T1FONTS) -DT1FONTPATH=$(T1FONTPATH) \
     -DUSE_SPFONTS=$(USE_SPFONTS) -DSPFONTPATH=$(SPFONTPATH) \     -DUSE_SPFONTS=$(USE_SPFONTS) -DSPFONTPATH=$(SPFONTPATH) \
     -DUSE_75FONTS=$(USE_75FONTS) -DDPI75FONTPATH=$(DPI75FONTPATH) \     -DUSE_75FONTS=$(USE_75FONTS) -DDPI75FONTPATH=$(DPI75FONTPATH) \


Legend:
Removed from v.3.28.2.3  
changed lines
  Added in v.3.29

Powered by
ViewCVS 0.9.2