Merge branch 'jn/make-assembly-in-right-directory' into maint

* jn/make-assembly-in-right-directory: Makefile: fix location of listing produced by "make subdir/foo.s"
git-mirror · Aug 6, 2012 · dbf64e1 · dbf64e1
2 parents c2e585f + 1015cc4
commit dbf64e1
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/Makefile b/Makefile
@@ -2209,7 +2209,7 @@ $(ASM_OBJ): %.o: %.S GIT-CFLAGS $(missing_dep_dirs)
 endif
 
 %.s: %.c GIT-CFLAGS FORCE
-	$(QUIET_CC)$(CC) -S $(ALL_CFLAGS) $(EXTRA_CPPFLAGS) $<
+	$(QUIET_CC)$(CC) -o $@ -S $(ALL_CFLAGS) $(EXTRA_CPPFLAGS) $<
 
 ifdef USE_COMPUTED_HEADER_DEPENDENCIES
 # Take advantage of gcc's on-the-fly dependency generation