[Scummvm-cvs-logs] SF.net SVN: scummvm:[48211] scummvm/branches/branch-1-1-0/Makefile.common

[lordhoto at users.sourceforge.net]

Revision: 48211
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48211&view=rev
Author:   lordhoto
Date:     2010-03-09 00:49:26 +0000 (Tue, 09 Mar 2010)

Log Message:
-----------
Backport of r48209 and r48210, which were some slight rule fixes.

Modified Paths:
--------------
    scummvm/branches/branch-1-1-0/Makefile.common

Modified: scummvm/branches/branch-1-1-0/Makefile.common
===================================================================
--- scummvm/branches/branch-1-1-0/Makefile.common	2010-03-09 00:45:24 UTC (rev 48210)
+++ scummvm/branches/branch-1-1-0/Makefile.common	2010-03-09 00:49:26 UTC (rev 48211)
@@ -112,13 +112,24 @@
 	$(QUIET)$(MKDIR) $(*D)/$(DEPDIR)
 	$(QUIET_CXX)$(CXX) $(CXX_UPDATE_DEP_FLAG) $(OBJCFLAGS) -c $(<) -o $*.o
 
+# Build rule for assembler files with preprocessing
+%.o: %.S
+	$(QUIET)$(MKDIR) $(*D)/$(DEPDIR)
+	$(QUIET_AS)$(CXX) $(CXX_UPDATE_DEP_FLAG) $(ASFLAGS) -c $(<) -o $*.o
+
 else
 
 # Dumb compile rule, for C++ compilers that don't allow dependency tracking or
 # where it is broken (such as GCC 2.95).
 .cpp.o:
+	$(QUIET)$(MKDIR) $(*D)
 	$(QUIET_CXX)$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $(<) -o $*.o
 
+# Build rule for assembler files with preprocessing
+%.o: %.S
+	$(QUIET)$(MKDIR) $(*D)
+	$(QUIET_AS)$(CXX) $(ASFLAGS) -c $(<) -o $*.o
+
 endif
 
 # Build rule for assembler files
@@ -126,11 +137,6 @@
 	$(QUIET)$(MKDIR) $(*D)
 	$(QUIET_AS)$(AS) $(ASFLAGS) $(<) -o $*.o
 
-# Build rule for assembler files with preprocessing
-%.o: %.S
-	$(QUIET)$(MKDIR) $(*D)/$(DEPDIR)
-	$(QUIET_AS)$(CXX) $(CXX_UPDATE_DEP_FLAG) $(ASFLAGS) -c $(<) -o $*.o
-
 ifdef HAVE_NASM
 # Build rule for NASM assembler files
 %.o: %.asm


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