From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 17 Jan 2010 23:59:44 +0000 (-0800)
Subject: Merge branch 'jn/makefile'
X-Git-Tag: v1.7.0-rc0~90
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/a4c3616b19700cc60e06096f59c4aae0e6635cfe?ds=inline;hp=-c

Merge branch 'jn/makefile'

* jn/makefile:
Makefile: consolidate .FORCE-* targets
Makefile: learn to generate listings for targets requiring special flags
Makefile: use target-specific variable to pass flags to cc
Makefile: regenerate assembler listings when asked
---

a4c3616b19700cc60e06096f59c4aae0e6635cfe
diff --combined Makefile
index 57045dee89,8ce6fd785c..7632db77e7
--- a/Makefile
+++ b/Makefile
@@@ -222,7 -222,7 +222,7 @@@ all:
  #   DEFAULT_EDITOR='$GIT_FALLBACK_EDITOR',
  #   DEFAULT_EDITOR='"C:\Program Files\Vim\gvim.exe" --nofork'
  
- GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE
+ GIT-VERSION-FILE: FORCE
  	@$(SHELL_PATH) ./GIT-VERSION-GEN
  -include GIT-VERSION-FILE
  
@@@ -424,16 -424,6 +424,16 @@@ BUILT_INS += git-stage$
  BUILT_INS += git-status$X
  BUILT_INS += git-whatchanged$X
  
 +ifdef NO_CURL
 +REMOTE_CURL_PRIMARY =
 +REMOTE_CURL_ALIASES =
 +REMOTE_CURL_NAMES =
 +else
 +REMOTE_CURL_PRIMARY = git-remote-http$X
 +REMOTE_CURL_ALIASES = git-remote-https$X git-remote-ftp$X git-remote-ftps$X
 +REMOTE_CURL_NAMES = $(REMOTE_CURL_PRIMARY) $(REMOTE_CURL_ALIASES)
 +endif
 +
  # what 'all' will build and 'install' will install in gitexecdir,
  # excluding programs for built-in commands
  ALL_PROGRAMS = $(PROGRAMS) $(SCRIPTS)
@@@ -441,15 -431,6 +441,15 @@@
  # what 'all' will build but not install in gitexecdir
  OTHER_PROGRAMS = git$X
  
 +# what test wrappers are needed and 'install' will install, in bindir
 +BINDIR_PROGRAMS_NEED_X += git
 +BINDIR_PROGRAMS_NEED_X += git-upload-pack
 +BINDIR_PROGRAMS_NEED_X += git-receive-pack
 +BINDIR_PROGRAMS_NEED_X += git-upload-archive
 +BINDIR_PROGRAMS_NEED_X += git-shell
 +
 +BINDIR_PROGRAMS_NO_X += git-cvsserver
 +
  # Set paths to tools early so that they can be used for version tests.
  ifndef SHELL_PATH
  	SHELL_PATH = /bin/sh
@@@ -1117,7 -1098,7 +1117,7 @@@ els
  	else
  		CURL_LIBCURL = -lcurl
  	endif
 -	PROGRAMS += git-remote-curl$X git-http-fetch$X
 +	PROGRAMS += $(REMOTE_CURL_NAMES) git-http-fetch$X
  	curl_check := $(shell (echo 070908; curl-config --vernum) | sort -r | sed -ne 2p)
  	ifeq "$(curl_check)" "070908"
  		ifndef NO_EXPAT
@@@ -1486,20 -1467,19 +1486,19 @@@ shell_compatibility_test: please_set_SH
  strip: $(PROGRAMS) git$X
  	$(STRIP) $(STRIP_OPTS) $(PROGRAMS) git$X
  
- git.o: git.c common-cmds.h GIT-CFLAGS
- 	$(QUIET_CC)$(CC) -DGIT_VERSION='"$(GIT_VERSION)"' \
- 		'-DGIT_HTML_PATH="$(htmldir_SQ)"' \
- 		$(ALL_CFLAGS) -o $@ -c $(filter %.c,$^)
+ git.o: common-cmds.h
+ git.s git.o: ALL_CFLAGS += -DGIT_VERSION='"$(GIT_VERSION)"' \
+ 	'-DGIT_HTML_PATH="$(htmldir_SQ)"'
  
  git$X: git.o $(BUILTIN_OBJS) $(GITLIBS)
  	$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ git.o \
  		$(BUILTIN_OBJS) $(ALL_LDFLAGS) $(LIBS)
  
- builtin-help.o: builtin-help.c common-cmds.h GIT-CFLAGS
- 	$(QUIET_CC)$(CC) -o $*.o -c $(ALL_CFLAGS) \
- 		'-DGIT_HTML_PATH="$(htmldir_SQ)"' \
- 		'-DGIT_MAN_PATH="$(mandir_SQ)"' \
- 		'-DGIT_INFO_PATH="$(infodir_SQ)"' $<
+ builtin-help.o: common-cmds.h
+ builtin-help.s builtin-help.o: ALL_CFLAGS += \
+ 	'-DGIT_HTML_PATH="$(htmldir_SQ)"' \
+ 	'-DGIT_MAN_PATH="$(mandir_SQ)"' \
+ 	'-DGIT_INFO_PATH="$(infodir_SQ)"'
  
  $(BUILT_INS): git$X
  	$(QUIET_BUILT_IN)$(RM) $@ && \
@@@ -1652,30 -1632,26 +1651,26 @@@ git.o git.spec 
  
  %.o: %.c GIT-CFLAGS
  	$(QUIET_CC)$(CC) -o $*.o -c $(ALL_CFLAGS) $<
- %.s: %.c GIT-CFLAGS
+ %.s: %.c GIT-CFLAGS FORCE
  	$(QUIET_CC)$(CC) -S $(ALL_CFLAGS) $<
  %.o: %.S GIT-CFLAGS
  	$(QUIET_CC)$(CC) -o $*.o -c $(ALL_CFLAGS) $<
  
- exec_cmd.o: exec_cmd.c GIT-CFLAGS
- 	$(QUIET_CC)$(CC) -o $*.o -c $(ALL_CFLAGS) \
- 		'-DGIT_EXEC_PATH="$(gitexecdir_SQ)"' \
- 		'-DBINDIR="$(bindir_relative_SQ)"' \
- 		'-DPREFIX="$(prefix_SQ)"' \
- 		$<
+ exec_cmd.s exec_cmd.o: ALL_CFLAGS += \
+ 	'-DGIT_EXEC_PATH="$(gitexecdir_SQ)"' \
+ 	'-DBINDIR="$(bindir_relative_SQ)"' \
+ 	'-DPREFIX="$(prefix_SQ)"'
  
- builtin-init-db.o: builtin-init-db.c GIT-CFLAGS
- 	$(QUIET_CC)$(CC) -o $*.o -c $(ALL_CFLAGS) -DDEFAULT_GIT_TEMPLATE_DIR='"$(template_dir_SQ)"' $<
+ builtin-init-db.s builtin-init-db.o: ALL_CFLAGS += \
+ 	-DDEFAULT_GIT_TEMPLATE_DIR='"$(template_dir_SQ)"'
  
- config.o: config.c GIT-CFLAGS
- 	$(QUIET_CC)$(CC) -o $*.o -c $(ALL_CFLAGS) -DETC_GITCONFIG='"$(ETC_GITCONFIG_SQ)"' $<
+ config.s config.o: ALL_CFLAGS += -DETC_GITCONFIG='"$(ETC_GITCONFIG_SQ)"'
  
- http.o: http.c GIT-CFLAGS
- 	$(QUIET_CC)$(CC) -o $*.o -c $(ALL_CFLAGS) -DGIT_USER_AGENT='"git/$(GIT_VERSION)"' $<
+ http.s http.o: ALL_CFLAGS += -DGIT_USER_AGENT='"git/$(GIT_VERSION)"'
  
  ifdef NO_EXPAT
- http-walker.o: http-walker.c http.h GIT-CFLAGS
- 	$(QUIET_CC)$(CC) -o $*.o -c $(ALL_CFLAGS) -DNO_EXPAT $<
+ http-walker.o: http.h
+ http-walker.s http-walker.o: ALL_CFLAGS += -DNO_EXPAT
  endif
  
  git-%$X: %.o $(GITLIBS)
@@@ -1696,13 -1672,7 +1691,13 @@@ git-http-push$X: revision.o http.o http
  	$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
  		$(LIBS) $(CURL_LIBCURL) $(EXPAT_LIBEXPAT)
  
 -git-remote-curl$X: remote-curl.o http.o http-walker.o $(GITLIBS)
 +$(REMOTE_CURL_ALIASES): $(REMOTE_CURL_PRIMARY)
 +	$(QUIET_LNCP)$(RM) $@ && \
 +	ln $< $@ 2>/dev/null || \
 +	ln -s $< $@ 2>/dev/null || \
 +	cp $< $@
 +
 +$(REMOTE_CURL_PRIMARY): remote-curl.o http.o http-walker.o $(GITLIBS)
  	$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
  		$(LIBS) $(CURL_LIBCURL) $(EXPAT_LIBEXPAT)
  
@@@ -1753,7 -1723,7 +1748,7 @@@ cscope
  TRACK_CFLAGS = $(subst ','\'',$(ALL_CFLAGS)):\
               $(bindir_SQ):$(gitexecdir_SQ):$(template_dir_SQ):$(prefix_SQ)
  
- GIT-CFLAGS: .FORCE-GIT-CFLAGS
+ GIT-CFLAGS: FORCE
  	@FLAGS='$(TRACK_CFLAGS)'; \
  	    if test x"$$FLAGS" != x"`cat GIT-CFLAGS 2>/dev/null`" ; then \
  		echo 1>&2 "    * new build flags or prefix"; \
@@@ -1763,7 -1733,7 +1758,7 @@@
  # We need to apply sq twice, once to protect from the shell
  # that runs GIT-BUILD-OPTIONS, and then again to protect it
  # and the first level quoting from the shell that runs "echo".
- GIT-BUILD-OPTIONS: .FORCE-GIT-BUILD-OPTIONS
+ GIT-BUILD-OPTIONS: FORCE
  	@echo SHELL_PATH=\''$(subst ','\'',$(SHELL_PATH_SQ))'\' >$@
  	@echo PERL_PATH=\''$(subst ','\'',$(PERL_PATH_SQ))'\' >>$@
  	@echo TAR=\''$(subst ','\'',$(subst ','\'',$(TAR)))'\' >>$@
@@@ -1775,43 -1745,29 +1770,41 @@@
  ifndef NO_TCLTK
  TRACK_VARS = $(subst ','\'',-DTCLTK_PATH='$(TCLTK_PATH_SQ)')
  
- GIT-GUI-VARS: .FORCE-GIT-GUI-VARS
+ GIT-GUI-VARS: FORCE
  	@VARS='$(TRACK_VARS)'; \
  	    if test x"$$VARS" != x"`cat $@ 2>/dev/null`" ; then \
  		echo 1>&2 "    * new Tcl/Tk interpreter location"; \
  		echo "$$VARS" >$@; \
              fi
- 
- .PHONY: .FORCE-GIT-GUI-VARS
  endif
  
  ### Testing rules
  
 -TEST_PROGRAMS += test-chmtime$X
 -TEST_PROGRAMS += test-ctype$X
 -TEST_PROGRAMS += test-date$X
 -TEST_PROGRAMS += test-delta$X
 -TEST_PROGRAMS += test-dump-cache-tree$X
 -TEST_PROGRAMS += test-genrandom$X
 -TEST_PROGRAMS += test-match-trees$X
 -TEST_PROGRAMS += test-parse-options$X
 -TEST_PROGRAMS += test-path-utils$X
 -TEST_PROGRAMS += test-sha1$X
 -TEST_PROGRAMS += test-sigchain$X
 +TEST_PROGRAMS_NEED_X += test-chmtime
 +TEST_PROGRAMS_NEED_X += test-ctype
 +TEST_PROGRAMS_NEED_X += test-date
 +TEST_PROGRAMS_NEED_X += test-delta
 +TEST_PROGRAMS_NEED_X += test-dump-cache-tree
 +TEST_PROGRAMS_NEED_X += test-genrandom
 +TEST_PROGRAMS_NEED_X += test-match-trees
 +TEST_PROGRAMS_NEED_X += test-parse-options
 +TEST_PROGRAMS_NEED_X += test-path-utils
 +TEST_PROGRAMS_NEED_X += test-sha1
 +TEST_PROGRAMS_NEED_X += test-sigchain
 +TEST_PROGRAMS_NEED_X += test-index-version
  
 -all:: $(TEST_PROGRAMS)
 +TEST_PROGRAMS = $(patsubst %,%$X,$(TEST_PROGRAMS_NEED_X))
 +
 +test_bindir_programs := $(patsubst %,bin-wrappers/%,$(BINDIR_PROGRAMS_NEED_X) $(BINDIR_PROGRAMS_NO_X) $(TEST_PROGRAMS_NEED_X))
 +
 +all:: $(TEST_PROGRAMS) $(test_bindir_programs)
 +
 +bin-wrappers/%: wrap-for-bin.sh
 +	@mkdir -p bin-wrappers
 +	$(QUIET_GEN)sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
 +	     -e 's|@@BUILD_DIR@@|$(shell pwd)|' \
 +	     -e 's|@@PROG@@|$(@F)|' < $< > $@ && \
 +	chmod +x $@
  
  # GNU make supports exporting all variables by "export" without parameters.
  # However, the environment gets quite big, and some programs have problems
@@@ -1872,13 -1828,11 +1865,13 @@@ endi
  gitexec_instdir_SQ = $(subst ','\'',$(gitexec_instdir))
  export gitexec_instdir
  
 +install_bindir_programs := $(patsubst %,%$X,$(BINDIR_PROGRAMS_NEED_X)) $(BINDIR_PROGRAMS_NO_X)
 +
  install: all
  	$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(bindir_SQ)'
  	$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
  	$(INSTALL) $(ALL_PROGRAMS) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
 -	$(INSTALL) git$X git-upload-pack$X git-receive-pack$X git-upload-archive$X git-shell$X git-cvsserver '$(DESTDIR_SQ)$(bindir_SQ)'
 +	$(INSTALL) $(install_bindir_programs) '$(DESTDIR_SQ)$(bindir_SQ)'
  	$(MAKE) -C templates DESTDIR='$(DESTDIR_SQ)' install
  ifndef NO_PERL
  	$(MAKE) -C perl prefix='$(prefix_SQ)' DESTDIR='$(DESTDIR_SQ)' install
@@@ -1893,7 -1847,6 +1886,7 @@@ endi
  ifneq (,$X)
  	$(foreach p,$(patsubst %$X,%,$(filter %$X,$(ALL_PROGRAMS) $(BUILT_INS) git$X)), test '$(DESTDIR_SQ)$(gitexec_instdir_SQ)/$p' -ef '$(DESTDIR_SQ)$(gitexec_instdir_SQ)/$p$X' || $(RM) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)/$p';)
  endif
 +
  	bindir=$$(cd '$(DESTDIR_SQ)$(bindir_SQ)' && pwd) && \
  	execdir=$$(cd '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' && pwd) && \
  	{ test "$$bindir/" = "$$execdir/" || \
@@@ -1907,12 -1860,6 +1900,12 @@@
  		ln -s "git$X" "$$execdir/$$p" 2>/dev/null || \
  		cp "$$execdir/git$X" "$$execdir/$$p" || exit; \
  	  done; } && \
 +	{ for p in $(REMOTE_CURL_ALIASES); do \
 +		$(RM) "$$execdir/$$p" && \
 +		ln "$$execdir/git-remote-http$X" "$$execdir/$$p" 2>/dev/null || \
 +		ln -s "git-remote-http$X" "$$execdir/$$p" 2>/dev/null || \
 +		cp "$$execdir/git-remote-http$X" "$$execdir/$$p" || exit; \
 +	  done; } && \
  	./check_bindir "z$$bindir" "z$$execdir" "$$bindir/git-add$X"
  
  install-doc:
@@@ -1999,7 -1946,6 +1992,7 @@@ clean
  		$(LIB_FILE) $(XDIFF_LIB)
  	$(RM) $(ALL_PROGRAMS) $(BUILT_INS) git$X
  	$(RM) $(TEST_PROGRAMS)
 +	$(RM) -r bin-wrappers
  	$(RM) *.spec *.pyc *.pyo */*.pyc */*.pyo common-cmds.h TAGS tags cscope*
  	$(RM) -r autom4te.cache
  	$(RM) config.log config.mak.autogen config.mak.append config.status config.cache
@@@ -2024,8 -1970,7 +2017,7 @@@ endi
  
  .PHONY: all install clean strip
  .PHONY: shell_compatibility_test please_set_SHELL_PATH_to_a_more_modern_shell
- .PHONY: .FORCE-GIT-VERSION-FILE TAGS tags cscope .FORCE-GIT-CFLAGS
- .PHONY: .FORCE-GIT-BUILD-OPTIONS
+ .PHONY: FORCE TAGS tags cscope
  
  ### Check documentation
  #