Changeset 1259 for trunk/makefile


Ignore:
Timestamp:
Oct 26, 2008, 3:03:41 AM (17 years ago)
Author:
Steven Levine
Message:

Rework makefile dependencies to avoid target dependent build failures.
Drop support for DEBUG=0 - it does not match what our C code expects.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/makefile

    r1133 r1259  
    2222# 22 Jul 08 SHL Change from dll\dllsyms to dll\syms target for consistency
    2323# 22 Jul 08 SHL Pass FORTIFY options to subordinate makefiles
     24# 25 Oct 08 SHL Sanitize DEBUG usage
    2425
    25 # Environment - see makefile_pre.mk
     26# Environment - see makefile_pre.mk and dll\makefile
    2627
    2728BASE = fm3
    … …  
    7778
    7879allexe: *.mak .symbolic
    79    @for %f in ($<) do $(MAKE) -f %f $(__MAKEOPTS__) $(DEBUG_OPT) $(FORTIFY_OPT)
     80  @for %f in ($<) do $(MAKE) -f %f $(__MAKEOPTS__) $(DEBUG_OPT) $(FORTIFY_OPT)
    8081
    8182# make SYM files
    8283
    8384exesyms: *.mak .symbolic
    84    @for %f in ($<) do $(MAKE) -f %f $(__MAKEOPTS__) $(DEBUG_OPT) $(FORTIFY_OPT) sym
     85  @for %f in ($<) do $(MAKE) -f %f $(__MAKEOPTS__) $(DEBUG_OPT) $(FORTIFY_OPT) sym
    8586
    8687# make WPI files
    8788
    8889wpi: .symbolic
    89    cd warpin
    90    $(MAKE) $(__MAKEOPTS__) $(DEBUG_OPT) $(WARPIN_OPTS)
    91    cd ..
     90  cd warpin
     91  $(MAKE) $(__MAKEOPTS__) $(DEBUG_OPT) $(WARPIN_OPTS)
     92  cd ..
    9293
    9394lxlite:: lxlitedll lxliteexe .symbolic
    … …  
    9697# Apply to each *.mak for other exes
    9798lxliteexe: *.mak .symbolic
    98 !ifdef DEBUG
    99 !  ifeq DEBUG 0
    100      @for %f in ($<) do $(MAKE) -f %f $(__MAKEOPTS__) $(DEBUG_OPT) $(FORTIFY_OPT) lxlite
    101 !  endif
    102 !else
    103      @for %f in ($<) do $(MAKE) -f %f $(__MAKEOPTS__) $(DEBUG_OPT) $(FORTIFY_OPT) lxlite
     99!ifndef DEBUG
     100  @for %f in ($<) do $(MAKE) -f %f $(__MAKEOPTS__) $(DEBUG_OPT) $(FORTIFY_OPT) lxlite
    104101!endif
    105102
    106103# Apply to dlls
    107104lxlitedll: .symbolic
     105!ifndef DEBUG
    108106  cd dll
    109 !ifdef DEBUG
    110 !  ifeq DEBUG 0
    111       $(MAKE) $(__MAKEOPTS__) $(DEBUG_OPT) $(FORTIFY_OPT) lxlite
    112 #     $(MAKE) $(DEBUG_OPT) $(FORTIFY_OPT) lxlite
    113 !  endif
    114 !else
    115    $(MAKE) $(__MAKEOPTS__) $(DEBUG_OPT) $(FORTIFY_OPT) lxlite
    116 #  $(MAKE) $(DEBUG_OPT) $(FORTIFY_OPT) lxlite
     107  $(MAKE) $(__MAKEOPTS__) $(DEBUG_OPT) $(FORTIFY_OPT) lxlite
     108  cd ..
    117109!endif
    118   cd ..
    119110
    120111cleanobj: .symbolic
Note: See TracChangeset for help on using the changeset viewer.