From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 20 Jun 2013 23:02:21 +0000 (-0700)
Subject: Merge branch 'fc/makefile'
X-Git-Tag: v1.8.4-rc0~162
X-Git-Url: http://git.bitbasher.net/?a=commitdiff_plain;h=0846fe1a8357b0a99b9d547a4d97844048ae2101;p=git.git

Merge branch 'fc/makefile'

Makefile simplification.

* fc/makefile:
  Makefile: use $^ to avoid listing prerequisites on the command line
  build: do not install git-remote-testgit
  build: generate and clean test scripts
---

0846fe1a8357b0a99b9d547a4d97844048ae2101
diff --cc Makefile
index 17c7ecb972,504ad59235..0d2d0cdd3e
--- a/Makefile
+++ b/Makefile
@@@ -2478,11 -2452,11 +2480,11 @@@ profile-clean
  	$(RM) $(addsuffix *.gcda,$(addprefix $(PROFILE_DIR)/, $(object_dirs)))
  	$(RM) $(addsuffix *.gcno,$(addprefix $(PROFILE_DIR)/, $(object_dirs)))
  
 -clean: profile-clean
 -	$(RM) *.o block-sha1/*.o ppc/*.o compat/*.o compat/*/*.o xdiff/*.o vcs-svn/*.o \
 +clean: profile-clean coverage-clean
 +	$(RM) *.o *.res block-sha1/*.o ppc/*.o compat/*.o compat/*/*.o xdiff/*.o vcs-svn/*.o \
  		builtin/*.o $(LIB_FILE) $(XDIFF_LIB) $(VCSSVN_LIB)
  	$(RM) $(ALL_PROGRAMS) $(SCRIPT_LIB) $(BUILT_INS) git$X
- 	$(RM) $(TEST_PROGRAMS)
+ 	$(RM) $(TEST_PROGRAMS) $(NO_INSTALL)
  	$(RM) -r bin-wrappers $(dep_dirs)
  	$(RM) -r po/build/
  	$(RM) *.spec *.pyc *.pyo */*.pyc */*.pyo common-cmds.h $(ETAGS_TARGET) tags cscope*