head 1.6; access; symbols libdrm-1_0_4:1.6 trunk-20040613:1.6 mach64-last-merge:1.6 driinterface-0-0-3-20040303-merge:1.6 driinterface-0-0-3-20040303-premerge:1.6 driinterface-0-0-3-20040303:1.6 driinterface-0-0-3-branch:1.6.0.16 mach64-0-0-7-branch:1.6.0.14 driinterface-0-0-2-branch:1.6.0.12 newmesa-0-0-1-20031209-merge:1.6 trunk-20031209:1.6 newmesa-0-0-1-20031209:1.6 newmesa-0-0-1-branch:1.6.0.10 driinterface-0-0-1-branch:1.6.0.8 savage-2-0-0-branch:1.6.0.6 savage-2-0-0-fork:1.6 dynamic-0-0-1-branch:1.6.0.4 config-0-0-1-20031005-freeze:1.5 savage-1_0_0-20031002-trunk-premerge:1.5 cle266-0-0-1-branch:1.6.0.2 i865-agp-0-1-20030929:1.5 trunk-20030916:1.6 XFree86-4_3_99_12-merge:1.6 X_4_3_99_12:1.1.1.10 trunk-20030912:1.5 i865-agp-0-1-20030905:1.5 i865-agp-0-1-20030728:1.5 i865-agp-0-1-20030707:1.5 savage-1_0_0-branch:1.5.0.10 newdrm-0-0-1-branch:1.5.0.8 i865-agp-0-1-branch:1.5.0.6 config-0-0-1-branch:1.5.0.4 texmem-0-0-1-20030429-merge:1.5 texmem-0-0-1-20030429-premerge:1.5 texmem-0-0-1-20030407:1.3.46.2 trident-0-0-2-branch:1.5.0.2 mach64-0-0-6-20030330:1.4.12.1 mach64-0-0-6-20030329-freeze:1.4 texmem-0-0-1-20030328-freeze:1.3.46.1 X_4_3_0-20030324-merge:1.1.1.9 X_4_3_0-20020324-preimport:1.4 drm-filp-0-1-branch:1.4.0.14 mesa-4-0-4-20030222:1.4 bsd-4-0-0-20030221-merge:1.4 bsd-4-0-0-20030220:1.4 bsd-4-0-0-20030220-freeze:1.4 mesa-4-0-4-20030216:1.4 mach64-0-0-6-branch:1.4.0.12 mesa-4-0-4-20030208:1.4 texmem-0-0-1-20030204-trunk-merge:1.3.46.1 texmem-0-0-1-20030204-trunk-premerge:1.3.46.1 mesa-4-0-4-20030203:1.4 mesa-4-0-4-20030129:1.4 texmem-0-0-1-20030125-trunk-merge:1.3.46.1 texmem-0-0-1-20030123-trunk-premerge:1.3.46.1 mesa-4-0-4-20030114:1.4 agpgart_2_0_branch:1.4.0.10 mesa-4-0-4-20021220:1.4 mesa-4-0-4-20021216:1.4 mesa-4-0-4-20021215:1.4 mesa-4-0-4-20021214:1.4 mesa-4-0-4-branch:1.4.0.8 dmx-1-0-20021129-final:1.3 texmem-0-0-1-20021127-mesa-4-1-merge:1.3.46.1 trunk-20021125:1.4 dmx-1-0-20021115-beta:1.3 bsd-4-0-0-branch:1.4.0.6 nv-0-0-1-branch:1.4.0.4 savage-0-0-1-branch:1.4.0.2 stable-1-0-branch:1.3.0.52 r200-stable-1-0-20021028:1.3 dmx-1-0-20021025-alpha:1.3 X_4_2_99_2-20021023-merge:1.4 X_4_2_99_2:1.1.1.8 trunk-20021022:1.3 r200-stable-1-0-branch:1.3.0.50 mesa-4-1-branch:1.3.0.48 texmem-0-0-1:1.3.0.46 trunk-20021002:1.3 dmx-1-0-20020926-final:1.3 dmx-1-0-20020830-beta:1.3 r200-0-2-branch:1.3.0.44 r200-0-1-20020822-merge:1.3 r200-0-1-20020822:1.3 r200-0-1-20020826-freeze:1.3 xv845g-0-1-branch:1.3.0.42 xv845g-0-1-bp:1.3 GEODE-BASE-DRIVER:1.3 geode-0-0-1-branch:1.3.0.40 tdlabs-0-0-1-branch:1.3.0.38 reinit-0-0-1-branch:1.3.0.36 dmx-1-0-20020719-alpha:1.3 r200-0-1-20020715:1.3 r200-0-1-20020714-freeze:1.3 bsd-3-0-0-20020705-merge:1.3 bsd-3-0-0-freeze:1.3 trunk-20020705:1.3 bsd-3-0-0-20020705:1.3 trunk-20020703:1.3 mach64-0-0-5-branch:1.3.0.32 trunk-20020626:1.3 trunk-20020617:1.3 tcl-0-0-20020612-merge:1.3 tcl-0-0-20020612:1.3 tcl-0-0-20020612-freeze:1.3 r200-0-1-branch:1.3.0.34 dmx-1-0-20020604-phase1:1.3 dmx-1-0-20020603-base:1.3 dmx-1-0-branch:1.3.0.30 dmx-0-1-20020531-final:1.3 mach64-0-0-4-dma-branch:1.3.0.28 dmx-0-1-20020419-beta:1.3 mach64-0-0-4-branch:1.3.0.26 drmcommand-0-0-1-20020409-merge:1.3 drmcommand-0-0-1-20020409:1.3 drmcommand-0-0-1-20020409-freeze:1.3 trunk-20020328:1.3 s3virge-0-0-1-branch:1.3.0.24 drmcommand-0-0-1-branch:1.3.0.22 trident-0-0-1-branch:1.3.0.20 mach64-0-0-3-dma-branch:1.3.0.18 bsd-3-0-0-branch:1.3.0.16 dmx-0-1-20020228-alpha:1.3 mach64-0-0-3-branch:1.3.0.14 trunk-20020221:1.3 tcl-0-0-branch:1.3.0.12 mesa-4-0-20020214-merge:1.3 mesa-4-0-20020214:1.3 mesa-4-0-20020213:1.3 mesa-4-0-20020211-freeze:1.3 X_4_2_0-20020128-merge:1.3 X_4_2_0:1.1.1.7 X_4_2_0-20020127-preimport:1.3 X_4_2_0-20020123-preimport:1.3 dmx-0-1-20020112:1.3 dmx-0-1-20011128-snapshot:1.3 dmx-0-1-20011115:1.3 dmx-0-1-branch:1.3.0.10 mach64-0-0-2-branch:1.3.0.8 mesa-4-0-branch:1.3.0.6 X_4_1_99_1-20010822-merge:1.3 X_4_1_99_1:1.1.1.7 X_4_1_99_1-20010822-preimport:1.3 multihead-1-0-0-20010730:1.3 multihead-1-0-0-20010730-merge:1.3 multihead-1-0-0-20010727-freeze:1.3 X_4_1_0-20010615-merge:1.3 mesa-3-5-20010621-freeze:1.1.1.5.20.1 X_4_1_0:1.1.1.7 X_4_1_0-20010614-preimport:1.3 multihead-1-0-0-branch:1.3.0.4 X_4_0_99_3-20010502-merge:1.3 X_4_0_99_3:1.1.1.7 X_4_0_99_3-20010501-preimport:1.3 bsd-2-0-0-branch:1.3.0.2 X_4_0_99_2-20010410-merge:1.3 X_4_0_99_2:1.1.1.7 X_4_0_99_2-20010409-preimport:1.2 ati-pcigart-1-0-0-20010405-merge:1.2 ati-pcigart-1-0-0-20010405:1.2 ati-pcigart-1-0-0-20010405-freeze:1.2 ati-pcigart-1-0-0-branch:1.2.0.2 mesa-3-5-20010323-freeze:1.1.1.5 X_4_0_99_1-20010321-merge:1.2 X_4_0_99_1:1.1.1.6 X_4_0_99_1-20010319-preimport:1.1.1.5 full-1-0-0-20010315-head:1.1.1.5 sarea-1-0-0-20010314-merge:1.1.1.5 sarea-1-0-0-20010314:1.1.1.5 full-1-0-0-branch:1.1.1.5 sarea-1-0-0-20010307:1.1.1.5 sarea-1-0-0-20010307-freeze:1.1.1.5 tdfx-3-1-0-20010306-merge:1.1.1.5 tdfx-3-1-0-20010306-freeze:1.1.1.5 tdfx-3-1-0-20010306:1.1.1.5 tdfx-3-1-0-20010305-merge:1.1.1.5 tdfx-3-1-0-20010305-freeze2:1.1.1.5 tdfx-3-1-0-20010305-freeze:1.1.1.5 tdfx-3-1-0-20010301-freeze:1.1.1.5 ati-pcigart-0-0-1-branch-02282001-freeze:1.1.1.5 ati-5-0-1-20010220-head:1.1.1.5 ati-5-0-1-branch:1.1.1.5.0.28 sarea-1-0-0-branch:1.1.1.5.0.26 mga-1-0-0-20010215-merge:1.1.1.5 mga-1-0-0-20010215-freeze:1.1.1.5 tdfx-3-1-0-branch:1.1.1.5.0.24 tdfx-3-0-1-branch:1.1.1.5 ati-pcigart-0-0-1-branch:1.1.1.5.0.22 mesa-3-5-branch:1.1.1.5.0.20 tdfx-3-0-0-20010109-merge:1.1.1.5 tdfx-3-0-0-20010108:1.1.1.5 ati-5-0-0-20010105-merge:1.1.1.5 ati-5-0-0-20010105:1.1.1.5 ati-5-0-0-20000104-freeze:1.1.1.5 tdfx-3-0-0-20010104-freeze:1.1.1.5 ati-5-0-0-20001223-merge:1.1.1.5 ati-5-0-0-20001223-freeze:1.1.1.5 X_4_0_2-20001221-merge:1.1.1.5 X_4_0_2:1.1.1.5 mga-1-0-0-branch:1.1.1.5.0.18 X_4_0_1h-20001207-merge:1.1.1.5 X_4_0_1h-20001205-merge:1.1.1.5 X_4_0_1h:1.1.1.5 ati-4-1-1-20001202-merge-trunk:1.1.1.5 sse-1-0-1-branch:1.1.1.5.0.16 ati-4-1-1-20001202-merge:1.1.1.3 tdfx-3-0-0-20001201:1.1.1.5 ati-4-1-1-20001201-freeze:1.1.1.3 tdfx-3-0-0-20001201-freeze:1.1.1.5 X_4_0_1g-20001130-merge:1.1.1.5 X_4_0_1g:1.1.1.5 X_4_0_1f-20001130-merge:1.1.1.5 X_4_0_1f:1.1.1.5 ati-4-1-1-20001125-freeze:1.1.1.3 mach64-0-0-1-branch:1.1.1.5.0.14 ati-5-0-0-branch:1.1.1.5.0.12 X_4_0_1e-20001107-merge:1.1.1.5 X_4_0_1e:1.1.1.5 X_4_0_1d-20001107-merge:1.1.1.5 X_4_0_1d:1.1.1.5 ppc-1-0-1-branch:1.1.1.5.0.10 radeon-1-0-0-20001017:1.1.1.3 full-0-0-2-branch:1.1.1.5.0.8 full-0-0-1-branch:1.1.1.5.0.6 ati-4-1-1-20001009-freeze:1.1.1.3 mga-readpix-0-0-1-branch:1.1.1.5.0.4 tdfx-3-0-0-branch:1.1.1.5.0.2 X_4_0_1d-pre:1.1.1.5 ati-4-1-1-20000919-stable:1.1.1.3 radeon-1-0-0-branch:1.1.1.3.0.16 ppc-1-0-0-20000912:1.1.1.2.6.1 mga-lock-debug-0-2-0-branch:1.1.1.3.0.14 sse-1-0-0-branch:1.1.1.3.0.12 mga-lock-debug-0-0-1-branch:1.1.1.3.0.10 gamma-2-0-0-branch:1.1.1.3.0.8 tdfx-2-1-20000907-merge:1.1.1.3 tdfx-2-1-20000906:1.1.1.1.46.2 tdfx-2-1-20000905-freeze:1.1.1.1.46.1 ppc-1-0-0-2000-09-01-freeze:1.1.1.2 m3-0-0-1-branch:1.1.1.3.0.6 mach64-0-0-0-branch:1.1.1.3.0.4 ati-4-1-1-branch:1.1.1.3.0.2 X_4_0_1b-20000816-merge:1.1.1.3 X_4_0_1b:1.1.1.3 ati-4-0-2-branch:1.1.1.2.0.8 ppc-1-0-0-branch:1.1.1.2.0.6 tdfx-2-1-20000711:1.1.1.1.46.1 tdfx-2-1-20000711-freeze:1.1.1.1 X_4_0_1-20000711-merge:1.1.1.2.0.4 xc_4_0_1-20000711-merge:1.1.1.2.0.2 X_4_0_1:1.1.1.2 tdfx-2-1-branch:1.1.1.1.0.46 pre401-20000613-freeze:1.1.1.1 bsd-1-0-1-20000613-merge:1.1.1.1 bsd-1-0-1-20000613:1.1.1.1 bsd-1-0-1-20000612-freeze:1.1.1.1 tdfx-2-0-20000612-merge:1.1.1.1 ati-4-1-0-20000613-merge:1.1.1.1 ati-4-1-0-20000613:1.1.1.1 tdfx-2-0-20000608-merge:1.1.1.1 tdfx-2-0-20000608-freeze:1.1.1.1 ati-4-1-0-branch:1.1.1.1.0.44 glxmisc-3-0-0-20000608-merge:1.1.1.1 glxmisc-3-0-0-20000607:1.1.1.1 glxmisc-3-0-0-20000606-freeze:1.1.1.1 bsd-1-0-1-branch:1.1.1.1.0.42 bsd-1-0-0-20000531-merge:1.1.1.1 bsd-1-0-0-20000530-merge:1.1.1.1 bsd-1-0-0-20000530-freeze:1.1.1.1 tdfx-2-0-20000222-merge:1.1.1.1 tdfx-2-0-20000222-freeze:1.1.1.1 ati-4-0-1-20000518-merge:1.1.1.1 ati-4-0-1-20000518:1.1.1.1 video-1-0-0-branch:1.1.1.1.0.40 gamma-1-0-0-branch:1.1.1.1.0.38 mgadh-0-0-3-branch:1.1.1.1.0.36 glxmisc-3-0-0-branch:1.1.1.1.0.34 glxmisc-2-0-0-20000503-merge:1.1.1.1 bsd-1-0-0-branch:1.1.1.1.0.32 glxmisc-2-0-0-20000503:1.1.1.1 glxmisc-2-0-0-branch:1.1.1.1.0.30 tdfx-2-0-branch:1.1.1.1.0.28 tdfx-2-0-trunk:1.1.1.1 glxmisc-1-0-0-20000420-merge:1.1.1.1 glxmisc-1-0-0-20000420:1.1.1.1 ati-4-0-1-beta:1.1.1.1 glxmisc-1-0-0-branch:1.1.1.1.0.26 mga-0-0-3-branch:1.1.1.1.0.24 mga-0-0-2-20000404-merge:1.1.1.1 ati-4-0-1-alpha:1.1.1.1 ati-4-0-1-20000319-base:1.1.1.1 ati-4-0-1-branch:1.1.1.1.0.22 ati-4-0-0-20000319:1.1.1.1 X_4_0-20000315-merge:1.1.1.1 X_4_0:1.1.1.1 freeze-20000226:1.1.1.1 dispatch-0-0-3-20000225-merge:1.1.1.1 dispatch-0-0-3-20000225:1.1.1.1 mga-0-0-1-20000225-merge:1.1.1.1 mga-0-0-2-branch:1.1.1.1.0.20 smt-0-0-2-branch:1.1.1.1.0.18 smt-0-0-1-20000222-freeze:1.1.1.1 X_3_9_18-20000222-merge:1.1.1.1 X_3_9_18:1.1.1.1 smt-0-0-1-stage2c:1.1.1.1 smt-0-0-1-stage2b:1.1.1.1.0.16 dispatch-0-0-3-branch:1.1.1.1.0.14 i810-20000214-beta2:1.1.1.1 dispatch-0-0-2-20000212:1.1.1.1 dispatch-0-0-2-branch:1.1.1.1.0.12 i810-20000201-beta1:1.1.1.1 dispatch-0-0-1-20000129-merge:1.1.1.1 dispatch-0-0-1-20000128:1.1.1.1 smt-0-0-1-20000112-base:1.1.1.1 smt-0-0-1-branch:1.1.1.1.0.6 dispatch-0-0-1-branch:1.1.1.1.0.10 tdfx-1-1:1.1.1.1.0.4 X_3_9_17:1.1.1.1 ati-4-0-0-branch:1.1.1.1.0.8 mga-0-0-1-branch:1.1.1.1.0.2 X_3_9_16:1.1.1.1 XFree:1.1.1; locks; strict; comment @# @; 1.6 date 2003.09.12.11.23.10; author alanh; state Exp; branches; next 1.5; 1.5 date 2003.03.25.10.16.16; author alanh; state Exp; branches; next 1.4; 1.4 date 2002.10.22.23.38.04; author alanh; state Exp; branches 1.4.12.1; next 1.3; 1.3 date 2001.04.09.21.55.45; author dawes; state Exp; branches 1.3.46.1 1.3.48.1; next 1.2; 1.2 date 2001.03.20.19.02.25; author dawes; state Exp; branches; next 1.1; 1.1 date 99.12.05.00.59.08; author daryll; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 99.12.05.00.59.08; author daryll; state Exp; branches 1.1.1.1.46.1; next 1.1.1.2; 1.1.1.2 date 2000.07.10.20.35.22; author alanh; state Exp; branches 1.1.1.2.6.1; next 1.1.1.3; 1.1.1.3 date 2000.08.16.17.22.14; author dawes; state Exp; branches; next 1.1.1.4; 1.1.1.4 date 2000.09.22.17.06.41; author alanh; state Exp; branches; next 1.1.1.5; 1.1.1.5 date 2000.09.23.20.39.14; author alanh; state Exp; branches 1.1.1.5.20.1; next 1.1.1.6; 1.1.1.6 date 2001.03.19.17.45.15; author dawes; state Exp; branches; next 1.1.1.7; 1.1.1.7 date 2001.04.09.16.26.55; author dawes; state Exp; branches; next 1.1.1.8; 1.1.1.8 date 2002.10.22.12.59.25; author alanh; state Exp; branches; next 1.1.1.9; 1.1.1.9 date 2003.03.24.23.54.15; author alanh; state Exp; branches; next 1.1.1.10; 1.1.1.10 date 2003.09.12.09.44.30; author alanh; state Exp; branches; next ; 1.1.1.5.20.1 date 2001.03.27.20.00.56; author gareth; state Exp; branches; next 1.1.1.5.20.2; 1.1.1.5.20.2 date 2001.06.26.02.07.33; author brianp; state Exp; branches; next ; 1.1.1.2.6.1 date 2000.09.12.19.17.11; author mdaenzer; state Exp; branches; next ; 1.1.1.1.46.1 date 2000.07.11.19.36.01; author daryll; state Exp; branches; next 1.1.1.1.46.2; 1.1.1.1.46.2 date 2000.09.06.12.11.18; author alanh; state Exp; branches; next ; 1.3.46.1 date 2002.11.11.23.31.11; author idr; state Exp; branches; next 1.3.46.2; 1.3.46.2 date 2003.04.02.04.28.30; author idr; state Exp; branches; next ; 1.3.48.1 date 2002.11.15.01.57.37; author brianp; state Exp; branches; next ; 1.4.12.1 date 2003.03.30.04.49.52; author ldelgass; state Exp; branches; next ; desc @@ 1.6 log @resolve merge conflicts @ text @XCOMM $Xorg: Imakefile,v 1.5 2000/08/17 19:41:44 cpqbld Exp $ XCOMM $XFree86: xc/Imakefile,v 3.30 2003/08/24 20:31:43 tsi Exp $ #define IHaveSubdirs #define PassCDebugFlags CDEBUGFLAGS="$(CDEBUGFLAGS)" RELEASE = XOrgReleaseString #ifdef XFree86VersionString VERSTRING = " "version XFree86VersionString "("XFree86DateString")" #endif #ifndef OSName #define OSName Unknown Operating System! #endif #if !BuildServersOnly #if BuildFonts FONTSDIR = fonts #endif #ifndef Win32Architecture #if BuildDocs DOCSDIR = doc #endif NLSSUBDIR = nls #endif #endif SUBDIRS = include config lib $(NLSSUBDIR) \ programs $(FONTSDIR) $(DOCSDIR) LNINSTALLDIRS = lib #if HasParallelMake #ifdef ParallelDefines TOPPARALLELMFLAGS = TopParallelDefines #endif #endif MakeSubdirs($(SUBDIRS)) MakeLintSubdirs($(LNINSTALLDIRS),install.ln,install.ln) MakeLintSubdirs($(LNINSTALLDIRS),external.ln,lintlib) DependSubdirs($(SUBDIRS)) #define IHaveSpecialMakefileTarget #ifndef Win32Architecture #ifdef XFree86VersionString VerifyOS:: @@echo "" @@echo Building XFree86 version XFree86VersionString "("XFree86DateString")." #endif VerifyOS:: @@echo "" @@echo Building on OSName "("OSMajorVersion"."OSMinorVersion"."OSTeenyVersion")." @@echo "" #ifdef LinuxArchitecture VerifyOS:: @@echo Linux Distribution: LinuxDistName @@echo libc version: LinuxCLibMajorVersion"."LinuxCLibMinorVersion"."LinuxCLibTeenyVersion @@echo binutils version: `expr LinuxBinUtilsMajorVersion / 10`.`expr LinuxBinUtilsMajorVersion % 10` @@echo "" #endif #if defined(GccMajorVersion) && defined(GccMinorVersion) VerifyOS:: @@echo GCC version: GccMajorVersion"."GccMinorVersion @@echo "" #endif #ifdef XFree86Version #ifndef OS2Architecture version.def:: $(RM) $(IRULESRC)/version.def $(RM) $(IRULESRC)/date.def $(LN) ../../$(XF86SRC)/xf86Version.h $(IRULESRC)/version.def $(LN) ../../$(XF86SRC)/xf86Date.h $(IRULESRC)/date.def #else /*OS2Architecture*/ version.def:: $(RM) $(IRULESRC)/version.def $(RM) $(IRULESRC)/date.def $(CP) $(XF86SRC)/xf86Version.h $(IRULESRC)/version.def $(CP) $(XF86SRC)/xf86Date.h $(IRULESRC)/date.def #endif #else version.def:: #endif includes:: MakeDir($(BUILDINCDIR)) MakeDir($(BUILDBINDIR)) XCOMM XCOMM Watch out!!! Make sure you do make includes after removing X11.... XCOMM clean:: $(RM) -r $(BUILDINCDIR) $(RM) -r $(BUILDLIBDIR) $(RM) -r $(BUILDBINDIR) MAKE_OPTS = -f xmakefile World:: $(MAKE) $(MFLAGS) $(MAKE_OPTS) $(TOPPARALLELMFLAGS) all Everything:: @@echo "" @@echo Rebuilding XFree86$(VERSTRING). @@echo "" @@date @@echo "" cd $(IMAKESRC) && if [ -f Makefile ]; then \ $(MAKE) $(MFLAGS) BOOTSTRAPCFLAGS="$(BOOTSTRAPCFLAGS)"; \ else \ $(MAKE) $(MFLAGS) -f Makefile.ini BOOTSTRAPCFLAGS="$(BOOTSTRAPCFLAGS)"; \ fi -$(RM) xmakefile.bak; $(MV) xmakefile xmakefile.bak $(MAKE) $(MFLAGS) xmakefile $(MAKE) $(MFLAGS) $(MAKE_OPTS) Makefiles $(MAKE) $(MFLAGS) $(MAKE_OPTS) includes $(MAKE) $(MFLAGS) $(MAKE_OPTS) depend $(MAKE) $(MFLAGS) $(MAKE_OPTS) $(WORLDOPTS) @@echo "" @@date @@echo "" @@echo Rebuild of XFree86$(VERSTRING) complete. @@echo "" XCOMM clean out link tree looking for stuff that should get checked in dangerous_strip_clean:: $(MAKE) -k distclean find . -type l -exec rm {} \; find . \( \! -type d \) -print #else /* not Win32Architecture else */ VerifyOS:: @@echo : @@echo Building on OSName. @@echo : includes:: MakeDir($(BUILDINCDIR:/=\)) XCOMM XCOMM Watch out!!! Make sure you do make includes after removing X11.... XCOMM clean:: RmTreeCmd $(BUILDINCDIR:/=\) RmTreeCmd $(BUILDLIBDIR:/=\) Everything:: @@echo : @@echo Rebuilding XFree86$(VERSTRING). @@echo : @@echo : cd $(IMAKESRC) $(MAKE) $(MFLAGS) -f Makefile.ini imake.exe cd ..\.. RMoveToBakFile(xmakefile) $(MAKE) $(MFLAGS) xmakefile $(MAKE) $(MFLAGS) $(MAKE_OPTS) Makefiles $(MAKE) $(MFLAGS) $(MAKE_OPTS) includes $(MAKE) $(MFLAGS) $(MAKE_OPTS) depend $(MAKE) $(MFLAGS) $(MAKE_OPTS) $(WORLDOPTS) @@echo : @@echo : @@echo Rebuild of XFree86$(VERSTRING) complete. @@echo : #ifdef ProjectRoot install:: MakeDir($(PROJECTROOT:/=\)) #endif install:: MakeDir($(INCROOT:/=\)) MakeDir($(USRLIBDIR:/=\)) MakeDir($(LIBDIR:/=\)) #endif /* not Win32Architecture else */ XCOMM special target to determine if the xmakefile exists. XCOMM Works on both Unix and NMAKE.EXE xmakefile-exists:: #ifndef MakeManKeywords #define MakeManKeywords YES /* install.man rebuilds "man -k" database? */ #endif #ifndef MakeHtmlManIndex #define MakeHtmlManIndex YES /* install.man generates HTML man page index */ #endif #undef BootstrapCleanSubdirs #define BootstrapCleanSubdirs BOOTSTRAPSUBDIRS="$(BOOTSTRAPSUBDIRS)" BOOTSTRAPSUBDIRS = imake makedepend @ 1.5 log @more merge @ text @d6 1 a6 1 XCOMM $XFree86: xc/Imakefile,v 3.29 2003/02/26 09:21:31 dawes Exp $ d76 1 d89 3 @ 1.4 log @final part of XFree86 4.2.99.2 merge @ text @d6 1 a6 1 XCOMM $XFree86: xc/Imakefile,v 3.26 2002/05/31 18:45:38 dawes Exp $ d12 5 d54 5 a75 1 #ifdef XFree86Version d79 1 d81 1 d85 1 d87 1 a87 3 #endif #else version.def:: d109 1 a109 1 @@echo Rebuilding $(RELEASE) of the X Window System. d127 1 a127 1 @@echo Rebuild of $(RELEASE) of the X Window System complete. d154 1 a154 1 @@echo Rebuilding $(RELEASE) of the X Window System. d168 1 a168 1 @@echo Rebuild of $(RELEASE) of the X Window System complete. @ 1.4.12.1 log @Merge trunk - 4.3.0, filp @ text @d6 1 a6 1 XCOMM $XFree86: xc/Imakefile,v 3.29 2003/02/26 09:21:31 dawes Exp $ a11 5 #ifdef XFree86VersionString VERSTRING = " "version XFree86VersionString "("XFree86DateString")" #endif a48 5 #ifdef XFree86VersionString VerifyOS:: @@echo "" @@echo Building XFree86 version XFree86VersionString "("XFree86DateString")." #endif d66 1 a69 1 $(RM) $(IRULESRC)/date.def a70 1 $(LN) ../../$(XF86SRC)/xf86Date.h $(IRULESRC)/date.def a73 1 $(RM) $(IRULESRC)/date.def d75 3 a77 1 $(CP) $(XF86SRC)/xf86Date.h $(IRULESRC)/date.def d99 1 a99 1 @@echo Rebuilding XFree86$(VERSTRING). d117 1 a117 1 @@echo Rebuild of XFree86$(VERSTRING) complete. d144 1 a144 1 @@echo Rebuilding XFree86$(VERSTRING). d158 1 a158 1 @@echo Rebuild of XFree86$(VERSTRING) complete. @ 1.3 log @First pass of XFree86 4.0.99.2 merge. @ text @d6 1 a6 1 XCOMM $XFree86: xc/Imakefile,v 3.25 2001/03/21 17:36:43 dawes Exp $ a48 1 #ifndef OS2Architecture d67 1 d71 5 a125 47 #else /* OS2Architecture */ VerifyOS:: @@echo : @@echo Building on OSName. @@echo : includes:: MakeDir($(subst /,\,$(BUILDINCDIR))) XCOMM XCOMM Watch out!!! Make sure you do make includes after removing X11.... XCOMM clean:: $(RM) -r $(BUILDINCDIR) $(RM) -r $(BUILDLIBDIR) Everything:: @@echo : @@echo Building $(RELEASE) of the X Window System on OS/2 @@echo : @@echo : \indir $(IMAKESRC) $(MAKE) $(MFLAGS) SHELL= -f Makefile.ini BOOTSTRAPCFLAGS=-Zexe if exist Makefile.bak del Makefile.bak if exist Makefile ren Makefile Makefile.bak $(MAKE) $(MFLAGS) -f Makefile.bak Makefile $(MAKE) $(MFLAGS) SHELL= VerifyOS $(MAKE) $(MFLAGS) SHELL= Makefiles $(MAKE) $(MFLAGS) SHELL= clean $(MAKE) $(MFLAGS) SHELL= includes $(MAKE) $(MFLAGS) SHELL= depend $(MAKE) $(MFLAGS) @@echo : @@echo : @@echo Rebuild of $(RELEASE) of the X Window System complete. @@echo : #ifdef ProjectRoot install:: MakeDir($(subst /,\,$(PROJECTROOT))) #endif install:: MakeDir($(subst /,\,$(INCROOT))) MakeDir($(subst /,\,$(USRLIBDIR))) MakeDir($(subst /,\,$(LIBDIR))) #endif @ 1.3.48.1 log @merge from trunk @ text @d6 1 a6 1 XCOMM $XFree86: xc/Imakefile,v 3.26 2002/05/31 18:45:38 dawes Exp $ d49 1 a67 1 #ifndef OS2Architecture a70 5 #else /*OS2Architecture*/ version.def:: $(RM) $(IRULESRC)/version.def $(CP) $(XF86SRC)/xf86Version.h $(IRULESRC)/version.def #endif d121 47 @ 1.3.46.1 log @Massive merge from trunk. @ text @d6 1 a6 1 XCOMM $XFree86: xc/Imakefile,v 3.26 2002/05/31 18:45:38 dawes Exp $ d49 1 a67 1 #ifndef OS2Architecture a70 5 #else /*OS2Architecture*/ version.def:: $(RM) $(IRULESRC)/version.def $(CP) $(XF86SRC)/xf86Version.h $(IRULESRC)/version.def #endif d121 47 @ 1.3.46.2 log @First part of trunk-to-branch merge. More to follow. @ text @d6 1 a6 1 XCOMM $XFree86: xc/Imakefile,v 3.29 2003/02/26 09:21:31 dawes Exp $ a11 5 #ifdef XFree86VersionString VERSTRING = " "version XFree86VersionString "("XFree86DateString")" #endif a48 5 #ifdef XFree86VersionString VerifyOS:: @@echo "" @@echo Building XFree86 version XFree86VersionString "("XFree86DateString")." #endif d66 1 a69 1 $(RM) $(IRULESRC)/date.def a70 1 $(LN) ../../$(XF86SRC)/xf86Date.h $(IRULESRC)/date.def a73 1 $(RM) $(IRULESRC)/date.def d75 3 a77 1 $(CP) $(XF86SRC)/xf86Date.h $(IRULESRC)/date.def d99 1 a99 1 @@echo Rebuilding XFree86$(VERSTRING). d117 1 a117 1 @@echo Rebuild of XFree86$(VERSTRING) complete. d144 1 a144 1 @@echo Rebuilding XFree86$(VERSTRING). d158 1 a158 1 @@echo Rebuild of XFree86$(VERSTRING) complete. @ 1.2 log @Make it possible to turn off building clients and docs independently of BuildServersOnly @ text @d6 1 a6 1 XCOMM $XFree86: xc/Imakefile,v 3.24 2001/02/07 18:53:11 dawes Exp $ @ 1.1 log @Initial revision @ text @d1 7 a7 2 XCOMM $TOG: Imakefile /main/138 1997/12/29 16:37:30 kaleb $ XCOMM $XFree86: xc/Imakefile,v 3.17 1998/10/06 09:55:46 dawes Exp $ d11 1 a11 1 RELEASE = "Release 6.4" d21 1 d23 1 d55 1 d61 13 d117 1 a117 1 $(MAKE) -k clean d119 1 a119 1 find . \( \! \( -type d -o -name Makefile \) \) -print d144 1 a144 1 if exist MAkefile ren Makefile Makefile.bak d221 4 @ 1.1.1.1 log @Import XFree 3.9.16 @ text @@ 1.1.1.1.46.1 log @ Merge the trunk onto the tdfx-2-1 branch. Now up to date with 4.0.1. @ text @d2 1 a2 1 XCOMM $XFree86: xc/Imakefile,v 3.19 2000/05/31 15:02:54 eich Exp $ a199 4 #endif #ifndef MakeHtmlManIndex #define MakeHtmlManIndex YES /* install.man generates HTML man page index */ @ 1.1.1.1.46.2 log @Merge trunk into tdfx-2-1-branch @ text @d2 1 a2 1 XCOMM $XFree86: xc/Imakefile,v 3.20 2000/07/07 20:06:55 tsi Exp $ a50 4 @@echo "" #endif #if defined(GccMajorVersion) && defined(GccMinorVersion) @@echo GCC version: GccMajorVersion"."GccMinorVersion @ 1.1.1.2 log @Import of XFree86 4.0.1 @ text @d2 1 a2 1 XCOMM $XFree86: xc/Imakefile,v 3.19 2000/05/31 15:02:54 eich Exp $ a199 4 #endif #ifndef MakeHtmlManIndex #define MakeHtmlManIndex YES /* install.man generates HTML man page index */ @ 1.1.1.2.6.1 log @merge trunk to ppc-1-0-0-branch @ text @d2 1 a2 1 XCOMM $XFree86: xc/Imakefile,v 3.20 2000/07/07 20:06:55 tsi Exp $ a50 4 @@echo "" #endif #if defined(GccMajorVersion) && defined(GccMinorVersion) @@echo GCC version: GccMajorVersion"."GccMinorVersion @ 1.1.1.3 log @Import of XFree86 4.0.1b @ text @d2 1 a2 1 XCOMM $XFree86: xc/Imakefile,v 3.20 2000/07/07 20:06:55 tsi Exp $ a50 4 @@echo "" #endif #if defined(GccMajorVersion) && defined(GccMinorVersion) @@echo GCC version: GccMajorVersion"."GccMinorVersion @ 1.1.1.4 log @Import of XFree86 4.0.1d-pre @ text @d2 1 a2 1 XCOMM $XFree86: xc/Imakefile,v 3.19 2000/05/31 15:02:54 eich Exp $ @ 1.1.1.5 log @Import of XFree86 4.0.1d-pre (2) @ text @d2 1 a2 1 XCOMM $XFree86: xc/Imakefile,v 3.20 2000/07/07 20:06:55 tsi Exp $ @ 1.1.1.5.20.1 log @Initial merge of trunk onto branch. @ text @d1 2 a2 7 XCOMM $Xorg: Imakefile,v 1.5 2000/08/17 19:41:44 cpqbld Exp $ XCOMM $XFree86: xc/Imakefile,v 3.24 2001/02/07 18:53:11 dawes Exp $ d6 1 a6 1 RELEASE = XOrgReleaseString a15 1 #if BuildDocs a16 1 #endif a47 1 VerifyOS:: a53 1 VerifyOS:: a57 8 #ifdef XFree86Version version.def:: $(RM) $(IRULESRC)/version.def $(LN) ../../$(XF86SRC)/xf86Version.h $(IRULESRC)/version.def #else version.def:: #endif d100 1 a100 1 $(MAKE) -k distclean d102 1 a102 1 find . \( \! -type d \) -print d127 1 a127 1 if exist Makefile ren Makefile Makefile.bak @ 1.1.1.5.20.2 log @merge from DRI trunk (first pass) @ text @d6 1 a6 1 XCOMM $XFree86: xc/Imakefile,v 3.25 2001/03/21 17:36:43 dawes Exp $ @ 1.1.1.6 log @Import of XFree86 4.0.99.1 @ text @d1 2 a2 7 XCOMM $Xorg: Imakefile,v 1.5 2000/08/17 19:41:44 cpqbld Exp $ XCOMM $XFree86: xc/Imakefile,v 3.24 2001/02/07 18:53:11 dawes Exp $ d6 1 a6 1 RELEASE = XOrgReleaseString a47 1 VerifyOS:: a53 1 VerifyOS:: a57 8 #ifdef XFree86Version version.def:: $(RM) $(IRULESRC)/version.def $(LN) ../../$(XF86SRC)/xf86Version.h $(IRULESRC)/version.def #else version.def:: #endif d100 1 a100 1 $(MAKE) -k distclean d102 1 a102 1 find . \( \! -type d \) -print d127 1 a127 1 if exist Makefile ren Makefile Makefile.bak @ 1.1.1.7 log @Import -f XFree86 4.0.99.2 @ text @d6 1 a6 1 XCOMM $XFree86: xc/Imakefile,v 3.25 2001/03/21 17:36:43 dawes Exp $ a20 1 #if BuildDocs a21 1 #endif @ 1.1.1.8 log @Import of XFree86 4.2.99.2 @ text @d6 1 a6 1 XCOMM $XFree86: xc/Imakefile,v 3.26 2002/05/31 18:45:38 dawes Exp $ d49 1 a67 1 #ifndef OS2Architecture a70 5 #else /*OS2Architecture*/ version.def:: $(RM) $(IRULESRC)/version.def $(CP) $(XF86SRC)/xf86Version.h $(IRULESRC)/version.def #endif d121 47 @ 1.1.1.9 log @XFree86 4.3.0 merge @ text @d6 1 a6 1 XCOMM $XFree86: xc/Imakefile,v 3.29 2003/02/26 09:21:31 dawes Exp $ a11 5 #ifdef XFree86VersionString VERSTRING = " "version XFree86VersionString "("XFree86DateString")" #endif a48 5 #ifdef XFree86VersionString VerifyOS:: @@echo "" @@echo Building XFree86 version XFree86VersionString "("XFree86DateString")." #endif d66 1 a69 1 $(RM) $(IRULESRC)/date.def a70 1 $(LN) ../../$(XF86SRC)/xf86Date.h $(IRULESRC)/date.def a73 1 $(RM) $(IRULESRC)/date.def d75 3 a77 1 $(CP) $(XF86SRC)/xf86Date.h $(IRULESRC)/date.def d99 1 a99 1 @@echo Rebuilding XFree86$(VERSTRING). d117 1 a117 1 @@echo Rebuild of XFree86$(VERSTRING) complete. d144 1 a144 1 @@echo Rebuilding XFree86$(VERSTRING). d158 1 a158 1 @@echo Rebuild of XFree86$(VERSTRING) complete. @ 1.1.1.10 log @Import of XFree86 4.3.99.12 @ text @d6 1 a6 1 XCOMM $XFree86: xc/Imakefile,v 3.30 2003/08/24 20:31:43 tsi Exp $ a75 1 #ifdef XFree86Version a87 3 #endif #else version.def:: @