Changeset 720 for trunk/dll

Timestamp:

Jul 5, 2007, 12:01:34 AM (18 years ago)

Author:

Steven Levine

Message:

Pass DEBUG to sub-makes

File:

• trunk/dll/makefile (modified) (6 diffs)

trunk/dll/makefile

@@ -27 +27 @@
 # 27 Jun 07 SHL Allow DEBUG set from command line or environment
 # 03 Jul 07 SHL Change DEBUG semantics to ifdef/ifndef
+# 04 Jul 07 SHL Pass DEBUG settings to sub-make
 
 # Environment:
@@ -55 +56 @@
 
 # Keep this code in sync with makefile_pre.mk
-!ifndef DEBUG                  # if not defined on wmake command line
-!ifdef %DEBUG                  # if defined in environment
-DEBUG = $(%DEBUG)              # use environment setting
+!ifdef DEBUG                    # if defined on wmake command line
+DEBUG_OPT = DEBUG=$(DEBUG)      # set in case needed by sub-make
+!else
+!ifdef %DEBUG                   # if defined in environment
+DEBUG = $(%DEBUG)               # use value from environment
+DEBUG_OPT = DEBUG=$(DEBUG)      # set in case needed by sub-make
 !endif
 !endif
@@ -186 +190 @@
 res:
   @echo Updating resources only
-  $(MAKE) $(__MAKEOPTS__) MAKERES=1
+  $(MAKE) $(__MAKEOPTS__) $(DEBUG_OPT) MAKERES=1
 
 internal\mkstr.exe: internal\mkstr.c version.h fm3str.h
   cd internal
-  $(MAKE) $(__MAKEOPTS__)
+  $(MAKE) $(__MAKEOPTS__) $(DEBUG_OPT)
   cd..
 
@@ -239 +243 @@
 ipf\fm3.hlp:
   cd ipf
-  $(MAKE) $(__MAKEOPTS__) fm3.hlp
+  $(MAKE) $(__MAKEOPTS__) $(DEBUG_OPT) fm3.hlp
   cd..
 
@@ -249 +253 @@
 cleanobj: .symbolic
   cd internal
-  $(MAKE) $(__MAKEOPTS__) cleanobj
+  $(MAKE) $(__MAKEOPTS__) $(DEBUG_OPT) cleanobj
   cd..
   -del *.obj
@@ -255 +259 @@
 clean: .symbolic
   cd internal
-  $(MAKE) $(__MAKEOPTS__) clean
+  $(MAKE) $(__MAKEOPTS__) $(DEBUG_OPT) clean
   cd ..\ipf
-  $(MAKE) $(__MAKEOPTS__) clean
+  $(MAKE) $(__MAKEOPTS__) $(DEBUG_OPT) clean
   cd..
   -del *.dll