aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-07-23 20:56:39 -0700
committerJunio C Hamano <gitster@pobox.com>2012-07-23 20:56:39 -0700
commitfee4426cdf5234ffb0b5572618ca2a6d4ae2595d (patch)
tree139f5c927ca7dfd96f56bbd848319481694a7134
parentb18c74c92f53572896b6f98cf69fe08c65ae2455 (diff)
parent1015cc4225542ba69cf1627a743978f304a29c71 (diff)
downloadgit-fee4426cdf5234ffb0b5572618ca2a6d4ae2595d.tar.gz
git-fee4426cdf5234ffb0b5572618ca2a6d4ae2595d.tar.xz
Merge branch 'jn/make-assembly-in-right-directory'
* jn/make-assembly-in-right-directory: Makefile: fix location of listing produced by "make subdir/foo.s"
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index f4e8fac49..34ca6e551 100644
--- a/Makefile
+++ b/Makefile
@@ -2275,7 +2275,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