]> git.pld-linux.org Git - packages/X11.git/blame - XFree86-parallelmake.patch
projects / packages / X11.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- cleanup
[packages/X11.git] / XFree86-parallelmake.patch
CommitLineData
742a77f5 1--- XFree86-4.0.1/xc/config/cf/Imake.rules.pmake Wed Oct 25 13:16:57 2000
2+++ XFree86-4.0.1/xc/config/cf/Imake.rules Wed Oct 25 15:51:01 2000
3@@ -1027,7 +1027,7 @@
4 MoveToBakFile($@) @@\
5 LinkRule($@,$(LDOPTIONS),objects,libs $(LDLIBS) syslibs) @@\
6 @@\
7-Concat(load,server): @@\
8+Concat(load,server): subdirs objects libs @@\
9 MoveToBakFile(ProgramTargetName(server)) @@\
10 LinkRule(ProgramTargetName(server),$(LDOPTIONS),objects,libs $(LDLIBS) syslibs) @@\
11 @@\
12@@ -2633,6 +2633,10 @@
13 #endif
14
15
16+#ifndef SubdirsTarget
17+#define SubdirsTarget all
18+#endif
19+
20 /*
21 * LangNamedTargetSubdirs - recursively make a series of steps
22 */
23@@ -2662,7 +2666,7 @@
24
25 #ifndef LangMakeSubdirs
26 #define LangMakeSubdirs(lang,dirs) @@\
27-LangNamedMakeSubdirs(lang,all,dirs)
28+LangNamedMakeSubdirs(lang,SubdirsTarget,dirs)
29 #endif /* LangMakeSubdirs */
30
31
32@@ -2696,8 +2700,19 @@
33
34 #ifndef MakeSubdirs
35 #define MakeSubdirs(dirs) @@\
36-NamedMakeSubdirs(all,dirs)
37+NamedMakeSubdirs(SubdirsTarget,dirs)
38 #endif /* MakeSubdirs */
39+
40+#ifndef MakeSubdirsDep
41+#define MakeSubdirsDep(dirs,dep) @@\
42+all:: dep @@\
43+ @MakeFlagsToShellFlags(ik,set +e); \ @@\
44+ for i in dirs ;\ @@\
45+ do \ @@\
46+ echo "making" all "in $(CURRENT_DIR)/$$i..."; \ @@\
47+ MakeNamedTargetSubdir ($$i,PassCDebugFlags,all);\ @@\
48+ done
49+#endif /* MakeSubdirsDep */
50
51
52 /*
53--- XFree86-4.0.1/xc/lib/GL/Imakefile.pmake Sun Sep 24 15:50:59 2000
54+++ XFree86-4.0.1/xc/lib/GL/Imakefile Wed Oct 25 15:51:38 2000
55@@ -3,6 +3,8 @@
56 #include <Threads.tmpl>
57
58 #define IHaveSubdirs
59+#undef SubdirsTarget
60+#define SubdirsTarget all.subdirs
61
62 #define PassCDebugFlags
63
64@@ -292,11 +294,11 @@
65
66
67 #if NormalLibGlx
68-NormalDepLibraryTarget($(LIBNAME),$(GLXSUBDIRS) $(DONES),$(UOBJS))
69+NormalDepLibraryTarget($(LIBNAME),all.subdirs,$(UOBJS))
70 InstallLibrary($(LIBNAME),$(USRLIBDIR))
71 #endif
72 #if SharedLibGlx
73-SharedDepLibraryTarget($(LIBNAME),$(SOREV),$(GLXSUBDIRS) $(DONES),$(OBJS) $(THREADOBJS),.,.)
74+SharedDepLibraryTarget($(LIBNAME),$(SOREV),all.subdirs,$(OBJS) $(THREADOBJS),.,.)
75 InstallSharedLibrary($(LIBNAME),$(SOREV),$(SHLIBDIR))
76 #if LinkGLToUsrLib && AlternateUsrLibDir
77 install::
78@@ -308,11 +310,11 @@
79 #endif
80 #endif
81 #if DebugLibGlx
82-DebuggedDepLibraryTarget($(LIBNAME),$(GLXSUBDIRS) $(DONES),$(DOBJS))
83+DebuggedDepLibraryTarget($(LIBNAME),all.subdirs,$(DOBJS))
84 InstallLibrary($(LIBNAME)_d,$(USRLIBDIR))
85 #endif
86 #if ProfileLibGlx
87-ProfiledDepLibraryTarget($(LIBNAME),$(GLXSUBDIRS) $(DONES),$(POBJS))
88+ProfiledDepLibraryTarget($(LIBNAME),all.subdirs,$(POBJS))
89 InstallLibrary($(LIBNAME)_p,$(USRLIBDIR))
90 #endif
91
92@@ -320,7 +322,11 @@
93
94 #if BuildXF86DRI && !GlxUseSGISI && (!GlxBuiltInMesa || !defined(GlxDriverUsesMesa))
95 OSMESASUBDIRS = mesa/src/OSmesa
96-MakeSubdirs($(OSMESASUBDIRS))
97+#if SharedLibGlx
98+MakeSubdirsDep($(OSMESASUBDIRS),lib$(LIBNAME).so.$(SOREV))
99+#else
100+MakeSubdirsDep($(OSMESASUBDIRS),lib$(LIBNAME).a)
101+#endif
102 #endif
103
104
105@@ -339,7 +345,11 @@
106
107 DRIVERSUBDIRS = mesa/src/drv
108
109-MakeSubdirs($(DRIVERSUBDIRS))
110+#if SharedLibGlx
111+MakeSubdirsDep($(DRIVERSUBDIRS),lib$(LIBNAME).so.$(SOREV))
112+#else
113+MakeSubdirsDep($(DRIVERSUBDIRS),lib$(LIBNAME).a)
114+#endif
115
116 #endif
117
118--- XFree86-4.0.1/xc/lib/font/Imakefile.pmake Tue Sep 19 14:46:06 2000
119+++ XFree86-4.0.1/xc/lib/font/Imakefile Wed Oct 25 15:54:16 2000
120@@ -3,6 +3,8 @@
121 #include <Server.tmpl>
122
123 #define IHaveSubdirs
124+#undef SubdirsTarget
125+#define SubdirsTarget all.subdirs
126
127 #define DoNormalLib NormalLibFont
128 #define DoSharedLib SharedLibFont
129@@ -119,31 +121,30 @@
130 #define _LinkBuildLibrary(lib) LinkBuildLibrary(lib)
131
132 #if NormalLibFont
133-NormalDepLibraryTarget($(LIBNAME),$(SUBDIRS) $(DONES),$(STATIC_OBJS))
134+NormalDepLibraryTarget($(LIBNAME),all.subdirs,$(STATIC_OBJS))
135 InstallLibrary($(LIBNAME),$(USRLIBDIR))
136 #endif /* NormalLibFont */
137
138 #if SharedLibFont
139-SharedDepLibraryTarget($(LIBNAME),$(SOREV),$(SUBDIRS) $(DONES),$(SHARED_OBJS),.,.)
140+SharedDepLibraryTarget($(LIBNAME),$(SOREV),all.subdirs,$(SHARED_OBJS),.,.)
141 InstallSharedLibrary($(LIBNAME),$(SOREV),$(SHLIBDIR))
142 #endif /* SharedLibFont */
143
144 #if DebugLibFont
145-DebuggedDepLibraryTarget(Xfont,$(SUBDIRS) $(DONES),$(DEBUG_OBJS))
146+DebuggedDepLibraryTarget(Xfont,all.subdirs,$(DEBUG_OBJS))
147 InstallLibrary($(LIBNAME)_d,$(USRLIBDIR))
148 #endif /* DebugLibFont */
149
150 #if ProfileLibFont
151-ProfiledDepLibraryTarget(Xfont,$(SUBDIRS) $(DONES),$(PROFILE_OBJS))
152+ProfiledDepLibraryTarget(Xfont,all.subdirs,$(PROFILE_OBJS))
153 InstallLibrary($(LIBNAME)_p,$(USRLIBDIR))
154 #endif /* ProfileLibFont */
155
156 #if BuildServer && DoLoadableServer
157-NormalDepLibraryTarget(fontbase,$(BASEDIRS) $(BASEDONES),$(BASELIBOBJS))
158-NormalDepRelocatableTarget(fontbase,$(BASEDIRS) $(BASEDONES),$(BASEOBJS))
159+NormalDepLibraryTarget(fontbase,all.subdirs,$(BASELIBOBJS))
160+NormalDepRelocatableTarget(fontbase,all.subdirs,$(BASEOBJS))
161 #endif
162
163-
164-ForceSubdirs($(SUBDIRS))
165+MakeSubdirs($(SUBDIRS))
166
167 DependSubdirs($(SUBDIRS))
168--- XFree86-4.0.1/xc/lib/lbxutil/Imakefile.pmake Sat Apr 17 11:08:13 1999
169+++ XFree86-4.0.1/xc/lib/lbxutil/Imakefile Wed Oct 25 15:51:01 2000
170@@ -8,6 +8,8 @@
171 #include <Server.tmpl>
172
173 #define IHaveSubdirs
174+#undef SubdirsTarget
175+#define SubdirsTarget all.subdirs
176
177 SUBDIRS = lbx_zlib delta image
178
179@@ -22,9 +24,9 @@
180 #undef _LinkBuildLibrary
181 #define _LinkBuildLibrary(lib) LinkBuildLibrary(lib)
182
183-NormalDepLibraryTarget(lbxutil,$(SUBDIRS) $(DONES),$(OBJS))
184+NormalDepLibraryTarget(lbxutil,all.subdirs,$(OBJS))
185
186-ForceSubdirs($(SUBDIRS))
187+MakeSubdirs($(SUBDIRS))
188
189 DependSubdirs($(SUBDIRS))
190
191--- XFree86-4.0.1/xc/programs/Xserver/GL/mesa/src/Imakefile.pmake Sun Sep 24 15:51:22 2000
192+++ XFree86-4.0.1/xc/programs/Xserver/GL/mesa/src/Imakefile Wed Oct 25 15:51:01 2000
193@@ -4,6 +4,8 @@
194 #include <Server.tmpl>
195
196 #define IHaveSubdirs
197+#undef SubdirsTarget
198+#define SubdirsTarget all.subdirs
199
200 SUBDIRS = X
201
202@@ -367,9 +369,9 @@
203
204 ModuleObjectRule()
205
206-DepLibraryModuleTarget(GLcore,$(SUBDIRS) $(DONES) $(OBJS),$(OBJS) $(XOBJS))
207+DepLibraryModuleTarget(GLcore,all.subdirs $(OBJS),$(OBJS) $(XOBJS))
208 InstallLibraryModule(GLcore,$(MODULEDIR),extensions)
209-ForceSubdirs($(SUBDIRS))
210+MakeSubdirs($(SUBDIRS))
211
212 #else
213 MakeSubdirs($(SUBDIRS))
214--- XFree86-4.0.1/xc/programs/Xserver/GL/Imakefile.pmake Fri Aug 25 00:20:08 2000
215+++ XFree86-4.0.1/xc/programs/Xserver/GL/Imakefile Wed Oct 25 15:51:01 2000
216@@ -4,6 +4,8 @@
217 #include <Server.tmpl>
218
219 #define IHaveSubdirs
220+#undef SubdirsTarget
221+#define SubdirsTarget all.subdirs
222
223 #if GlxUseSGISI
224 CORE_SUBDIR = /* opengl */
225@@ -42,10 +44,10 @@
226
227 ModuleObjectRule()
228
229-DepLibraryModuleTarget(glx,$(SUBDIRS) $(DONES) $(MOBJS),$(OBJS))
230+DepLibraryModuleTarget(glx,all.subdirs $(MOBJS),$(OBJS))
231
232 InstallLibraryModule(glx,$(MODULEDIR),extensions)
233-ForceSubdirs($(SUBDIRS))
234+MakeSubdirs($(SUBDIRS))
235
236 DependSubdirs($(SUBDIRS))
237 MakeLintLibSubdirs($(SUBDIRS))
238--- XFree86-4.0.1/xc/programs/Xserver/PEX5/Imakefile.pmake Sat Aug 14 12:49:24 1999
239+++ XFree86-4.0.1/xc/programs/Xserver/PEX5/Imakefile Wed Oct 25 15:51:01 2000
240@@ -5,6 +5,8 @@
241 #include <Server.tmpl>
242
243 #define IHaveSubdirs
244+#undef SubdirsTarget
245+#define SubdirsTarget all.subdirs
246
247 #ifndef PexDipexCDebugFlags
248 #define PexDipexCDebugFlags ServerCDebugFlags
249@@ -58,9 +60,9 @@
250
251 ModuleObjectRule()
252
253-DepLibraryModuleTarget(pex5,$(SUBDIRS) $(DONES) $(MOBJS),$(OBJS))
254+DepLibraryModuleTarget(pex5,all.subdirs $(MOBJS),$(OBJS))
255 InstallLibraryModule(pex5,$(MODULEDIR),extensions)
256-ForceSubdirs($(SUBDIRS))
257+MakeSubdirs($(SUBDIRS))
258
259 #else
260 MakeSubdirs($(SUBDIRS))
261--- XFree86-4.0.1/xc/programs/Xserver/XIE/dixie/Imakefile.pmake Fri Aug 25 00:20:11 2000
262+++ XFree86-4.0.1/xc/programs/Xserver/XIE/dixie/Imakefile Wed Oct 25 15:54:12 2000
263@@ -10,6 +10,8 @@
264 DONES = request/DONE import/DONE process/DONE export/DONE
265
266 #define IHaveSubdirs
267+#undef SubdirsTarget
268+#define SubdirsTarget all.subdirs
269
270
271 #if HasParallelMake
272@@ -20,9 +22,9 @@
273 $(DONES): $(SUBDIRS)
274 #endif
275
276-DepLibraryModuleTarget(dixie,$(SUBDIRS) $(DONES),$(OBJS))
277+DepLibraryModuleTarget(dixie,all.subdirs,$(OBJS))
278
279-ForceSubdirs($(SUBDIRS))
280+MakeSubdirs($(SUBDIRS))
281
282 DependSubdirs($(SUBDIRS))
283
284--- XFree86-4.0.1/xc/programs/Xserver/XIE/mixie/Imakefile.pmake Fri Aug 25 00:20:11 2000
285+++ XFree86-4.0.1/xc/programs/Xserver/XIE/mixie/Imakefile Wed Oct 25 15:54:48 2000
286@@ -15,6 +15,8 @@
287 #endif
288
289 #define IHaveSubdirs
290+#undef SubdirsTarget
291+#define SubdirsTarget all.subdirs
292
293
294 #if HasParallelMake
295@@ -25,9 +27,9 @@
296 $(DONES): $(SUBDIRS)
297 #endif
298
299-DepLibraryModuleTarget(mixie,$(SUBDIRS) $(DONES),$(OBJS))
300+DepLibraryModuleTarget(mixie,all.subdirs,$(OBJS))
301
302-ForceSubdirs($(SUBDIRS))
303+MakeSubdirs($(SUBDIRS))
304
305 DependSubdirs($(SUBDIRS))
306
307--- XFree86-4.0.1/xc/programs/Xserver/XIE/Imakefile.pmake Sat Aug 14 12:49:24 1999
308+++ XFree86-4.0.1/xc/programs/Xserver/XIE/Imakefile Wed Oct 25 15:51:01 2000
309@@ -5,6 +5,8 @@
310 #include <Server.tmpl>
311
312 #define IHaveSubdirs
313+#undef SubdirsTarget
314+#define SubdirsTarget all.subdirs
315
316
317 SUBDIRS = dixie mixie
318@@ -53,9 +55,9 @@
319 #endif
320
321 ModuleObjectRule()
322-DepLibraryModuleTarget(xie,$(SUBDIRS) $(DONES) $(MOBJS),$(OBJS))
323+DepLibraryModuleTarget(xie,all.subdirs $(MOBJS),$(OBJS))
324 InstallLibraryModule(xie,$(MODULEDIR),extensions)
325-ForceSubdirs($(SUBDIRS))
326+MakeSubdirs($(SUBDIRS))
327
328 DependTarget()
329
330--- XFree86-4.0.1/xc/programs/Xserver/hw/xfree86/drivers/Imakefile.pmake Fri Oct 20 16:59:00 2000
331+++ XFree86-4.0.1/xc/programs/Xserver/hw/xfree86/drivers/Imakefile Wed Oct 25 15:51:01 2000
332@@ -46,7 +46,9 @@
333
334 NormalLibraryObjectRule()
335
336+#if !DoLoadableServer
337 ForceSubdirs($(SUBDIRS))
338+#endif
339
340 DependSubdirs($(SUBDIRS))
341
342--- XFree86-4.0.1/xc/programs/Xserver/hw/xfree86/input/Imakefile.pmake Sun Mar 5 20:26:46 2000
343+++ XFree86-4.0.1/xc/programs/Xserver/hw/xfree86/input/Imakefile Wed Oct 25 15:51:01 2000
344@@ -3,6 +3,8 @@
345 #define IHaveModules
346 #include <Server.tmpl>
347 #define IHaveSubdirs
348+#undef SubdirsTarget
349+#define SubdirsTarget all.subdirs
350
351 #if JoystickSupport
352 JOYSTICKDIR = joystick
353@@ -33,7 +35,7 @@
354 $(DONES): $(SUBDIRS)
355 #endif
356 #if !DoLoadableServer
357-NormalDepLibraryTarget(idriver,$(SUBDIRS) $(DONES) idriver.list,$(OBJS))
358+NormalDepLibraryTarget(idriver,all.subdirs idriver.list,$(OBJS))
359 #endif
360 #else
361 #if !DoLoadableServer
362@@ -51,7 +53,7 @@
363
364 NormalLibraryObjectRule()
365
366-ForceSubdirs($(SUBDIRS))
367+MakeSubdirs($(SUBDIRS))
368
369 DependSubdirs($(SUBDIRS))
370
371--- XFree86-4.0.1/xc/programs/Xserver/hw/xfree86/os-support/Imakefile.pmake Thu Aug 10 19:40:34 2000
372+++ XFree86-4.0.1/xc/programs/Xserver/hw/xfree86/os-support/Imakefile Wed Oct 25 15:51:01 2000
373@@ -9,6 +9,8 @@
374 #include <Server.tmpl>
375
376 #define IHaveSubdirs
377+#undef SubdirsTarget
378+#define SubdirsTarget all.subdirs
379
380 #if defined(i386Architecture) || defined(ia64Architecture) || \
381 (defined(LinuxArchitecture) && defined(AlphaArchitecture)) || \
382@@ -123,13 +125,13 @@
383 $(DONES): $(SUBDIRS)
384 #endif
385
386-NormalDepLibraryTarget(xf86_os,$(SUBDIRS) $(DONES),$(OBJS))
387+NormalDepLibraryTarget(xf86_os,all.subdirs,$(OBJS))
388
389 #if !HasSnprintf
390 LinkSourceFile(snprintf.c,$(LIBSRC)/misc)
391 #endif
392
393-ForceSubdirs($(SUBDIRS))
394+MakeSubdirs($(SUBDIRS))
395
396 DependSubdirs($(SUBDIRS))
397
398--- XFree86-4.0.1/xc/programs/Xserver/hw/xfree86/xaa/Imakefile.pmake Wed Sep 20 04:05:41 2000
399+++ XFree86-4.0.1/xc/programs/Xserver/hw/xfree86/xaa/Imakefile Wed Oct 25 15:51:01 2000
400@@ -4,6 +4,8 @@
401 #include <Server.tmpl>
402
403 #define IHaveSubdirs
404+#undef SubdirsTarget
405+#define SubdirsTarget all.subdirs
406
407 EXPSRCS = lsb_first/?*.c msb_first/?*.c lsb_fixed/?*.c msb_fixed/?*.c
408
409@@ -52,14 +54,14 @@
410 ObjectFromSpecialSource(xaaSeg, xaaLine, -DPOLYSEGMENT)
411 ObjectFromSpecialSource(xaaDashSeg, xaaDashLine, -DPOLYSEGMENT)
412
413-DepLibraryModuleTarget(xaa, $(OBJS) $(SUBDIRS) $(DONES), $(OBJS) $(EXPOBJS))
414+DepLibraryModuleTarget(xaa, $(OBJS) all.subdirs, $(OBJS) $(EXPOBJS))
415
416 InstallLibraryModule(xaa,$(MODULEDIR),.)
417
418 DependTarget()
419
420
421-ForceSubdirs($(SUBDIRS))
422+MakeSubdirs($(SUBDIRS))
423 DependSubdirs($(SUBDIRS))
424
425
426--- XFree86-4.0.1/xc/programs/Xserver/Imakefile.pmake Wed Oct 25 15:51:01 2000
427+++ XFree86-4.0.1/xc/programs/Xserver/Imakefile Wed Oct 25 15:51:01 2000
428@@ -662,7 +662,7 @@
429 MakeMutex($(XF86SERVERSUBDIRS) $(XF86SERVERLIBS) $(XF86SERVERSYSLIBS))
430 #endif
431 #if ForceServerRemake
432-$(XF86SERVERLIBS) $(XF86SERVERSYSLIBS):: $(XF86SERVERSUBDIRS)
433+$(XF86SERVEROBJS) $(XF86SERVERLIBS) $(XF86SERVERSYSLIBS):: all.subdirs
434 @if [ -f $@ ]; then touch $@; fi
435 #endif
436 SetUIDServerTarget(XFree86,$(XF86SERVERSUBDIRS),$(XF86SERVEROBJS),$(XF86SERVERLIBS),$(XF86SERVERSYSLIBS))
437@@ -724,7 +724,7 @@
438 MakeMutex($(FBDEVDIRS) $(FBDEVOBJS) $(FBDEVLIBS) $(FBDEVSYSLIBS))
439 #endif
440 #if ForceServerRemake
441-$(FBDEVOBJS) $(XFBDEV) $(FBDEVLIBS) $(FBDEVSYSLIBS):: $(FBDEVDIRS)
442+$(FBDEVOBJS) $(FBDEVLIBS) $(FBDEVSYSLIBS):: all.subdirs
443 @if [ -f $@ ]; then touch $@; fi
444 #endif
445 ServerTarget(Xfbdev,$(FBDEVDIRS),$(FBDEVOBJS),$(FBDEVLIBS),$(FBDEVSYSLIBS))
446@@ -749,7 +749,7 @@
447 MakeMutex($(SAVAGEDIRS) $(SAVAGEOBJS) $(SAVAGELIBS) $(SAVAGESYSLIBS))
448 #endif
449 #if ForceServerRemake
450-$(SAVAGEOBJS) $(XSAVAGE) $(SAVAGELIBS) $(SAVAGESYSLIBS):: $(SAVAGEDIRS)
451+$(SAVAGEOBJS) $(SAVAGELIBS) $(SAVAGESYSLIBS):: all.subdirs
452 @if [ -f $@ ]; then touch $@; fi
453 #endif
454 ServerTarget(Xsavage,$(SAVAGEDIRS),$(SAVAGEOBJS),$(SAVAGELIBS),$(SAVAGESYSLIBS))
455@@ -804,7 +804,7 @@
456 MakeMutex($(TRIDENTDIRS) $(TRIDENTLIBS) $(TRIDENTSYSLIBS))
457 #endif
458 #if ForceServerRemake
459-$(TRIDENTOBJS) $(TRIDENTLIBS) $(TRIDENTSYSLIBS):: $(TRIDENTDIRS)
460+$(TRIDENTOBJS) $(TRIDENTLIBS) $(TRIDENTSYSLIBS):: all.subdirs
461 @if [ -f $@ ]; then touch $@; fi
462 #endif
463 ServerTarget(Xtrident,$(TRIDENTDIRS),$(TRIDENTOBJS),$(TRIDENTLIBS),$(TRIDENTSYSLIBS))
464@@ -829,7 +829,7 @@
465 MakeMutex($(SIS530DIRS) $(SIS530OBJS) $(SIS530LIBS) $(SIS530SYSLIBS))
466 #endif
467 #if ForceServerRemake
468-$(SIS530OBJS) $(SIS530LIBS) $(SIS530SYSLIBS):: $(SIS530DIRS)
469+$(SIS530OBJS) $(SIS530LIBS) $(SIS530SYSLIBS):: all.subdirs
470 @if [ -f $@ ]; then touch $@; fi
471 #endif
472 ServerTarget(Xsis530,$(SIS530DIRS),$(SIS530OBJS),$(SIS530LIBS),$(SIS530SYSLIBS))
473@@ -854,7 +854,7 @@
474 MakeMutex($(TRIODIRS) $(TRIOOBJS) $(TRIOLIBS) $(TRIOSYSLIBS))
475 #endif
476 #if ForceServerRemake
477-$(TRIOOBJS) $(TRIOLIBS) $(TRIOSYSLIBS):: $(TRIODIRS)
478+$(TRIOOBJS) $(TRIOLIBS) $(TRIOSYSLIBS):: all.subdirs
479 @if [ -f $@ ]; then touch $@; fi
480 #endif
481 ServerTarget(Xtrio,$(TRIODIRS),$(TRIOOBJS),$(TRIOLIBS),$(TRIOSYSLIBS))
482@@ -885,7 +885,7 @@
483 MakeMutex($(TS300DIRS) $(TS300OBJS) $(TS300LIBS) $(TS300SYSLIBS))
484 #endif
485 #if ForceServerRemake
486-$(TS300OBJS) $(TS300LIBS) $(TS300SYSLIBS):: $(TS300DIRS)
487+$(TS300OBJS) $(TS300LIBS) $(TS300SYSLIBS):: all.subdirs
488 @if [ -f $@ ]; then touch $@; fi
489 #endif
490 ServerTarget(Xts300,$(TS300DIRS),$(TS300OBJS),$(TS300LIBS),$(TS300SYSLIBS))
491@@ -909,7 +909,7 @@
492 MakeMutex($(ITSYDIRS) $(ITSYOBJS) $(ITSYLIBS) $(ITSYSYSLIBS))
493 #endif
494 #if ForceServerRemake
495-$(ITSYOBJS) $(ITSYLIBS) $(ITSYSYSLIBS):: $(ITSYDIRS)
496+$(ITSYOBJS) $(ITSYLIBS) $(ITSYSYSLIBS):: all.subdirs
497 @if [ -f $@ ]; then touch $@; fi
498 #endif
499 ServerTarget(Xitsy,$(ITSYDIRS),$(ITSYOBJS),$(ITSYLIBS),$(ITSYSYSLIBS))
500@@ -973,7 +973,7 @@
501 MakeMutex($(XPSUBDIRS) $(XPOBJS) $(XPLIBS) $(XPSYSLIBS))
502 #endif
503 #if ForceServerRemake
504-$(XPOBJS) $(XPLIBS) $(XPSYSLIBS):: $(XPSUBDIRS)
505+$(XPOBJS) $(XPLIBS) $(LOADABLEEXTS) $(LIBCWRAPPER) $(XPSYSLIBS):: all.subdirs
506 @if [ -f $@ ]; then touch $@; fi
507 #endif
508 ServerTarget(Xprt,$(XPSUBDIRS),$(XPOBJS),$(XPLIBS) $(LOADABLEEXTS) $(LIBCWRAPPER),$(XPSYSLIBS))
509@@ -1005,7 +1005,7 @@
510 MakeMutex($(XNESTDIRS) $(XNESTOBJS) $(XNESTLIBS) $(XNESTSYSLIBS))
511 #endif
512 #if ForceServerRemake
513-$(XNESTOBJS) $(XNESTLIBS) $(XNESTSYSLIBS):: $(XNESTDIRS)
514+$(XNESTOBJS) $(XNESTLIBS) $(LOADABLEEXTS) $(LIBCWRAPPER) $(XNESTSYSLIBS):: all.subdirs
515 @if [ -f $@ ]; then touch $@; fi
516 #endif
517 ServerTarget(Xnest,$(XNESTDIRS),$(XNESTOBJS), \
518@@ -1070,7 +1070,7 @@
519 MakeMutex($(XVFBDIRS) $(XVFBOBJS) $(XVFB) $(XVFBLIBS) $(XVFBSYSLIBS))
520 #endif
521 #if ForceServerRemake
522-$(XVFBOBJS) $(XVFB) $(XVFBLIBS) $(XVFBSYSLIBS):: $(XVFBDIRS)
523+$(XVFBOBJS) $(XVFB) $(XVFBLIBS) $(LOADABLEEXTS) $(LIBCWRAPPER) $(XVFBSYSLIBS):: all.subdirs
524 @if [ -f $@ ]; then touch $@; fi
525 #endif
526 ServerTarget(Xvfb,$(XVFBDIRS),$(XVFBOBJS), \
527@@ -1130,11 +1130,13 @@
528 #endif
529
530 #define IHaveSubdirs
531+#undef SubdirsTarget
532+#define SubdirsTarget all.subdirs
533
534 DependSubdirs($(SUBDIRS))
535 MakeLintLibSubdirs($(SUBDIRS))
536 LintSubdirs($(SUBDIRS))
537
538-ForceSubdirs($(DEPDIRS) $(SUBDIRS))
539+MakeSubdirs($(DEPDIRS) $(SUBDIRS))
540
541 InstallManPage(Xserver,$(MANDIR))
542--- XFree86-4.0.1/xc/programs/xkbcomp/Imakefile.pmake Mon Jan 31 20:33:45 2000
543+++ XFree86-4.0.1/xc/programs/xkbcomp/Imakefile Wed Oct 25 15:51:01 2000
544@@ -48,7 +48,7 @@
545
546 LinkBuildBinary(ProgramTargetName(xkbcomp))
547
548-MakeSubdirs($(SUBDIRS))
549+MakeSubdirsDep($(SUBDIRS),$(BUILDBINDIR)/xkbcomp)
550
551 #ifdef OS2Architecture
552 all::
553--- XFree86-4.0.1/xc/Makefile.pmake Wed Mar 22 22:23:30 2000
554+++ XFree86-4.0.1/xc/Makefile Wed Oct 25 15:51:01 2000
555@@ -63,6 +63,7 @@
556 $(MAKE_CMD) $(MFLAGS) Makefiles
557 $(MAKE_CMD) $(MFLAGS) clean BOOTSTRAPSUBDIRS=
558 $(MAKE_CMD) $(MFLAGS) includes
559+ $(MAKE) -C $(CONFIGSRC)/util gccmakedep
560 $(MAKE_CMD) $(MFLAGS) depend
561 $(MAKE_CMD) $(MFLAGS) $(WORLDOPTS) World
562 @echo ""
563@@ -88,7 +89,8 @@
564
565 depend.bootstrap: $(DEPENDSRC)/Makefile.proto
566 cd $(DEPENDSRC) && $(RM) -r Makefile Makefile.dep makedepend *.o bootstrap
567- cd $(DEPENDSRC) && $(MAKE) -f Makefile.proto bootstrap
568+ cd $(IMAKESRC) && mkdir X11 && cd X11 && ln -s ../../../include/* .
569+ cd $(DEPENDSRC) && $(MAKE) -f Makefile.proto makedepend
570
571 $(IMAKESRC)/Makefile.proto: depend.bootstrap
572 $(IMAKE_CMD) -s $(IMAKESRC)/Makefile.proto -f $(IMAKESRC)/Imakefile -DTOPDIR=$(IMAKETOP) -DCURDIR=$(IMAKESRC) -DBootStrap
This page took 0.166915 seconds and 4 git commands to generate.