Changeset 4644 for trunk/src


Ignore:
Timestamp:
Nov 20, 2000, 6:01:58 AM (25 years ago)
Author:
bird
Message:

Simplified all. ie. finally started to use the build rule.
Added MASSIVE and SMP features to the common rules.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/makefile

    r4531 r4644  
    1 # $Id: makefile,v 1.65 2000-10-26 10:04:24 bird Exp $
     1# $Id: makefile,v 1.66 2000-11-20 05:01:58 bird Exp $
    22
    33#
    … …  
    1717#
    1818
     19#
     20# Directory macros.
     21#
    1922PDWIN32_INCLUDE = ..\include
    2023PDWIN32_LIB     = ..\lib
    2124PDWIN32_BIN     = ..\bin
    2225PDWIN32_TOOLS   = ..\tools\bin
     26
     27
     28#
     29# Build environment.
     30#
    2331!include $(PDWIN32_INCLUDE)\pdwin32.mk
    2432
    25 
    26 !ifdef DEBUG
    27 MAKE_CMD = nmake -nologo DEBUG=1
    28 !else
    29 MAKE_CMD = nmake -nologo
    30 !endif
    31 
    32 !ifdef NODEBUGINFO
    33 MAKE_CMD = $(MAKE_CMD) NODEBUGINFO=1
    34 !endif
    3533
    3634#
    … …  
    4341
    4442
    45 all: libs
    46     cd dllentry
    47     $(MAKE_CMD)
    48     cd ..\odincrt
    49     $(MAKE_CMD)
    50     cd ..\kernel32
    51     $(MAKE_CMD)
    52     cd ..\gdi32
    53     $(MAKE_CMD)
    54     cd ..\user32
    55     $(MAKE_CMD)
    56     cd ..\advapi32
    57     $(MAKE_CMD)
    58     cd ..\shell32
    59     $(MAKE_CMD)
    60     cd ..\shfolder
    61     $(MAKE_CMD)
    62     cd ..\comctl32
    63     $(MAKE_CMD)
    64     cd ..\capi2032
    65     $(MAKE_CMD)
    66     cd ..\wsock32
    67     $(MAKE_CMD)
    68     cd ..\comdlg32
    69     $(MAKE_CMD)
    70     cd ..\tapi32
    71     $(MAKE_CMD)
    72     cd ..\rasapi32
    73     $(MAKE_CMD)
    74     cd ..\wnetap32
    75     $(MAKE_CMD)
    76     cd ..\dciman32
    77     $(MAKE_CMD)
    78     cd ..\mpr
    79     $(MAKE_CMD)
    80     cd ..\winmm
    81     $(MAKE_CMD)
    82     cd ..\winspool
    83     $(MAKE_CMD)
    84     cd ..\NTDLL
    85     $(MAKE_CMD)
    86     cd ..\LZ32
    87     $(MAKE_CMD)
    88     cd ..\version
    89     $(MAKE_CMD)
    90     cd ..\peldr
    91     $(MAKE_CMD)
    92     cd ..\win32k
    93     $(MAKE_CMD)
    94     cd ..\ddraw
    95     $(MAKE_CMD)
    96     cd ..\dinput
    97     $(MAKE_CMD)
    98     cd ..\rpcrt4
    99     $(MAKE_CMD)
    100     cd ..\ole32
    101     $(MAKE_CMD)
    102     cd ..\oleaut32
    103     $(MAKE_CMD)
    104     cd ..\olesvr32
    105     $(MAKE_CMD)
    106     cd ..\olecli32
    107     $(MAKE_CMD)
    108     cd ..\olepro32
    109     $(MAKE_CMD)
    110     cd ..\oledlg
    111     $(MAKE_CMD)
    112     cd ..\imm32
    113     $(MAKE_CMD)
    114     cd ..\psapi
    115     $(MAKE_CMD)
    116     cd ..\msvfw32
    117     $(MAKE_CMD)
    118     cd ..\crtdll
    119     $(MAKE_CMD)
    120     cd ..\msvcrt
    121     $(MAKE_CMD)
    122     cd ..\msacm32
    123     $(MAKE_CMD)
    124     cd ..\imagehlp
    125     $(MAKE_CMD)
    126     cd ..\avifil32
    127     $(MAKE_CMD)
    128     cd ..\dplay
    129     $(MAKE_CMD)
    130     cd ..\dplayx
    131     $(MAKE_CMD)
    132     cd ..\wnaspi32
    133     $(MAKE_CMD)
    134     cd ..\shlwapi
    135     $(MAKE_CMD)
    136     cd ..\dsound
    137     $(MAKE_CMD)
    138     cd ..\opengl
    139     $(MAKE_CMD)
    140     cd ..\wing32
    141     $(MAKE_CMD)
    142     cd ..\wininet
    143     $(MAKE_CMD)
    144     cd ..\twain_32
    145     $(MAKE_CMD)
    146     cd ..\riched32
    147     $(MAKE_CMD)
    148     cd ..\icmp
    149     $(MAKE_CMD)
    150     cd ..\urlmon
    151     $(MAKE_CMD)
     43#
     44# Check for SMP and MASSIVE.
     45#   SMP:        Working backwards thru the directories traversed by a rule.
     46#   MASSIVE:    Spawn a child processes for each process.
     47#
     48!ifdef SMP
     49EXTRA = -r
     50!endif
     51!ifdef MASSIVE
     52EXTRA = -s start "Odin32 Massive Build" /B /C
     53!endif
     54
     55
    15256
    15357#
    154 # Sander, could you evaluate these two rules:
    155 # build:    This is a possible replacement of the all-rule in this makefile.
    156 #           It builds everything in directory order.
     58# All rule. Make libraries and then build every directory.
    15759#
    158 # revbuild: This is a possible replacement of the makefile.smp file.
    159 #           It builds everything in reverse directory order.
    160 #
    161 build: libs
    162     $(DOWITHDIRS) -e$(NOTTOBEMADE)    -cp $(MAKE_CMD)
    163 
    164 revbuild:
    165     $(DOWITHDIRS) -e$(NOTTOBEMADE) -r -cp $(MAKE_CMD)
     60all: libs build
    16661
    16762
    168 libs:
    169     $(DOWITHDIRS) -e$(NOTHAVELIBS) -cp $(MAKE_CMD) lib
     63
     64#
     65# Smp rule - Dual build. Starts a second build process after libraries
     66#            was made.
     67#
     68smp: startsmp libs build
     69
     70startsmp:   # Internal helper for the smp rule.
     71    start "Odin32 SMP Build Process" /B $(MAKE_CMD) SMP=1 libs build
     72
     73
     74#
     75# Rules which supports the SMP and MASSIVE features.
     76#
     77# build:    Invokes the all rule in every directory.
     78# clean:    Invokes the clean rule in every directory.
     79# lib(s):   Invokes the lib rule in every directory known to support it.
     80# dep:      Invokes the dep rule in every directory.
     81#
     82build:
     83    $(DOWITHDIRS) -e$(NOTTOBEMADE) -lbld -c $(EXTRA) \
     84        $(MAKE_CMD) all
     85
     86lib libs:
     87    $(DOWITHDIRS) -e$(NOTHAVELIBS) -c -llib $(EXTRA) \
     88        $(MAKE_CMD) lib
    17089
    17190dep:
    172     $(DOWITHDIRS) -e$(NOTTOBEMADE) -cp $(MAKE_CMD) NODEP=1 dep
     91    $(DOWITHDIRS) -e$(NOTTOBEMADE) -c -ldep $(EXTRA) \
     92        $(MAKE_CMD) NODEP=1 dep
    17393
    17494clean:
    175     $(DOWITHDIRS) -e$(NOTTOBEMADE) -cp $(MAKE_CMD) NODEP=1 clean
     95    $(DOWITHDIRS) -e$(NOTTOBEMADE) -c -lcln $(EXTRA) \
     96        $(MAKE_CMD) NODEP=1 clean
    17697
    17798
    … …  
    201122        IF EXIST apiimport.log list apiimport.log
    202123
    203 
    204124CleanDBLogs:
    205125    $(DOWITHDIRS) -e$(NOTWIN32DLLS) -cp \
Note: See TracChangeset for help on using the changeset viewer.