diff options
| author | Johannes Schickel | 2010-03-09 00:45:24 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2010-03-09 00:45:24 +0000 |
| commit | 3eab993d03b9d27524d9b227c15276d7997f7419 (patch) | |
| tree | 07a5422759e24e74131358a238a66b6c595ff465 /Makefile.common | |
| parent | b84beeb602bcc0849209f4c19dc4a672724231fe (diff) | |
| download | scummvm-rg350-3eab993d03b9d27524d9b227c15276d7997f7419.tar.gz scummvm-rg350-3eab993d03b9d27524d9b227c15276d7997f7419.tar.bz2 scummvm-rg350-3eab993d03b9d27524d9b227c15276d7997f7419.zip | |
Only use CXX_UPDATE_DEP_FLAG for .S file rule, in case it is defined. (Thus matching the .cpp etc. file rules).
svn-id: r48210
Diffstat (limited to 'Makefile.common')
| -rw-r--r-- | Makefile.common | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/Makefile.common b/Makefile.common index e5160bb142..acfc3d935d 100644 --- a/Makefile.common +++ b/Makefile.common @@ -112,6 +112,11 @@ ifdef CXX_UPDATE_DEP_FLAG $(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 @@ -120,6 +125,11 @@ else $(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 @@ -127,11 +137,6 @@ endif $(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 USE_NASM # Build rule for NASM assembler files %.o: %.asm |