Changeset 692


Ignore:
Timestamp:
Jun 16, 2007, 10:18:18 AM (13 years ago)
Author:
John Small
Message:
  • Changed to accommodate Open Watcom's WMAKE
  • Additional minor changes
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/warpin/makefile

    r682 r692  
    55# 13 May 07 SHL Tweak macro handling to work as documented
    66# 13 May 07 SHL Correct clean target
     7# 08 Jun 07 JBS Corrected BUILD_FM2UTILS code so that it is actually
     8#               possible to disable the build of the FM2UTILS*.WPI file
    79
    810# Environment:
     
    3133
    3234!ifndef FM2UTILS_VER
    33 FM2UTILS_VER=-1-0
     35FM2UTILS_VER=-1-0-1
    3436!endif
    3537
    36 all: wpi
     38all: wpi .symbolic
    3739
    38 !ifdef BUILD_FM2UTILS
    39 wpi: checkfiles fm2$(FM2_VER).wpi fm2utils$(FM2UTILS_VER).wpi
     40!if $(BUILD_FM2UTILS) == 0
     41wpi: checkfiles fm2$(FM2_VER).wpi .symbolic
    4042!else
    41 wpi: checkfiles fm2$(FM2_VER).wpi
     43wpi: checkfiles fm2$(FM2_VER).wpi fm2utils$(FM2UTILS_VER).wpi .symbolic
    4244!endif
    4345
    4446
    45 checkfiles:
     47checkfiles: .symbolic
    4648   @echo Checking to see if files have been changed...
    4749    ckfiles fm2$(FM2_VER).wpi
    4850
    49 fm2.wis: fm2.wis.in
    50    sed -e "s/###FM2UTILS_VER###/$(FM2UTILS_VER)/g" -e "/###include fm2utils.doc###/r fm2utils\fm2utils.doc" -e "s/###include fm2utils.doc###//g" -e "/###include license.txt###/r fm2utils\license.txt" -e "s/###include license.txt###//g" fm2.wis.in >fm2.wis
     51fm2.wis: fm2.wis.in fm2utils\fm2utils.doc fm2utils\license.txt
     52   sed -e "s/###FM2UTILS_VER###/$(FM2UTILS_VER)/" -e "/###include fm2utils.doc###/r fm2utils\fm2utils.doc" -e "s/###include fm2utils.doc###//g" -e "/###include license.txt###/r fm2utils\license.txt" -e "s/###include license.txt###//g" fm2.wis.in >fm2.wis
    5153
    5254fm2$(FM2_VER).wpi:: bld_fm2_wpidirs.in
     
    6466   bld_fm2utils_wpi fm2utils$(FM2UTILS_VER).wpi
    6567
    66 clean:
     68clean: .symbolic
    6769  -if exist fm2$(FM2_VER).wpi del fm2$(FM2_VER).wpi
    6870  -if exist fm2utils$(FM2UTILS_VER).wpi del fm2utils$(FM2UTILS_VER).wpi
     
    7678
    7779# The end
     80
     81
Note: See TracChangeset for help on using the changeset viewer.