1 --- XFree86-4.0/xc/config/cf/Imake.rules.shared Fri May 12 09:52:32 2000
2 +++ XFree86-4.0/xc/config/cf/Imake.rules Fri May 12 09:57:14 2000
4 #ifndef LibraryModuleTarget
6 #define LibraryModuleTarget(module,objects) @@\
7 +NormalLibraryTarget(module, objects) @@\
8 DynamicModuleTarget(Concat3(lib,module,.so), objects)
10 #define LibraryModuleTarget(module, objects) @@\
12 #ifndef DepLibraryModuleTarget
14 #define DepLibraryModuleTarget(module,deplist,objects) @@\
15 +NormalDepLibraryTarget(module, deplist, objects) @@\
16 DepDynamicModuleTarget(Concat3(lib,module,.so), deplist, objects)
18 #define DepLibraryModuleTarget(module,deplist,objects) @@\
19 --- XFree86-4.0/xc/programs/Xserver/GL/Imakefile.shared Sat Feb 26 00:37:09 2000
20 +++ XFree86-4.0/xc/programs/Xserver/GL/Imakefile Fri May 12 01:08:54 2000
25 -NormalDepLibraryTarget(glx,$(SUBDIRS) $(DONES) $(MOBJS),$(OBJS))
26 +DepLibraryModuleTarget(glx,$(SUBDIRS) $(DONES) $(MOBJS),$(OBJS))
28 InstallLibraryModule(glx,$(MODULEDIR),extensions)
29 ForceSubdirs($(SUBDIRS))
30 --- XFree86-4.0/xc/programs/Xserver/fb/Imakefile.shared Sat Feb 26 00:37:40 2000
31 +++ XFree86-4.0/xc/programs/Xserver/fb/Imakefile Fri May 12 01:08:54 2000
35 NormalLibraryObjectRule()
36 -NormalLibraryTarget(fb,$(OBJS))
37 +LibraryModuleTarget(fb,$(OBJS))
38 LintLibraryTarget(fb,$(SRCS))
40 NormalLintTarget($(SRCS))
41 --- XFree86-4.0/xc/programs/Xserver/Imakefile.shared Fri May 12 09:27:35 2000
42 +++ XFree86-4.0/xc/programs/Xserver/Imakefile Fri May 12 09:30:32 2000
47 -#if XnestServer && !MakeDllModules
51 -#if XVirtualFramebufferServer && !MakeDllModules
52 +#if XVirtualFramebufferServer
55 -#if defined(XF86Server) || (!MakeDllModules && (defined(XnestServer) || defined(XVirtualFramebufferServer)))
56 +#if defined(XF86Server) || ((defined(XnestServer) || defined(XVirtualFramebufferServer)))
57 MakeMutex($(XF86SERVER) $(XNEST) $(XVFB))
59 MakeMutex($(STDDIRS) mfb fb cfb cfb16 cfb24 cfb32)
61 KDRIVEDIRS=$(KDDIRS) $(FBDEVDIR) $(SAVAGEDIR) $(TRIDENTDIR) $(SIS530DIR) \
62 $(TRIODIR) $(TS300DIR) $(ITSYDIR)
64 -#if XprtServer && !MakeDllModules
70 ServerTarget(Xprt,$(XPSUBDIRS),$(XPOBJS),$(XPLIBS) $(LOADABLEEXTS) $(LIBCWRAPPER),$(XPSYSLIBS))
71 #endif /* XprtServer */
73 -#if XnestServer && !MakeDllModules
76 XCOMM Server with Xlib-based ddx
79 #endif /* XnonServer */
82 -#if XVirtualFramebufferServer && !MakeDllModules
83 +#if XVirtualFramebufferServer
85 XCOMM server with Virtual (malloced) framebuffer