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
5 LinkRule($@,$(LDOPTIONS),objects,libs $(LDLIBS) syslibs) @@\
7 -Concat(load,server): @@\
8 +Concat(load,server): subdirs objects libs @@\
9 MoveToBakFile(ProgramTargetName(server)) @@\
10 LinkRule(ProgramTargetName(server),$(LDOPTIONS),objects,libs $(LDLIBS) syslibs) @@\
12 @@ -2633,6 +2633,10 @@
16 +#ifndef SubdirsTarget
17 +#define SubdirsTarget all
21 * LangNamedTargetSubdirs - recursively make a series of steps
25 #ifndef LangMakeSubdirs
26 #define LangMakeSubdirs(lang,dirs) @@\
27 -LangNamedMakeSubdirs(lang,all,dirs)
28 +LangNamedMakeSubdirs(lang,SubdirsTarget,dirs)
29 #endif /* LangMakeSubdirs */
32 @@ -2696,8 +2700,19 @@
35 #define MakeSubdirs(dirs) @@\
36 -NamedMakeSubdirs(all,dirs)
37 +NamedMakeSubdirs(SubdirsTarget,dirs)
38 #endif /* MakeSubdirs */
40 +#ifndef MakeSubdirsDep
41 +#define MakeSubdirsDep(dirs,dep) @@\
43 + @MakeFlagsToShellFlags(ik,set +e); \ @@\
44 + for i in dirs ;\ @@\
46 + echo "making" all "in $(CURRENT_DIR)/$$i..."; \ @@\
47 + MakeNamedTargetSubdir ($$i,PassCDebugFlags,all);\ @@\
49 +#endif /* MakeSubdirsDep */
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
56 #include <Threads.tmpl>
60 +#define SubdirsTarget all.subdirs
62 #define PassCDebugFlags
68 -NormalDepLibraryTarget($(LIBNAME),$(GLXSUBDIRS) $(DONES),$(UOBJS))
69 +NormalDepLibraryTarget($(LIBNAME),all.subdirs,$(UOBJS))
70 InstallLibrary($(LIBNAME),$(USRLIBDIR))
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
82 -DebuggedDepLibraryTarget($(LIBNAME),$(GLXSUBDIRS) $(DONES),$(DOBJS))
83 +DebuggedDepLibraryTarget($(LIBNAME),all.subdirs,$(DOBJS))
84 InstallLibrary($(LIBNAME)_d,$(USRLIBDIR))
87 -ProfiledDepLibraryTarget($(LIBNAME),$(GLXSUBDIRS) $(DONES),$(POBJS))
88 +ProfiledDepLibraryTarget($(LIBNAME),all.subdirs,$(POBJS))
89 InstallLibrary($(LIBNAME)_p,$(USRLIBDIR))
94 #if BuildXF86DRI && !GlxUseSGISI && (!GlxBuiltInMesa || !defined(GlxDriverUsesMesa))
95 OSMESASUBDIRS = mesa/src/OSmesa
96 -MakeSubdirs($(OSMESASUBDIRS))
98 +MakeSubdirsDep($(OSMESASUBDIRS),lib$(LIBNAME).so.$(SOREV))
100 +MakeSubdirsDep($(OSMESASUBDIRS),lib$(LIBNAME).a)
107 DRIVERSUBDIRS = mesa/src/drv
109 -MakeSubdirs($(DRIVERSUBDIRS))
111 +MakeSubdirsDep($(DRIVERSUBDIRS),lib$(LIBNAME).so.$(SOREV))
113 +MakeSubdirsDep($(DRIVERSUBDIRS),lib$(LIBNAME).a)
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
121 #include <Server.tmpl>
124 +#undef SubdirsTarget
125 +#define SubdirsTarget all.subdirs
127 #define DoNormalLib NormalLibFont
128 #define DoSharedLib SharedLibFont
129 @@ -119,31 +121,30 @@
130 #define _LinkBuildLibrary(lib) LinkBuildLibrary(lib)
133 -NormalDepLibraryTarget($(LIBNAME),$(SUBDIRS) $(DONES),$(STATIC_OBJS))
134 +NormalDepLibraryTarget($(LIBNAME),all.subdirs,$(STATIC_OBJS))
135 InstallLibrary($(LIBNAME),$(USRLIBDIR))
136 #endif /* NormalLibFont */
139 -SharedDepLibraryTarget($(LIBNAME),$(SOREV),$(SUBDIRS) $(DONES),$(SHARED_OBJS),.,.)
140 +SharedDepLibraryTarget($(LIBNAME),$(SOREV),all.subdirs,$(SHARED_OBJS),.,.)
141 InstallSharedLibrary($(LIBNAME),$(SOREV),$(SHLIBDIR))
142 #endif /* SharedLibFont */
145 -DebuggedDepLibraryTarget(Xfont,$(SUBDIRS) $(DONES),$(DEBUG_OBJS))
146 +DebuggedDepLibraryTarget(Xfont,all.subdirs,$(DEBUG_OBJS))
147 InstallLibrary($(LIBNAME)_d,$(USRLIBDIR))
148 #endif /* DebugLibFont */
151 -ProfiledDepLibraryTarget(Xfont,$(SUBDIRS) $(DONES),$(PROFILE_OBJS))
152 +ProfiledDepLibraryTarget(Xfont,all.subdirs,$(PROFILE_OBJS))
153 InstallLibrary($(LIBNAME)_p,$(USRLIBDIR))
154 #endif /* ProfileLibFont */
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))
164 -ForceSubdirs($(SUBDIRS))
165 +MakeSubdirs($(SUBDIRS))
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
171 #include <Server.tmpl>
174 +#undef SubdirsTarget
175 +#define SubdirsTarget all.subdirs
177 SUBDIRS = lbx_zlib delta image
180 #undef _LinkBuildLibrary
181 #define _LinkBuildLibrary(lib) LinkBuildLibrary(lib)
183 -NormalDepLibraryTarget(lbxutil,$(SUBDIRS) $(DONES),$(OBJS))
184 +NormalDepLibraryTarget(lbxutil,all.subdirs,$(OBJS))
186 -ForceSubdirs($(SUBDIRS))
187 +MakeSubdirs($(SUBDIRS))
189 DependSubdirs($(SUBDIRS))
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
194 #include <Server.tmpl>
197 +#undef SubdirsTarget
198 +#define SubdirsTarget all.subdirs
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))
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
217 #include <Server.tmpl>
220 +#undef SubdirsTarget
221 +#define SubdirsTarget all.subdirs
224 CORE_SUBDIR = /* opengl */
229 -DepLibraryModuleTarget(glx,$(SUBDIRS) $(DONES) $(MOBJS),$(OBJS))
230 +DepLibraryModuleTarget(glx,all.subdirs $(MOBJS),$(OBJS))
232 InstallLibraryModule(glx,$(MODULEDIR),extensions)
233 -ForceSubdirs($(SUBDIRS))
234 +MakeSubdirs($(SUBDIRS))
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
241 #include <Server.tmpl>
244 +#undef SubdirsTarget
245 +#define SubdirsTarget all.subdirs
247 #ifndef PexDipexCDebugFlags
248 #define PexDipexCDebugFlags ServerCDebugFlags
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))
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
264 DONES = request/DONE import/DONE process/DONE export/DONE
267 +#undef SubdirsTarget
268 +#define SubdirsTarget all.subdirs
276 -DepLibraryModuleTarget(dixie,$(SUBDIRS) $(DONES),$(OBJS))
277 +DepLibraryModuleTarget(dixie,all.subdirs,$(OBJS))
279 -ForceSubdirs($(SUBDIRS))
280 +MakeSubdirs($(SUBDIRS))
282 DependSubdirs($(SUBDIRS))
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
290 +#undef SubdirsTarget
291 +#define SubdirsTarget all.subdirs
299 -DepLibraryModuleTarget(mixie,$(SUBDIRS) $(DONES),$(OBJS))
300 +DepLibraryModuleTarget(mixie,all.subdirs,$(OBJS))
302 -ForceSubdirs($(SUBDIRS))
303 +MakeSubdirs($(SUBDIRS))
305 DependSubdirs($(SUBDIRS))
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
310 #include <Server.tmpl>
313 +#undef SubdirsTarget
314 +#define SubdirsTarget all.subdirs
317 SUBDIRS = dixie mixie
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))
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
334 NormalLibraryObjectRule()
336 +#if !DoLoadableServer
337 ForceSubdirs($(SUBDIRS))
340 DependSubdirs($(SUBDIRS))
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
346 #include <Server.tmpl>
348 +#undef SubdirsTarget
349 +#define SubdirsTarget all.subdirs
352 JOYSTICKDIR = joystick
356 #if !DoLoadableServer
357 -NormalDepLibraryTarget(idriver,$(SUBDIRS) $(DONES) idriver.list,$(OBJS))
358 +NormalDepLibraryTarget(idriver,all.subdirs idriver.list,$(OBJS))
361 #if !DoLoadableServer
364 NormalLibraryObjectRule()
366 -ForceSubdirs($(SUBDIRS))
367 +MakeSubdirs($(SUBDIRS))
369 DependSubdirs($(SUBDIRS))
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
374 #include <Server.tmpl>
377 +#undef SubdirsTarget
378 +#define SubdirsTarget all.subdirs
380 #if defined(i386Architecture) || defined(ia64Architecture) || \
381 (defined(LinuxArchitecture) && defined(AlphaArchitecture)) || \
382 @@ -123,13 +125,13 @@
386 -NormalDepLibraryTarget(xf86_os,$(SUBDIRS) $(DONES),$(OBJS))
387 +NormalDepLibraryTarget(xf86_os,all.subdirs,$(OBJS))
390 LinkSourceFile(snprintf.c,$(LIBSRC)/misc)
393 -ForceSubdirs($(SUBDIRS))
394 +MakeSubdirs($(SUBDIRS))
396 DependSubdirs($(SUBDIRS))
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
401 #include <Server.tmpl>
404 +#undef SubdirsTarget
405 +#define SubdirsTarget all.subdirs
407 EXPSRCS = lsb_first/?*.c msb_first/?*.c lsb_fixed/?*.c msb_fixed/?*.c
410 ObjectFromSpecialSource(xaaSeg, xaaLine, -DPOLYSEGMENT)
411 ObjectFromSpecialSource(xaaDashSeg, xaaDashLine, -DPOLYSEGMENT)
413 -DepLibraryModuleTarget(xaa, $(OBJS) $(SUBDIRS) $(DONES), $(OBJS) $(EXPOBJS))
414 +DepLibraryModuleTarget(xaa, $(OBJS) all.subdirs, $(OBJS) $(EXPOBJS))
416 InstallLibraryModule(xaa,$(MODULEDIR),.)
421 -ForceSubdirs($(SUBDIRS))
422 +MakeSubdirs($(SUBDIRS))
423 DependSubdirs($(SUBDIRS))
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
429 MakeMutex($(XF86SERVERSUBDIRS) $(XF86SERVERLIBS) $(XF86SERVERSYSLIBS))
431 #if ForceServerRemake
432 -$(XF86SERVERLIBS) $(XF86SERVERSYSLIBS):: $(XF86SERVERSUBDIRS)
433 +$(XF86SERVEROBJS) $(XF86SERVERLIBS) $(XF86SERVERSYSLIBS):: all.subdirs
434 @if [ -f $@ ]; then touch $@; fi
436 SetUIDServerTarget(XFree86,$(XF86SERVERSUBDIRS),$(XF86SERVEROBJS),$(XF86SERVERLIBS),$(XF86SERVERSYSLIBS))
438 MakeMutex($(FBDEVDIRS) $(FBDEVOBJS) $(FBDEVLIBS) $(FBDEVSYSLIBS))
440 #if ForceServerRemake
441 -$(FBDEVOBJS) $(XFBDEV) $(FBDEVLIBS) $(FBDEVSYSLIBS):: $(FBDEVDIRS)
442 +$(FBDEVOBJS) $(FBDEVLIBS) $(FBDEVSYSLIBS):: all.subdirs
443 @if [ -f $@ ]; then touch $@; fi
445 ServerTarget(Xfbdev,$(FBDEVDIRS),$(FBDEVOBJS),$(FBDEVLIBS),$(FBDEVSYSLIBS))
447 MakeMutex($(SAVAGEDIRS) $(SAVAGEOBJS) $(SAVAGELIBS) $(SAVAGESYSLIBS))
449 #if ForceServerRemake
450 -$(SAVAGEOBJS) $(XSAVAGE) $(SAVAGELIBS) $(SAVAGESYSLIBS):: $(SAVAGEDIRS)
451 +$(SAVAGEOBJS) $(SAVAGELIBS) $(SAVAGESYSLIBS):: all.subdirs
452 @if [ -f $@ ]; then touch $@; fi
454 ServerTarget(Xsavage,$(SAVAGEDIRS),$(SAVAGEOBJS),$(SAVAGELIBS),$(SAVAGESYSLIBS))
456 MakeMutex($(TRIDENTDIRS) $(TRIDENTLIBS) $(TRIDENTSYSLIBS))
458 #if ForceServerRemake
459 -$(TRIDENTOBJS) $(TRIDENTLIBS) $(TRIDENTSYSLIBS):: $(TRIDENTDIRS)
460 +$(TRIDENTOBJS) $(TRIDENTLIBS) $(TRIDENTSYSLIBS):: all.subdirs
461 @if [ -f $@ ]; then touch $@; fi
463 ServerTarget(Xtrident,$(TRIDENTDIRS),$(TRIDENTOBJS),$(TRIDENTLIBS),$(TRIDENTSYSLIBS))
465 MakeMutex($(SIS530DIRS) $(SIS530OBJS) $(SIS530LIBS) $(SIS530SYSLIBS))
467 #if ForceServerRemake
468 -$(SIS530OBJS) $(SIS530LIBS) $(SIS530SYSLIBS):: $(SIS530DIRS)
469 +$(SIS530OBJS) $(SIS530LIBS) $(SIS530SYSLIBS):: all.subdirs
470 @if [ -f $@ ]; then touch $@; fi
472 ServerTarget(Xsis530,$(SIS530DIRS),$(SIS530OBJS),$(SIS530LIBS),$(SIS530SYSLIBS))
474 MakeMutex($(TRIODIRS) $(TRIOOBJS) $(TRIOLIBS) $(TRIOSYSLIBS))
476 #if ForceServerRemake
477 -$(TRIOOBJS) $(TRIOLIBS) $(TRIOSYSLIBS):: $(TRIODIRS)
478 +$(TRIOOBJS) $(TRIOLIBS) $(TRIOSYSLIBS):: all.subdirs
479 @if [ -f $@ ]; then touch $@; fi
481 ServerTarget(Xtrio,$(TRIODIRS),$(TRIOOBJS),$(TRIOLIBS),$(TRIOSYSLIBS))
483 MakeMutex($(TS300DIRS) $(TS300OBJS) $(TS300LIBS) $(TS300SYSLIBS))
485 #if ForceServerRemake
486 -$(TS300OBJS) $(TS300LIBS) $(TS300SYSLIBS):: $(TS300DIRS)
487 +$(TS300OBJS) $(TS300LIBS) $(TS300SYSLIBS):: all.subdirs
488 @if [ -f $@ ]; then touch $@; fi
490 ServerTarget(Xts300,$(TS300DIRS),$(TS300OBJS),$(TS300LIBS),$(TS300SYSLIBS))
492 MakeMutex($(ITSYDIRS) $(ITSYOBJS) $(ITSYLIBS) $(ITSYSYSLIBS))
494 #if ForceServerRemake
495 -$(ITSYOBJS) $(ITSYLIBS) $(ITSYSYSLIBS):: $(ITSYDIRS)
496 +$(ITSYOBJS) $(ITSYLIBS) $(ITSYSYSLIBS):: all.subdirs
497 @if [ -f $@ ]; then touch $@; fi
499 ServerTarget(Xitsy,$(ITSYDIRS),$(ITSYOBJS),$(ITSYLIBS),$(ITSYSYSLIBS))
501 MakeMutex($(XPSUBDIRS) $(XPOBJS) $(XPLIBS) $(XPSYSLIBS))
503 #if ForceServerRemake
504 -$(XPOBJS) $(XPLIBS) $(XPSYSLIBS):: $(XPSUBDIRS)
505 +$(XPOBJS) $(XPLIBS) $(LOADABLEEXTS) $(LIBCWRAPPER) $(XPSYSLIBS):: all.subdirs
506 @if [ -f $@ ]; then touch $@; fi
508 ServerTarget(Xprt,$(XPSUBDIRS),$(XPOBJS),$(XPLIBS) $(LOADABLEEXTS) $(LIBCWRAPPER),$(XPSYSLIBS))
509 @@ -1005,7 +1005,7 @@
510 MakeMutex($(XNESTDIRS) $(XNESTOBJS) $(XNESTLIBS) $(XNESTSYSLIBS))
512 #if ForceServerRemake
513 -$(XNESTOBJS) $(XNESTLIBS) $(XNESTSYSLIBS):: $(XNESTDIRS)
514 +$(XNESTOBJS) $(XNESTLIBS) $(LOADABLEEXTS) $(LIBCWRAPPER) $(XNESTSYSLIBS):: all.subdirs
515 @if [ -f $@ ]; then touch $@; fi
517 ServerTarget(Xnest,$(XNESTDIRS),$(XNESTOBJS), \
518 @@ -1070,7 +1070,7 @@
519 MakeMutex($(XVFBDIRS) $(XVFBOBJS) $(XVFB) $(XVFBLIBS) $(XVFBSYSLIBS))
521 #if ForceServerRemake
522 -$(XVFBOBJS) $(XVFB) $(XVFBLIBS) $(XVFBSYSLIBS):: $(XVFBDIRS)
523 +$(XVFBOBJS) $(XVFB) $(XVFBLIBS) $(LOADABLEEXTS) $(LIBCWRAPPER) $(XVFBSYSLIBS):: all.subdirs
524 @if [ -f $@ ]; then touch $@; fi
526 ServerTarget(Xvfb,$(XVFBDIRS),$(XVFBOBJS), \
527 @@ -1130,11 +1130,13 @@
531 +#undef SubdirsTarget
532 +#define SubdirsTarget all.subdirs
534 DependSubdirs($(SUBDIRS))
535 MakeLintLibSubdirs($(SUBDIRS))
536 LintSubdirs($(SUBDIRS))
538 -ForceSubdirs($(DEPDIRS) $(SUBDIRS))
539 +MakeSubdirs($(DEPDIRS) $(SUBDIRS))
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
546 LinkBuildBinary(ProgramTargetName(xkbcomp))
548 -MakeSubdirs($(SUBDIRS))
549 +MakeSubdirsDep($(SUBDIRS),$(BUILDBINDIR)/xkbcomp)
551 #ifdef OS2Architecture
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
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
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
571 $(IMAKESRC)/Makefile.proto: depend.bootstrap
572 $(IMAKE_CMD) -s $(IMAKESRC)/Makefile.proto -f $(IMAKESRC)/Imakefile -DTOPDIR=$(IMAKETOP) -DCURDIR=$(IMAKESRC) -DBootStrap