aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-08-06 15:39:38 -0700
committerJunio C Hamano <gitster@pobox.com>2012-08-06 15:39:38 -0700
commitdbf64e125a96cd9e6de401361613e8dc888c65ee (patch)
tree791b781c1994958bc83135cf75e3832fbccd3ea7
parentc2e585f530e6339ff3eab0405de6286b7f929b28 (diff)
parent1015cc4225542ba69cf1627a743978f304a29c71 (diff)
downloadgit-dbf64e125a96cd9e6de401361613e8dc888c65ee.tar.gz
git-dbf64e125a96cd9e6de401361613e8dc888c65ee.tar.xz
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"
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 67d761e83..3019b01d5 100644
--- 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