mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dl/makefile-sort'

Browse Source 
Makefile clean-up.

* dl/makefile-sort:
  Makefile: ASCII-sort += lists
This commit is contained in:
Junio C Hamano
2020-10-08 21:53:26 -07:00
parent 86e1007abc 8474f26581
commit e245b4e3b2
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile
View File

@ -820,8 +820,8 @@ TEST_SHELL_PATH = $(SHELL_PATH)
LIB_FILE = libgit.a LIB_FILE = libgit.a
XDIFF_LIB = xdiff/lib.a XDIFF_LIB = xdiff/lib.a
GENERATED_H += config-list.h
GENERATED_H += command-list.h GENERATED_H += command-list.h
GENERATED_H += config-list.h
LIB_H := $(sort $(patsubst ./%,%,$(shell git ls-files '*.h' ':!t/' ':!Documentation/' 2>/dev/null || \ LIB_H := $(sort $(patsubst ./%,%,$(shell git ls-files '*.h' ':!t/' ':!Documentation/' 2>/dev/null || \
$(FIND) . \ $(FIND) . \
@ -998,9 +998,9 @@ LIB_OBJS += sigchain.o
LIB_OBJS += split-index.o LIB_OBJS += split-index.o
LIB_OBJS += stable-qsort.o LIB_OBJS += stable-qsort.o
LIB_OBJS += strbuf.o LIB_OBJS += strbuf.o
LIB_OBJS += strvec.o
LIB_OBJS += streaming.o LIB_OBJS += streaming.o
LIB_OBJS += string-list.o LIB_OBJS += string-list.o
LIB_OBJS += strvec.o
LIB_OBJS += sub-process.o LIB_OBJS += sub-process.o
LIB_OBJS += submodule-config.o LIB_OBJS += submodule-config.o
LIB_OBJS += submodule.o LIB_OBJS += submodule.o
@ -1066,15 +1066,15 @@ BUILTIN_OBJS += builtin/checkout-index.o
BUILTIN_OBJS += builtin/checkout.o BUILTIN_OBJS += builtin/checkout.o
BUILTIN_OBJS += builtin/clean.o BUILTIN_OBJS += builtin/clean.o
BUILTIN_OBJS += builtin/clone.o BUILTIN_OBJS += builtin/clone.o
BUILTIN_OBJS += builtin/credential-cache.o
BUILTIN_OBJS += builtin/credential-cache--daemon.o
BUILTIN_OBJS += builtin/credential-store.o
BUILTIN_OBJS += builtin/column.o BUILTIN_OBJS += builtin/column.o
BUILTIN_OBJS += builtin/commit-graph.o BUILTIN_OBJS += builtin/commit-graph.o
BUILTIN_OBJS += builtin/commit-tree.o BUILTIN_OBJS += builtin/commit-tree.o
BUILTIN_OBJS += builtin/commit.o BUILTIN_OBJS += builtin/commit.o
BUILTIN_OBJS += builtin/config.o BUILTIN_OBJS += builtin/config.o
BUILTIN_OBJS += builtin/count-objects.o BUILTIN_OBJS += builtin/count-objects.o
BUILTIN_OBJS += builtin/credential-cache--daemon.o
BUILTIN_OBJS += builtin/credential-cache.o
BUILTIN_OBJS += builtin/credential-store.o
BUILTIN_OBJS += builtin/credential.o BUILTIN_OBJS += builtin/credential.o
BUILTIN_OBJS += builtin/describe.o BUILTIN_OBJS += builtin/describe.o
BUILTIN_OBJS += builtin/diff-files.o BUILTIN_OBJS += builtin/diff-files.o