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

Diff for /xc/programs/Xserver/Imakefile between version 3.311 and 3.312

version 3.311, 2005/03/29 17:43:25 version 3.312, 2005/06/10 14:54:06
Line 1 
Line 1 
 /* /*
  * Server Master Makefile  * Server Master Makefile
  */  */
 XCOMM $XFree86: xc/programs/Xserver/Imakefile,v 3.310tsi Exp $  XCOMM $XFree86: xc/programs/Xserver/Imakefile,v 3.311tsi Exp $
  
 /* /*
  * Copyright (c) 1994-2004 by The XFree86 Project, Inc.  * Copyright (c) 1994-2004 by The XFree86 Project, Inc.
Line 438 
Line 438 
 SUNDDXDIR = hw/sun SUNDDXDIR = hw/sun
 #if DoLoadableServer #if DoLoadableServer
 SUNOBJS = hw/sun/sunInit.o hw/sun/sunInitExt.o hw/sun/stubs.o SUNOBJS = hw/sun/sunInit.o hw/sun/sunInitExt.o hw/sun/stubs.o
 #elif defined(XF86Server) && XF86Server  
 SUNOBJS = hw/sun/sunInit.o hw/sun/stubs.o  
 #else #else
 SUNOBJS = hw/sun/sunInit.o  SUNOBJS = hw/sun/sunInit.o hw/sun/stubs.o
 #endif #endif
 #if BuildLowMem #if BuildLowMem
 SUNDIRS = $(STDDIRS) $(LMFCFBDIR) $(SUNDDXDIR) $(DEPDIRS) SUNDIRS = $(STDDIRS) $(LMFCFBDIR) $(SUNDDXDIR) $(DEPDIRS)
Line 474 
Line 472 
             $(SUNDDXDIR) $(DEPDIRS)             $(SUNDDXDIR) $(DEPDIRS)
 #if DoLoadableServer #if DoLoadableServer
 SUN24OBJS = hw/sun/sunInitMulti.o hw/sun/sunInitExt.o hw/sun/stubs.o SUN24OBJS = hw/sun/sunInitMulti.o hw/sun/sunInitExt.o hw/sun/stubs.o
 #elif defined(XF86Server) && XF86Server  
 SUN24OBJS = hw/sun/sunInitMulti.o hw/sun/stubs.o  
 #else #else
 SUN24OBJS = hw/sun/sunInitMulti.o  SUN24OBJS = hw/sun/sunInitMulti.o hw/sun/stubs.o
 #endif #endif
 SUN24LIBS = hw/sun/LibraryTargetName(sun) CFBLibs SUN24LIBS = hw/sun/LibraryTargetName(sun) CFBLibs
 SetUIDServerTarget(Xsun24,$(SUN24DIRS),$(SUN24OBJS), \ SetUIDServerTarget(Xsun24,$(SUN24DIRS),$(SUN24OBJS), \
Line 495 
Line 491 
 MFBSUBDIR = mfb MFBSUBDIR = mfb
 SUNDDXDIR = hw/sun SUNDDXDIR = hw/sun
 SUNMDIRS = $(STDDIRS) $(MFBDIR) $(SUNDDXDIR) $(DEPDIRS) SUNMDIRS = $(STDDIRS) $(MFBDIR) $(SUNDDXDIR) $(DEPDIRS)
 #if defined(XF86Server) && XF86Server  
 SUNMOBJS = hw/sun/sunInitMono.o hw/sun/sunInExMono.o hw/sun/stubs.o SUNMOBJS = hw/sun/sunInitMono.o hw/sun/sunInExMono.o hw/sun/stubs.o
 #else  
 SUNMOBJS = hw/sun/sunInitMono.o hw/sun/sunInExMono.o  
 #endif  
 SUNMLIBS = hw/sun/LibraryTargetName(sun) MFBLibs SUNMLIBS = hw/sun/LibraryTargetName(sun) MFBLibs
 SetUIDServerTarget(XsunMono,$(SUNMDIRS),$(SUNMOBJS), \ SetUIDServerTarget(XsunMono,$(SUNMDIRS),$(SUNMOBJS), \
         $(SUNMLIBS),$(FONTLIBS) $(SYSLIBS))         $(SUNMLIBS),$(FONTLIBS) $(SYSLIBS))


Legend:
Removed from v.3.311  
changed lines
  Added in v.3.312

Powered by
ViewCVS 0.9.2