diff options
author | Junio C Hamano <gitster@pobox.com> | 2012-07-23 20:56:39 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2012-07-23 20:56:39 -0700 |
commit | fee4426cdf5234ffb0b5572618ca2a6d4ae2595d (patch) | |
tree | 139f5c927ca7dfd96f56bbd848319481694a7134 | |
parent | Merge branch 'th/difftool-diffall' (diff) | |
parent | Makefile: fix location of listing produced by "make subdir/foo.s" (diff) | |
download | tgif-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-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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 |