projects / packages / XFree86-Servers.git / blame
| Commit | Line | Data |
|---|---|---|
| 3d715510 JB |
1 | --- XFree86-3.3.6/xc/programs/Xserver/Imakefile.parallel Thu Jan 20 12:52:48 2000 |
| 2 | +++ XFree86-3.3.6/xc/programs/Xserver/Imakefile Thu Jan 20 12:59:14 2000 | |
| 3 | @@ -803,6 +803,10 @@ XF86S3SYSLIBS = $(SYSLIBS) | |
| 4 | #if HasParallelMake | |
| 5 | MakeMutex($(XF86S3SUBDIRS) $(XF86S3OBJS) $(XF86S3LIBS) $(XF86S3SYSLIBS)) | |
| 6 | #endif | |
| 7 | +#if HasGnuMake | |
| 8 | +$(XF86S3OBJS) $(XF86S3LIBS) $(XF86S3SYSLIBS):: $(XF86S3SUBDIRS) | |
| 9 | + @if [ -f $@ ]; then touch $@; fi | |
| 10 | +#endif | |
| 11 | SetUIDServerTarget(XF86_S3,$(XF86S3SUBDIRS),$(XF86S3OBJS),$(XF86S3LIBS),$(XF86S3SYSLIBS)) | |
| 12 | #ifndef ServerToInstall | |
| 13 | #define ServerToInstall XF86_S3 | |
| 14 | @@ -1802,6 +1806,10 @@ CFB16DIR = cfb16 | |
| 15 | CFB32DIR = cfb32 | |
| 16 | #if HasParallelMake | |
| 17 | MakeMutex($(STDDIRS) $(MFBDIR) $(CFB8DIR) $(CFB16DIR) $(CFB32DIR) $(DEPDIRS)) | |
| 18 | +#endif | |
| 19 | +#if HasGnuMake | |
| 20 | +$(MFBDIR) $(CFB8DIR) $(CFB16DIR) $(CFB32DIR) $(DEPDIRS):: $(STDDIRS) | |
| 21 | + @if [ -f $@ ]; then touch $@; fi | |
| 22 | #endif | |
| 23 | Xnon: $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(CFB16DIR) $(CFB32DIR) $(DEPDIRS) | |
| 24 | #endif /* XnonServer */ | |
| 25 | --- XFree86-3.3.6/xc/Makefile.parallel Wed Jun 23 23:00:33 1999 | |
| 26 | +++ XFree86-3.3.6/xc/Makefile Thu Jan 20 08:58:18 2000 | |
| 27 | @@ -88,7 +88,7 @@ $(DEPENDSRC)/Makefile.proto: imake.proto | |
| 28 | ||
| 29 | depend.bootstrap: $(DEPENDSRC)/Makefile.proto | |
| 30 | cd $(DEPENDSRC) && $(RM) -r Makefile Makefile.dep makedepend *.o bootstrap | |
| 31 | - cd $(DEPENDSRC) && $(MAKE) -f Makefile.proto bootstrap | |
| 32 | + cd $(DEPENDSRC) && $(MAKE) -f Makefile.proto makedepend | |
| 33 | ||
| 34 | $(IMAKESRC)/Makefile.proto: depend.bootstrap | |
| 35 | $(IMAKE_CMD) -s $(IMAKESRC)/Makefile.proto -f $(IMAKESRC)/Imakefile -DTOPDIR=$(IMAKETOP) -DCURDIR=$(IMAKESRC) |