Changeset 884

Timestamp:

Dec 11, 2007, 3:04:36 AM (18 years ago)

Author:

Steven Levine

Message:

Add missing makefile dependencies
Set FM2_VER for 3.9.0

File:

• trunk/warpin/makefile (modified) (4 diffs)

trunk/warpin/makefile

@@ -10 +10 @@
 #               and the base makefile. Also made the fm2.wis file a
 #               dependant of the WPI target.
+# 10 Dec 07 SHL Add missing makefile dependencies
+# 10 Dec 07 SHL Set FM2_VER for 3.9.0
 
 !ifndef FM2_VER                  # if defined on wmake command, use it
@@ -59 +61 @@
     ckfiles fm2$(FM2_VER).wpi
 
-fm2.wis: fm2.wis.in fm2utils\fm2utils.doc fm2utils\license.txt
+fm2.wis: fm2.wis.in fm2utils\fm2utils.doc fm2utils\license.txt makefile
    sed -e "/@@@include fm2utils.doc@@@/r fm2utils\fm2utils.doc" -e "s/@@@include fm2utils.doc@@@//" -e "/@@@include license.txt@@@/r fm2utils\license.txt" -e "s/@@@include license.txt@@@//" -e "s/@@@FM2_VER@@@/$(FM2_VER)/" -e "s/@@@FM2UTILS_VER@@@/$(FM2UTILS_VER)/" -e "/PACKAGEID/s/-/\\/g" fm2.wis.in >fm2.wis
 #  sed  -e "s/@@@FM2_VER@@@/$(FM2_VER)/" -e "/PACKAGEID/s/-/\\/g" fm2.wis.in >fm2.wis
 
-fm2$(FM2_VER).wpi:: bld_fm2_wpidirs.in
+fm2$(FM2_VER).wpi:: bld_fm2_wpidirs.in makefile
    @echo Staging files for WPI file...
    bld_fm2_wpidirs
@@ -69 +71 @@
    bld_fm2_wpi fm2$(FM2_VER).wpi
 
-fm2$(FM2_VER).wpi:: fm2.wis
+fm2$(FM2_VER).wpi:: fm2.wis makefile
    @echo Inserting the new Warpin script into the WPI file...
    bld_fm2_wpi fm2$(FM2_VER).wpi /SCRIPT
 
-fm2utils$(FM2UTILS_VER).wpi: bld_fm2utils_wpi.cmd fm2utils.wis fm2utils\fm2utils.doc fm2utils\license.txt ..\shdwmgr.cmd
+fm2utils$(FM2UTILS_VER).wpi: bld_fm2utils_wpi.cmd fm2utils.wis fm2utils\fm2utils.doc fm2utils\license.txt ..\shdwmgr.cmd makefile
    @echo Building FM2Utils
    bld_fm2utils_wpi fm2utils$(FM2UTILS_VER).wpi
@@ -88 +90 @@
 
 # The end
-
-