Changeset 720


Ignore:
Timestamp:
Jul 5, 2007, 12:01:34 AM (18 years ago)
Author:
Steven Levine
Message:

Pass DEBUG to sub-makes

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/dll/makefile

    r719 r720  
    2727# 27 Jun 07 SHL Allow DEBUG set from command line or environment
    2828# 03 Jul 07 SHL Change DEBUG semantics to ifdef/ifndef
     29# 04 Jul 07 SHL Pass DEBUG settings to sub-make
    2930
    3031# Environment:
    … …  
    5556
    5657# Keep this code in sync with makefile_pre.mk
    57 !ifndef DEBUG                  # if not defined on wmake command line
    58 !ifdef %DEBUG                  # if defined in environment
    59 DEBUG = $(%DEBUG)              # use environment setting
     58!ifdef DEBUG                    # if defined on wmake command line
     59DEBUG_OPT = DEBUG=$(DEBUG)      # set in case needed by sub-make
     60!else
     61!ifdef %DEBUG                   # if defined in environment
     62DEBUG = $(%DEBUG)               # use value from environment
     63DEBUG_OPT = DEBUG=$(DEBUG)      # set in case needed by sub-make
    6064!endif
    6165!endif
    … …  
    186190res:
    187191  @echo Updating resources only
    188   $(MAKE) $(__MAKEOPTS__) MAKERES=1
     192  $(MAKE) $(__MAKEOPTS__) $(DEBUG_OPT) MAKERES=1
    189193
    190194internal\mkstr.exe: internal\mkstr.c version.h fm3str.h
    191195  cd internal
    192   $(MAKE) $(__MAKEOPTS__)
     196  $(MAKE) $(__MAKEOPTS__) $(DEBUG_OPT)
    193197  cd..
    194198
    … …  
    239243ipf\fm3.hlp:
    240244  cd ipf
    241   $(MAKE) $(__MAKEOPTS__) fm3.hlp
     245  $(MAKE) $(__MAKEOPTS__) $(DEBUG_OPT) fm3.hlp
    242246  cd..
    243247
    … …  
    249253cleanobj: .symbolic
    250254  cd internal
    251   $(MAKE) $(__MAKEOPTS__) cleanobj
     255  $(MAKE) $(__MAKEOPTS__) $(DEBUG_OPT) cleanobj
    252256  cd..
    253257  -del *.obj
    … …  
    255259clean: .symbolic
    256260  cd internal
    257   $(MAKE) $(__MAKEOPTS__) clean
     261  $(MAKE) $(__MAKEOPTS__) $(DEBUG_OPT) clean
    258262  cd ..\ipf
    259   $(MAKE) $(__MAKEOPTS__) clean
     263  $(MAKE) $(__MAKEOPTS__) $(DEBUG_OPT) clean
    260264  cd..
    261265  -del *.dll

  • trunk/makefile

    r719 r720  
    1616#               file from warpin\makefile because of some
    1717#               differences in how Watcom handles macros.
     18# 04 Jul 07 SHL Pass DEBUG settings to sub-make
    1819
    1920# Environment - see makefile_pre.mk
    … …  
    6970res: .symbolic
    7071  @echo Updating resources only
    71   $(MAKE) $(__MAKEOPTS__) MAKERES=1
     72  $(MAKE) $(__MAKEOPTS__) $(DEBUG_OPT) MAKERES=1
    7273
    7374# make DLL components
    … …  
    7576dll: .symbolic
    7677  cd dll
    77   $(MAKE) $(__MAKEOPTS__)
     78  $(MAKE) $(__MAKEOPTS__) $(DEBUG_OPT)
    7879  cd ..
    7980
    … …  
    8788
    8889allexe: *.mak .symbolic
    89    @for %f in ($<) do $(MAKE) -f %f $(__MAKEOPTS__)
     90   @for %f in ($<) do $(MAKE) -f %f $(__MAKEOPTS__) $(DEBUG_OPT)
    9091
    9192wpi: .symbolic
    9293   cd warpin
    93    $(MAKE) $(__MAKEOPTS__) FM2_VER=$(FM2_VER) FM2UTILS_VER=$(FM2UTILS_VER) BUILD_FM2UTILS=$(BUILD_FM2UTILS)
     94   $(MAKE) $(__MAKEOPTS__) $(DEBUG_OPT) FM2_VER=$(FM2_VER) FM2UTILS_VER=$(FM2UTILS_VER) BUILD_FM2UTILS=$(BUILD_FM2UTILS)
    9495   cd ..
    9596
    … …  
    9798# Apply to each *.mak for other exes
    9899lxlite:: *.mak .symbolic
    99    @for %f in ($<) do $(MAKE) -f %f $(__MAKEOPTS__) lxlite
     100   @for %f in ($<) do $(MAKE) -f %f $(__MAKEOPTS__) $(DEBUG_OPT) lxlite
    100101
    101102# Apply to dlls
    102103lxlite:: .symbolic
    103104  cd dll
    104   $(MAKE) $(__MAKEOPTS__) lxlite
     105  $(MAKE) $(__MAKEOPTS__) $(DEBUG_OPT) lxlite
    105106  cd ..
    106107
    107108cleanobj: .symbolic
    108109  cd dll
    109   $(MAKE) $(__MAKEOPTS__) cleanobj
     110  $(MAKE) $(__MAKEOPTS__) $(DEBUG_OPT) cleanobj
    110111  cd ..
    111112  -del *.obj
    … …  
    113114clean:: .symbolic
    114115  cd dll
    115   $(MAKE) $(__MAKEOPTS__) clean
     116  $(MAKE) $(__MAKEOPTS__) $(DEBUG_OPT) clean
    116117  cd ..
    117118  -del *.exe
    … …  
    123124distclean: clean .symbolic
    124125  cd warpin
    125   $(MAKE) $(__MAKEOPTS__) distclean
     126  $(MAKE) $(__MAKEOPTS__) $(DEBUG_OPT) distclean
    126127  cd ..
    127128

  • trunk/makefile_pre.mk

    r719 r720  
    77# 27 Jun 07 SHL Allow DEBUG set from command line or environment
    88# 03 Jul 07 SHL Change DEBUG semantics to ifdef/ifndef
     9# 04 Jul 07 SHL Pass DEBUG settings to sub-make
    910
    1011CC = wcc386
    … …  
    2526
    2627# Keep this code in sync with dll\makefile
    27 !ifndef DEBUG                  # if not defined on wmake command line
    28 !ifdef %DEBUG                  # if defined in environment
    29 DEBUG = $(%DEBUG)              # pass environment value
     28!ifdef DEBUG                    # if defined on wmake command line
     29DEBUG_OPT = DEBUG=$(DEBUG)      # set in case needed by sub-make
     30!else
     31!ifdef %DEBUG                   # if defined in environment
     32DEBUG = $(%DEBUG)               # use value from environment
     33DEBUG_OPT = DEBUG=$(DEBUG)      # set in case needed by sub-make
    3034!endif
    3135!endif
Note: See TracChangeset for help on using the changeset viewer.