]>
Commit | Line | Data |
---|---|---|
ddd419a0 | 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 | |
3 | @@ -3082,6 +3082,7 @@ | |
4 | #ifndef LibraryModuleTarget | |
5 | #if MakeDllModules | |
6 | #define LibraryModuleTarget(module,objects) @@\ | |
7 | +NormalLibraryTarget(module, objects) @@\ | |
8 | DynamicModuleTarget(Concat3(lib,module,.so), objects) | |
9 | #else | |
10 | #define LibraryModuleTarget(module, objects) @@\ | |
11 | @@ -3095,6 +3096,7 @@ | |
12 | #ifndef DepLibraryModuleTarget | |
13 | #if MakeDllModules | |
14 | #define DepLibraryModuleTarget(module,deplist,objects) @@\ | |
15 | +NormalDepLibraryTarget(module, deplist, objects) @@\ | |
16 | DepDynamicModuleTarget(Concat3(lib,module,.so), deplist, objects) | |
17 | #else | |
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 | |
21 | @@ -42,7 +42,7 @@ | |
22 | ||
23 | ModuleObjectRule() | |
24 | ||
25 | -NormalDepLibraryTarget(glx,$(SUBDIRS) $(DONES) $(MOBJS),$(OBJS)) | |
26 | +DepLibraryModuleTarget(glx,$(SUBDIRS) $(DONES) $(MOBJS),$(OBJS)) | |
27 | ||
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 | |
32 | @@ -79,7 +79,7 @@ | |
33 | ../mi/llib-lmi.ln | |
34 | ||
35 | NormalLibraryObjectRule() | |
36 | -NormalLibraryTarget(fb,$(OBJS)) | |
37 | +LibraryModuleTarget(fb,$(OBJS)) | |
38 | LintLibraryTarget(fb,$(SRCS)) | |
39 | ||
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 | |
43 | @@ -527,13 +527,13 @@ | |
44 | #if XF86Server | |
45 | XF86SERVER = XFree86 | |
46 | #endif | |
47 | -#if XnestServer && !MakeDllModules | |
48 | +#if XnestServer | |
49 | XNEST = Xnest | |
50 | #endif | |
51 | -#if XVirtualFramebufferServer && !MakeDllModules | |
52 | +#if XVirtualFramebufferServer | |
53 | XVFB = Xvfb | |
54 | #endif | |
55 | -#if defined(XF86Server) || (!MakeDllModules && (defined(XnestServer) || defined(XVirtualFramebufferServer))) | |
56 | +#if defined(XF86Server) || ((defined(XnestServer) || defined(XVirtualFramebufferServer))) | |
57 | MakeMutex($(XF86SERVER) $(XNEST) $(XVFB)) | |
58 | #endif | |
59 | MakeMutex($(STDDIRS) mfb fb cfb cfb16 cfb24 cfb32) | |
60 | @@ -863,7 +863,7 @@ | |
61 | KDRIVEDIRS=$(KDDIRS) $(FBDEVDIR) $(SAVAGEDIR) $(TRIDENTDIR) $(SIS530DIR) \ | |
62 | $(TRIODIR) $(TS300DIR) $(ITSYDIR) | |
63 | ||
64 | -#if XprtServer && !MakeDllModules | |
65 | +#if XprtServer | |
66 | XCOMM | |
67 | XCOMM Print Server | |
68 | XCOMM | |
69 | @@ -896,7 +896,7 @@ | |
70 | ServerTarget(Xprt,$(XPSUBDIRS),$(XPOBJS),$(XPLIBS) $(LOADABLEEXTS) $(LIBCWRAPPER),$(XPSYSLIBS)) | |
71 | #endif /* XprtServer */ | |
72 | ||
73 | -#if XnestServer && !MakeDllModules | |
74 | +#if XnestServer | |
75 | XCOMM | |
76 | XCOMM Server with Xlib-based ddx | |
77 | XCOMM | |
78 | @@ -945,7 +945,7 @@ | |
79 | #endif /* XnonServer */ | |
80 | ||
81 | ||
82 | -#if XVirtualFramebufferServer && !MakeDllModules | |
83 | +#if XVirtualFramebufferServer | |
84 | XCOMM | |
85 | XCOMM server with Virtual (malloced) framebuffer | |
86 | XCOMM |