Changeset 21617 for trunk/testapp/common.mak

Timestamp:

Apr 15, 2011, 2:40:18 AM (14 years ago)

Author:

dmik

Message:

testapp/common.mak: Redid debug-% and other shortcut targets to fix a problem where doing "debug-my.exe" would actually try to build an executable named "debug-my.exe" instead of running "my.exe" in the debugger (this is due to the fact that the pattern rule without any requisites overrides the one with a virtual requisite).

File:

• trunk/testapp/common.mak (modified) (3 diffs)

trunk/testapp/common.mak

@@ -23 +23 @@
 WRC = $(ODIN)/tools/wrc/bin/Release/wrc.exe
 
-ODIN_FLAVOR := Debug
+ODIN_FLAVOR ?= Debug
 
 ifneq ($(RELEASE)$(REL),)
@@ -29 +29 @@
 endif
 
-RUN_SHELL =
-DEBUG_SHELL = ipmd
+RUN_SHELL ?=
+DEBUG_SHELL ?= ipmd
 
 run-%: %
@@ -38 +38 @@
         @echo.
 
-debug-%: RUN_SHELL = $(DEBUG_SHELL)
-debug-%: run-%
-        @rem dummy, needed for the pattern rule to work...      
+debug-%: %
+        @make run-$< RUN_SHELL=$(DEBUG_SHELL)
+debug:
+        @make run RUN_SHELL=$(DEBUG_SHELL)
 
-debug: RUN_SHELL = $(DEBUG_SHELL)
-debug: run
+ipmd-%: %
+        @make run-$< RUN_SHELL=ipmd
+ipmd:
+        @make run RUN_SHELL=ipmd
 
-ipmd-%: RUN_SHELL = ipmd
-ipmd-%: run-%
-        @rem dummy, needed for the pattern rule to work...      
+idbug-%: %
+        @make run-$< RUN_SHELL=idbug
+idbug:
+        @make run RUN_SHELL=idbug
 
-ipmd: RUN_SHELL = ipmd
-ipmd: run
-
-idbug-%: RUN_SHELL = idbug
-idbug-%: run-%
-        @rem dummy, needed for the pattern rule to work...      
-
-idbug: RUN_SHELL = idbug
-idbug: run
-
-r-%: ODIN_FLAVOR = Release
-r-%: %
-        @rem dummy, needed for the pattern rule to work...      
-
-d-%: ODIN_FLAVOR = Debug
-d-%: %
-        @rem dummy, needed for the pattern rule to work...      
+r-%:
+        @make $(@:r-%=%) ODIN_FLAVOR=Release
+d-%:
+        @make $(@:d-%=%) ODIN_FLAVOR=Debug
 
 help: