*** xsrc/xc/programs/Xserver/Imakefile.orig	Fri Aug  6 07:17:45 1999
--- xsrc/xc/programs/Xserver/Imakefile	Fri Aug 13 07:41:44 1999
***************
*** 444,476 ****
  SVGALIBS = CFB8Libs
  SVGASYSLIBS = $(CBRT) -lm -lmalloc
  SetUIDServerTarget(Xsvga,$(SVGASUBDIRS),$(SVGAOBJS),$(SVGALIBS),$(SVGASYSLIBS))
  #ifndef ServerToInstall
  #define ServerToInstall Xsvga
  #endif
  #endif	/* XsvgaServer */
  
  
  #if Xmac68kServer
  XCOMM
  XCOMM NetBSD/mac68k server
  XCOMM
  MFBDIR  = mfb
  CFB8DIR = cfb
  CFB16DIR = cfb16
  CFB24DIR = cfb24
  CFB32DIR = cfb32
! DDXDIR1 = hw/netbsd/mac68k
  MACDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(CFB16DIR) $(CFB24DIR) $(CFB32DIR) \
! 		$(DDXDIR1) $(DEPDIRS)
! MACOBJS = hw/netbsd/mac68k/macInit.o hw/netbsd/mac68k/macEvent.o
! MACLIBS = hw/netbsd/mac68k/libmac.a CFBLibs
  MACSYSLIBS = $(CBRT) $(SYSLIBS)
  ServerTarget(Xmac68k,$(MACDIRS),$(MACOBJS),$(MACLIBS),$(MACSYSLIBS))
  #ifndef ServerToInstall
  #define ServerToInstall Xmac68k
  #endif
  #endif /* XmacServer */
  
  
  #if XamigaCCmono || XamigaCCcolor || XamigaGfxCardSupport
  XCOMM
--- 444,504 ----
  SVGALIBS = CFB8Libs
  SVGASYSLIBS = $(CBRT) -lm -lmalloc
  SetUIDServerTarget(Xsvga,$(SVGASUBDIRS),$(SVGAOBJS),$(SVGALIBS),$(SVGASYSLIBS))
  #ifndef ServerToInstall
  #define ServerToInstall Xsvga
  #endif
  #endif	/* XsvgaServer */
  
  
+ #if Xmac68kOSFAServer
+ XCOMM
+ XCOMM NetBSD/mac68k OSFA server
+ XCOMM
+ MFBDIR  = mfb
+ CFB8DIR = cfb
+ CFB16DIR = cfb16
+ CFB24DIR = cfb24
+ CFB32DIR = cfb32
+ DDXDIR3 = hw/netbsd/mac68k_color
+ OSFAMACDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(CFB16DIR) $(CFB24DIR) $(CFB32DIR) \
+ 		$(DDXDIR3) $(DEPDIRS)
+ OSFAMACOBJS = $(DDXDIR3)/macInit.o $(DDXDIR3)/macEvent.o
+ OSFAMACLIBS = $(DDXDIR3)/libmac.a CFBLibs 
+ MACSYSLIBS = $(CBRT) $(SYSLIBS)
+ #if HasParallelMake
+ MakeMutex($(OSFAMACDIRS),$(OSFAMACOBJS),$(OSFAMACLIBS))
+ #endif
+ ServerTarget(Xmac68k_color,$(OSFAMACDIRS),$(OSFAMACOBJS),$(OSFAMACLIBS),$(MACSYSLIBS))
+ #ifndef ServerToInstall
+ #define ServerToInstall Xmac68k_color
+ #endif
+ #endif /* XmacColorServer */
+ 
+ 
  #if Xmac68kServer
  XCOMM
  XCOMM NetBSD/mac68k server
  XCOMM
  MFBDIR  = mfb
  CFB8DIR = cfb
  CFB16DIR = cfb16
  CFB24DIR = cfb24
  CFB32DIR = cfb32
! DDXDIR2 = hw/netbsd/mac68k
  MACDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(CFB16DIR) $(CFB24DIR) $(CFB32DIR) \
! 		$(DDXDIR2) $(DEPDIRS)
! MACOBJS = $(DDXDIR2)/macInit.o $(DDXDIR2)/macEvent.o
! MACLIBS = $(DDXDIR2)/libmac.a CFBLibs
  MACSYSLIBS = $(CBRT) $(SYSLIBS)
+ #if HasParallelMake
+ MakeMutex($(MACDIRS),$(MACOBJS),$(MACLIBS))
+ #endif
  ServerTarget(Xmac68k,$(MACDIRS),$(MACOBJS),$(MACLIBS),$(MACSYSLIBS))
  #ifndef ServerToInstall
  #define ServerToInstall Xmac68k
  #endif
  #endif /* XmacServer */
  
  
  #if XamigaCCmono || XamigaCCcolor || XamigaGfxCardSupport
  XCOMM