[Scummvm-cvs-logs] SF.net SVN: scummvm:[48585] tools/trunk/Makefile.common

[criezy at users.sourceforge.net]

Revision: 48585
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48585&view=rev
Author:   criezy
Date:     2010-04-08 19:38:22 +0000 (Thu, 08 Apr 2010)

Log Message:
-----------
Fix bug #2983010: GUI Tools builds even if optioned out

Modified Paths:
--------------
    tools/trunk/Makefile.common

Modified: tools/trunk/Makefile.common
===================================================================
--- tools/trunk/Makefile.common	2010-04-07 23:46:41 UTC (rev 48584)
+++ tools/trunk/Makefile.common	2010-04-08 19:38:22 UTC (rev 48585)
@@ -258,13 +258,33 @@
 version.o: $(filter-out version.o,$(descumm_OBJS))
 version.o: $(filter-out version.o,$(desword2_OBJS))
 version.o: $(filter-out version.o,$(degob_OBJS))
+version.o: $(filter-out version.o,$(scummvm-tools-cli_OBJS))
+ifdef USE_WXWIDGETS
 version.o: $(filter-out version.o,$(scummvm-tools_OBJS))
-version.o: $(filter-out version.o,$(scummvm-tools-cli_OBJS))
+endif
 
 
 ######################################################################
+# The build rules follow - normally you should have no need to
+# touch whatever comes after here.
+######################################################################
 
+# Replace regular output with quiet messages
+ifneq ($(findstring $(MAKEFLAGS),s),s)
+ifneq ($(VERBOSE_BUILD),1)
+ifneq ($(VERBOSE_BUILD),yes)
+QUIET_CXX    = @echo '   ' C++ '    ' $@;
+QUIET_AR     = @echo '   ' AR '     ' $@;
+QUIET_RANLIB = @echo '   ' RANLIB ' ' $@;
+QUIET_LINK   = @echo '   ' LINK '   ' $(1);
+QUIET        = @
+endif
+endif
+endif
 
+
+######################################################################
+
 # Template for all executable targets.
 # This also automatically hooks up a "clean" rule.
 define PROGRAM_template
@@ -286,11 +306,6 @@
 	$(RM) $(addsuffix *.o,$(MODULE_DIRS))
 
 
-######################################################################
-# The build rules follow - normally you should have no need to
-# touch whatever comes after here.
-######################################################################
-
 # Concat DEFINES and INCLUDES to form the CPPFLAGS
 CPPFLAGS := $(DEFINES) $(INCLUDES)
 
@@ -301,19 +316,6 @@
 DEPDIRS = $(addsuffix $(DEPDIR),$(MODULE_DIRS))
 DEPFILES =
 
-# Replace regular output with quiet messages
-ifneq ($(findstring $(MAKEFLAGS),s),s)
-ifneq ($(VERBOSE_BUILD),1)
-ifneq ($(VERBOSE_BUILD),yes)
-QUIET_CXX    = @echo '   ' C++ '    ' $@;
-QUIET_AR     = @echo '   ' AR '     ' $@;
-QUIET_RANLIB = @echo '   ' RANLIB ' ' $@;
-QUIET_LINK   = @echo '   ' LINK '   ' $(1);
-QUIET        = @
-endif
-endif
-endif
-
 ifdef CXX_UPDATE_DEP_FLAG
 
 # Build rule for C++ files. Makes use of CXX_UPDATE_DEP_FLAG for advanced


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.