Changeset 8715 for trunk/make


Ignore:
Timestamp:
Jun 19, 2002, 4:16:48 AM (23 years ago)
Author:
bird
Message:

Merged in NMAKE5 and other changes from UNIMAC.

Location:
trunk/make
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/make/process.forwarder.mak

    r8423 r8715  
    1 # $Id: process.forwarder.mak,v 1.3 2002-05-16 11:36:59 bird Exp $
     1# $Id: process.forwarder.mak,v 1.4 2002-06-19 02:16:08 bird Exp $
    22
    33#
    … …  
    5151# -----------------------------------------------------------------------------
    5252!ifndef BUILD_QUIET
    53 !if [$(ECHO) Forwarding to another (shell) environment setup...$(CLRRST)]
    54 !endif
     53! ifndef MAKEVER
     54!  if [$(ECHO) Forwarding to another (shell) environment setup...$(CLRRST)]
     55!  endif
     56! else
     57$(ECHO) Forwarding to another (shell) environment setup...$(CLRRST)
     58! endif
    5559!endif
    5660
    … …  
    6165
    6266.SUFFIXES:
    63 .SUFFIXES: .$(EXT_OBJ) .c .cpp .asm .$(EXT_RES) .rc .pre-c .pre-cpp # .h .def
     67.SUFFIXES: .c .cpp .asm .$(EXT_OBJ) .rc .$(EXT_RES) .ii .s
    6468
    6569
    6670# Assembling assembly source.
    6771.asm{$(PATH_TARGET)}.$(EXT_OBJ):
     72    \
    6873!ifndef BUILD_VERBOSE
    6974    @ \
    … …  
    7277
    7378.asm.$(EXT_OBJ):
     79    \
    7480!ifndef BUILD_VERBOSE
    7581    @ \
    … …  
    8086# Compiling C++ source.
    8187.cpp{$(PATH_TARGET)}.$(EXT_OBJ):
     88    \
    8289!ifndef BUILD_VERBOSE
    8390    @ \
    … …  
    8693
    8794.cpp.$(EXT_OBJ):
     95    \
    8896!ifndef BUILD_VERBOSE
    8997    @ \
    … …  
    93101
    94102# Pre-Compiling C++ source.
    95 .cpp.pre-cpp:
     103.cpp.ii:
     104    \
     105!ifndef BUILD_VERBOSE
     106    @ \
     107!endif
     108    $(TOOL_BUILDENV) $(BUILD_ENVS_CHANGE) * $(TOOL_MAKE) -f $(MAKEFILE) $@
     109
     110
     111# Compiler C++ source to assembly.
     112.cpp.s:
     113    \
    96114!ifndef BUILD_VERBOSE
    97115    @ \
    … …  
    102120# Compiling C source.
    103121.c{$(PATH_TARGET)}.$(EXT_OBJ):
     122    \
    104123!ifndef BUILD_VERBOSE
    105124    @ \
    … …  
    108127
    109128.c.$(EXT_OBJ):
     129    \
    110130!ifndef BUILD_VERBOSE
    111131    @ \
    … …  
    115135
    116136# Pre-Compiling C source.
    117 .c.pre-c:
     137.c.ii:
     138    \
     139!ifndef BUILD_VERBOSE
     140    @ \
     141!endif
     142    $(TOOL_BUILDENV) $(BUILD_ENVS_CHANGE) * $(TOOL_MAKE) -f $(MAKEFILE) $@
     143
     144
     145# Compiler C source to assembly.
     146.c.s:
     147    \
    118148!ifndef BUILD_VERBOSE
    119149    @ \
    … …  
    124154# Compiling resources.
    125155.rc{$(PATH_TARGET)}.res:
     156    \
    126157!ifndef BUILD_VERBOSE
    127158    @ \
    … …  
    130161
    131162.rc.res:
     163    \
    132164!ifndef BUILD_VERBOSE
    133165    @ \
    … …  
    150182# -----------------------------------------------------------------------------
    151183build:
     184    \
    152185!ifndef BUILD_VERBOSE
    153186    @ \
    … …  
    161194# -----------------------------------------------------------------------------
    162195lib:
     196    \
    163197!ifndef BUILD_VERBOSE
    164198    @ \
    … …  
    172206# -----------------------------------------------------------------------------
    173207install:
     208    \
    174209!ifndef BUILD_VERBOSE
    175210    @ \
    … …  
    183218# -----------------------------------------------------------------------------
    184219testcase:
     220    \
    185221!ifndef BUILD_VERBOSE
    186222    @ \
    … …  
    194230# -----------------------------------------------------------------------------
    195231shell:
    196 !ifndef BUILD_VERBOSE
    197     @ \
    198 !endif
    199     -$(TOOL_BUILDENV) $(BUILD_ENVS_CHANGE) * $(COMSPEC)
     232    \
     233!ifndef BUILD_VERBOSE
     234    @ \
     235!endif
     236    $(TOOL_BUILDENV) $(BUILD_ENVS_CHANGE) * $(COMSPEC)
    200237
    201238
    … …  
    205242# -----------------------------------------------------------------------------
    206243dep:
     244    \
    207245!ifndef BUILD_VERBOSE
    208246    @ \
    … …  
    217255# -----------------------------------------------------------------------------
    218256clean:
     257    \
     258!ifndef BUILD_VERBOSE
     259    @ \
     260!endif
     261    $(TOOL_BUILDENV) $(BUILD_ENVS_CHANGE) * $(TOOL_MAKE) -f $(MAKEFILE) $@
     262
     263
     264
     265# -----------------------------------------------------------------------------
     266# The nothing rule - Rule for testing the makefile structure.
     267# -----------------------------------------------------------------------------
     268nothing:
     269    \
    219270!ifndef BUILD_VERBOSE
    220271    @ \
    … …  
    229280!if "$(TARGET_MODE)" == "EXE" || "$(TARGET_MODE)" == "DLL" || "$(TARGET_MODE)" == "SYS" || "$(TARGET_MODE)" == "IFS" || "$(TARGET_MODE)" == "VDD"
    230281$(TARGET):
     282    \
    231283!ifndef BUILD_VERBOSE
    232284    @ \
    … …  
    242294!if "$(TARGET_MODE)" == "LIB" || "$(TARGET_MODE)" == "SYSLIB" || "$(TARGET_MODE)" == "IFSLIB"
    243295$(TARGET):
     296    \
    244297!ifndef BUILD_VERBOSE
    245298    @ \
    … …  
    265318!ifdef TARGET_ILIB
    266319$(TARGET_ILIB):
     320    \
    267321!ifndef BUILD_VERBOSE
    268322    @ \
    … …  
    278332# -----------------------------------------------------------------------------
    279333.force:
     334    \
    280335!ifndef BUILD_VERBOSE
    281336    @$(ECHO) .

  • trunk/make/setup.mak

    r8423 r8715  
    1 # $Id: setup.mak,v 1.9 2002-05-16 11:37:00 bird Exp $
     1# $Id: setup.mak,v 1.10 2002-06-19 02:16:41 bird Exp $
    22
    33#
    … …  
    154154!endif
    155155
     156#
     157# A workaround for SlickEdits inability to find the buggy files..
     158# This fixes the relative paths of includes.
     159# Set the make line to:
     160#   '%v && cd %p && nmake PATH_ROOT_ABS=%rp. %n.obj -a'
     161# (NB! Set the project directory to the root dir by creating the project there!)
     162#
     163!ifdef SLKRUNS
     164! ifdef PATH_ROOT_ABS
     165PATH_ROOT = $(PATH_ROOT_ABS)
     166! endif
     167!endif
     168
     169
    156170
    157171# -----------------------------------------------------------------------------
    … …  
    180194MAKE_INCLUDE_SETUP = $(PATH_MAKE)\setup.$(SHT_TRGPLTFRM)$(SHT_BLDMD)$(SHT_BLDENV).mk
    181195!ifndef BUILD_QUIET
    182 ! if [$(ECHO) Including platform setup file $(CLRFIL)$(MAKE_INCLUDE_SETUP)$(CLRRST)]
     196! ifndef MAKEVER
     197!  if [$(ECHO) Including platform setup file $(CLRFIL)$(MAKE_INCLUDE_SETUP)$(CLRRST)]
     198!  endif
     199! else
     200$(ECHO) Including platform setup file $(CLRFIL)$(MAKE_INCLUDE_SETUP)$(CLRRST)
    183201! endif
    184202!endif
    … …  
    260278MAKE_INCLUDE_SETUP_FORCE = $(PATH_MAKE)\setup.$(SHT_TRGPLTFRM)$(SHT_BLDMD)$(SHT_BLDENVFRC).mk
    261279!  ifndef BUILD_QUIET
    262 !   if [$(ECHO) Including forced platform setup file $(CLRFIL)$(MAKE_INCLUDE_SETUP_FORCE)$(CLRRST)]
     280!   ifndef MAKEVER
     281!    if [$(ECHO) Including forced platform setup file $(CLRFIL)$(MAKE_INCLUDE_SETUP_FORCE)$(CLRRST)]
     282!    endif
     283!   else
     284$(ECHO) Including forced platform setup file $(CLRFIL)$(MAKE_INCLUDE_SETUP_FORCE)$(CLRRST)
    263285!   endif
    264286!  endif
    … …  
    281303
    282304!endif # MAKE_SETUP_INCLUDED
    283 

  • trunk/make/setup.tools.mk

    r8423 r8715  
    1 # $Id: setup.tools.mk,v 1.8 2002-05-16 11:37:05 bird Exp $
     1# $Id: setup.tools.mk,v 1.9 2002-06-19 02:16:48 bird Exp $
    22
    33
    … …  
    2525# Standard tools - may be overridden by compiler specific setupfiles.
    2626#
     27TOOL_ECHO       = @echo $(CLRTXT)
     28!ifdef MAKEVER
     29ECHO            = %echo $(CLRTXT)
     30!else
    2731ECHO            = $(TOOL_ECHO)
     32!endif
    2833TOOL_BLDLEVEL   = $(PATH_TOOLS)\BldLevelInf.cmd
    2934TOOL_BUILDENV   = $(PATH_TOOLS)\BuildEnv.cmd
    … …  
    4348TOOL_DOMAKES    = $(PATH_TOOLS)\domakes.cmd
    4449TOOL_DOWITHDIRS = $(PATH_TOOLS)\dowithdirs.cmd
    45 TOOL_ECHO       = @echo $(CLRTXT)
    4650TOOL_EXISTS     = $(PATH_TOOLS)\Exists.cmd
    4751!if "$(BUILD_MULTIJOBS)" != ""
    … …  
    5660TOOL_MAPSYM     = $(PATH_TOOLS)\MapSym.cmd $(BUILD_ENV)
    5761TOOL_RM         = rm.exe -f
     62TOOL_RMDIR      = rmdir
    5863TOOL_TYPE       = type
    5964
Note: See TracChangeset for help on using the changeset viewer.