From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 12 Jan 2016 23:16:53 +0000 (-0800)
Subject: Merge branch 'ep/make-phoney'
X-Git-Tag: v2.8.0-rc0~129
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/ce7da1d2818e42647e96f882bf9cf40a685a771f?hp=-c

Merge branch 'ep/make-phoney'

A slight update to the Makefile.

* ep/make-phoney:
Makefile: add missing phony target
---

ce7da1d2818e42647e96f882bf9cf40a685a771f
diff --combined Makefile
index fd19b544c2,dd63832fb3..fc2f1ab2c3
--- a/Makefile
+++ b/Makefile
@@@ -77,6 -77,8 +77,6 @@@ all:
  # Define HAVE_PATHS_H if you have paths.h and want to use the default PATH
  # it specifies.
  #
 -# Define NO_D_INO_IN_DIRENT if you don't have d_ino in your struct dirent.
 -#
  # Define NO_D_TYPE_IN_DIRENT if your platform defines DT_UNKNOWN but lacks
  # d_type in struct dirent (Cygwin 1.5, fixed in Cygwin 1.7).
  #
@@@ -735,7 -737,6 +735,7 @@@ LIB_OBJS += list-objects.
  LIB_OBJS += ll-merge.o
  LIB_OBJS += lockfile.o
  LIB_OBJS += log-tree.o
 +LIB_OBJS += mailinfo.o
  LIB_OBJS += mailmap.o
  LIB_OBJS += match-trees.o
  LIB_OBJS += merge.o
@@@ -772,7 -773,6 +772,7 @@@ LIB_OBJS += reachable.
  LIB_OBJS += read-cache.o
  LIB_OBJS += reflog-walk.o
  LIB_OBJS += refs.o
 +LIB_OBJS += refs/files-backend.o
  LIB_OBJS += ref-filter.o
  LIB_OBJS += remote.o
  LIB_OBJS += replace_object.o
@@@ -818,7 -818,6 +818,7 @@@ LIB_OBJS += version.
  LIB_OBJS += versioncmp.o
  LIB_OBJS += walker.o
  LIB_OBJS += wildmatch.o
 +LIB_OBJS += worktree.o
  LIB_OBJS += wrapper.o
  LIB_OBJS += write_or_die.o
  LIB_OBJS += ws.o
@@@ -914,7 -913,6 +914,7 @@@ BUILTIN_OBJS += builtin/shortlog.
  BUILTIN_OBJS += builtin/show-branch.o
  BUILTIN_OBJS += builtin/show-ref.o
  BUILTIN_OBJS += builtin/stripspace.o
 +BUILTIN_OBJS += builtin/submodule--helper.o
  BUILTIN_OBJS += builtin/symbolic-ref.o
  BUILTIN_OBJS += builtin/tag.o
  BUILTIN_OBJS += builtin/unpack-file.o
@@@ -1174,6 -1172,9 +1174,6 @@@ endi
  ifdef NO_D_TYPE_IN_DIRENT
  	BASIC_CFLAGS += -DNO_D_TYPE_IN_DIRENT
  endif
 -ifdef NO_D_INO_IN_DIRENT
 -	BASIC_CFLAGS += -DNO_D_INO_IN_DIRENT
 -endif
  ifdef NO_GECOS_IN_PWENT
  	BASIC_CFLAGS += -DNO_GECOS_IN_PWENT
  endif
@@@ -2025,6 -2026,7 +2025,7 @@@ $(VCSSVN_LIB): $(VCSSVN_OBJS
  
  export DEFAULT_EDITOR DEFAULT_PAGER
  
+ .PHONY: doc man html info pdf
  doc:
  	$(MAKE) -C Documentation all
  
@@@ -2068,6 -2070,7 +2069,7 @@@ po/git.pot: $(GENERATED_H) FORC
  		$(LOCALIZED_PERL)
  	mv $@+ $@
  
+ .PHONY: pot
  pot: po/git.pot
  
  POFILES := $(wildcard po/*.po)
@@@ -2277,6 -2280,7 +2279,7 @@@ mergetools_instdir_SQ = $(subst ','\'',
  
  install_bindir_programs := $(patsubst %,%$X,$(BINDIR_PROGRAMS_NEED_X)) $(BINDIR_PROGRAMS_NO_X)
  
+ .PHONY: profile-install profile-fast-install
  profile-install: profile
  	$(MAKE) install
  
@@@ -2343,6 -2347,8 +2346,8 @@@ endi
  	done && \
  	./check_bindir "z$$bindir" "z$$execdir" "$$bindir/git-add$X"
  
+ .PHONY: install-gitweb install-doc install-man install-html install-info install-pdf
+ .PHONY: quick-install-doc quick-install-man quick-install-html
  install-gitweb:
  	$(MAKE) -C gitweb install
  
@@@ -2402,6 -2408,7 +2407,7 @@@ rpm: dis
  
  htmldocs = git-htmldocs-$(GIT_VERSION)
  manpages = git-manpages-$(GIT_VERSION)
+ .PHONY: dist-doc distclean
  dist-doc:
  	$(RM) -r .doc-tmp-dir
  	mkdir .doc-tmp-dir
@@@ -2433,7 -2440,7 +2439,7 @@@ profile-clean
  	$(RM) $(addsuffix *.gcno,$(addprefix $(PROFILE_DIR)/, $(object_dirs)))
  
  clean: profile-clean coverage-clean
 -	$(RM) *.o *.res block-sha1/*.o ppc/*.o compat/*.o compat/*/*.o
 +	$(RM) *.o *.res refs/*.o block-sha1/*.o ppc/*.o compat/*.o compat/*/*.o
  	$(RM) xdiff/*.o vcs-svn/*.o ewah/*.o builtin/*.o
  	$(RM) $(LIB_FILE) $(XDIFF_LIB) $(VCSSVN_LIB)
  	$(RM) $(ALL_PROGRAMS) $(SCRIPT_LIB) $(BUILT_INS) git$X
@@@ -2470,6 -2477,8 +2476,8 @@@ ALL_COMMANDS += gi
  ALL_COMMANDS += gitk
  ALL_COMMANDS += gitweb
  ALL_COMMANDS += git-gui git-citool
+ 
+ .PHONY: check-docs
  check-docs::
  	@(for v in $(ALL_COMMANDS); \
  	do \
@@@ -2514,6 -2523,7 +2522,7 @@@ check-builtins:
  ### Test suite coverage testing
  #
  .PHONY: coverage coverage-clean coverage-compile coverage-test coverage-report
+ .PHONY: coverage-untested-functions cover_db cover_db_html
  .PHONY: coverage-clean-results
  
  coverage: