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

Diff for /xc/programs/Xserver/Imakefile between version 3.265 and 3.266

version 3.265, 2002/10/01 16:49:52 version 3.266, 2002/10/17 08:18:11
Line 2 
Line 2 
 /* /*
  * Server Master Makefile  * Server Master Makefile
  */  */
 XCOMM $XFree86: xc/programs/Xserver/Imakefile,v 3.264 2002/08/28 06:41:23 torrey Exp $  XCOMM $XFree86: xc/programs/Xserver/Imakefile,v 3.265 2002/10/01 16:49:52 tsi Exp $
  
 #ifndef InstallXserverSetUID #ifndef InstallXserverSetUID
 #define InstallXserverSetUID NO #define InstallXserverSetUID NO
Line 1200 
Line 1200 
 LAYERDIR = LAYERDIR =
 #endif #endif
 XWINDDXDIR = hw/xwin XWINDDXDIR = hw/xwin
   XWINPARSERDIR = hw/xfree86/parser
   XWINPARSERLIB = $(XWINPARSERDIR)/LibraryTargetName(xf86config)
 XWINLIB = $(XWINDDXDIR)/LibraryTargetName(Xwin) XWINLIB = $(XWINDDXDIR)/LibraryTargetName(Xwin)
 XWINDIRS = $(STDDIRS) $(FBDIR) $(SHADOWDIR) $(LAYERDIR) $(XWINDDXDIR) \ XWINDIRS = $(STDDIRS) $(FBDIR) $(SHADOWDIR) $(LAYERDIR) $(XWINDDXDIR) \
            $(DEPDIRS)             $(DEPDIRS) $(XWINPARSERDIR)
 XWINOBJS = $(XWINDDXDIR)/stubs.o  XWINOBJS = $(XWINDDXDIR)/stubs.o $(XWINDDXDIR)/XWin.res
 #if 0 #if 0
 XWINLIBS = PreFbLibs $(XWINLIB) FbPostFbLibs $(LAYER) $(SHADOW)  XWINLIBS = PreFbLibs $(XWINLIB) FbPostFbLibs $(LAYER) $(SHADOW) \
              $(XWINPARSERLIB)
 #else #else
 XWINLIBS = PreFbLibs $(XWINLIB) FbPostFbLibs $(SHADOW)  XWINLIBS = PreFbLibs $(XWINLIB) FbPostFbLibs $(SHADOW) \
              $(XWINPARSERLIB)
 #endif #endif
 XWINSYSLIBS = $(FONTLIBS) $(LDPRELIBS) $(XLIB) $(SYSLIBS) -lgdi32 XWINSYSLIBS = $(FONTLIBS) $(LDPRELIBS) $(XLIB) $(SYSLIBS) -lgdi32
  
Line 1338 
Line 1342 
           $(HPDDXDIR) $(XFREE86DDXDIR) $(XWINDDXDIR) $(DARWINDDXDIR) \           $(HPDDXDIR) $(XFREE86DDXDIR) $(XWINDDXDIR) $(DARWINDDXDIR) \
           $(XVFBDDXDIR) $(XNESTDDXDIR)           $(XVFBDDXDIR) $(XNESTDDXDIR)
 SUBDIRS = $(STDDIRS) $(MFBDIR) $(CFBDIRS) $(IPLANDIRS) $(ILBMDIR) $(AFBDIR) \ SUBDIRS = $(STDDIRS) $(MFBDIR) $(CFBDIRS) $(IPLANDIRS) $(ILBMDIR) $(AFBDIR) \
           $(LMFCFBDIR) $(DDXDIRS) $(FBDIR) $(KDRIVEDIRS) $(MIEXTDIRS)            $(LMFCFBDIR) $(DDXDIRS) $(FBDIR) $(KDRIVEDIRS) $(MIEXTDIRS) \
             $(XWINPARSERDIR)
  
 #if  defined(ServerToInstall) && \ #if  defined(ServerToInstall) && \
     !defined(OS2Architecture)     !defined(OS2Architecture)


Legend:
Removed from v.3.265  
changed lines
  Added in v.3.266

Powered by
ViewCVS 0.9.2