Makefile: keep many variable list sorted

We tend to keep long lists sorted (extensions are not taken into
account), which helps spot a name easily by eye. Rearrange a few
items so these lists remain sorted.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Makefile b/Makefile
index ac40e24625f7b1c53fc9d2e7658abb6d772bf5b3..2fa7211055fae82b3a77d66ce728aadf3bb8c1fa 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -461,15 +461,15 @@ EXTRA_PROGRAMS =
 # ... and all the rest that could be moved out of bindir to gitexecdir
 PROGRAMS += $(EXTRA_PROGRAMS)
 
 # ... and all the rest that could be moved out of bindir to gitexecdir
 PROGRAMS += $(EXTRA_PROGRAMS)
 

+PROGRAM_OBJS += credential-store.o

 PROGRAM_OBJS += daemon.o
 PROGRAM_OBJS += fast-import.o
 PROGRAM_OBJS += daemon.o
 PROGRAM_OBJS += fast-import.o

+PROGRAM_OBJS += http-backend.o

 PROGRAM_OBJS += imap-send.o
 PROGRAM_OBJS += imap-send.o

+PROGRAM_OBJS += sh-i18n--envsubst.o

 PROGRAM_OBJS += shell.o
 PROGRAM_OBJS += show-index.o
 PROGRAM_OBJS += upload-pack.o
 PROGRAM_OBJS += shell.o
 PROGRAM_OBJS += show-index.o
 PROGRAM_OBJS += upload-pack.o

-PROGRAM_OBJS += http-backend.o
-PROGRAM_OBJS += sh-i18n--envsubst.o
-PROGRAM_OBJS += credential-store.o

 
 # Binary suffix, set to .exe for Windows builds
 X =
 
 # Binary suffix, set to .exe for Windows builds
 X =


@@ -482,7 +482,6 @@ 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-date
 TEST_PROGRAMS_NEED_X += test-delta
 TEST_PROGRAMS_NEED_X += test-dump-cache-tree

-TEST_PROGRAMS_NEED_X += test-scrap-cache-tree

 TEST_PROGRAMS_NEED_X += test-genrandom
 TEST_PROGRAMS_NEED_X += test-index-version
 TEST_PROGRAMS_NEED_X += test-line-buffer
 TEST_PROGRAMS_NEED_X += test-genrandom
 TEST_PROGRAMS_NEED_X += test-index-version
 TEST_PROGRAMS_NEED_X += test-line-buffer


@@ -493,6 +492,7 @@ TEST_PROGRAMS_NEED_X += test-parse-options
 TEST_PROGRAMS_NEED_X += test-path-utils
 TEST_PROGRAMS_NEED_X += test-revision-walking
 TEST_PROGRAMS_NEED_X += test-run-command
 TEST_PROGRAMS_NEED_X += test-path-utils
 TEST_PROGRAMS_NEED_X += test-revision-walking
 TEST_PROGRAMS_NEED_X += test-run-command

+TEST_PROGRAMS_NEED_X += test-scrap-cache-tree

 TEST_PROGRAMS_NEED_X += test-sha1
 TEST_PROGRAMS_NEED_X += test-sigchain
 TEST_PROGRAMS_NEED_X += test-subprocess
 TEST_PROGRAMS_NEED_X += test-sha1
 TEST_PROGRAMS_NEED_X += test-sigchain
 TEST_PROGRAMS_NEED_X += test-subprocess


@@ -568,19 +568,19 @@ VCSSVN_H += vcs-svn/fast_export.h
 VCSSVN_H += vcs-svn/svndiff.h
 VCSSVN_H += vcs-svn/svndump.h
 
 VCSSVN_H += vcs-svn/svndiff.h
 VCSSVN_H += vcs-svn/svndump.h
 

+MISC_H += bisect.h

 MISC_H += branch.h
 MISC_H += bundle.h
 MISC_H += branch.h
 MISC_H += bundle.h

-MISC_H += bisect.h

 MISC_H += common-cmds.h
 MISC_H += fetch-pack.h
 MISC_H += common-cmds.h
 MISC_H += fetch-pack.h

-MISC_H += thread-utils.h
+MISC_H += reachable.h

 MISC_H += send-pack.h
 MISC_H += shortlog.h
 MISC_H += send-pack.h
 MISC_H += shortlog.h

-MISC_H += reachable.h
-MISC_H += wt-status.h

 MISC_H += tar.h
 MISC_H += tar.h

+MISC_H += thread-utils.h

 MISC_H += url.h
 MISC_H += walker.h
 MISC_H += url.h
 MISC_H += walker.h

+MISC_H += wt-status.h

 
 LIB_H += advice.h
 LIB_H += archive.h
 
 LIB_H += advice.h
 LIB_H += archive.h


@@ -598,18 +598,18 @@ LIB_H += compat/cygwin.h
 LIB_H += compat/mingw.h
 LIB_H += compat/obstack.h
 LIB_H += compat/terminal.h
 LIB_H += compat/mingw.h
 LIB_H += compat/obstack.h
 LIB_H += compat/terminal.h

+LIB_H += compat/win32/dirent.h
+LIB_H += compat/win32/poll.h

 LIB_H += compat/win32/pthread.h
 LIB_H += compat/win32/syslog.h
 LIB_H += compat/win32/pthread.h
 LIB_H += compat/win32/syslog.h

-LIB_H += compat/win32/poll.h
-LIB_H += compat/win32/dirent.h

 LIB_H += connected.h
 LIB_H += convert.h
 LIB_H += credential.h
 LIB_H += csum-file.h
 LIB_H += decorate.h
 LIB_H += delta.h
 LIB_H += connected.h
 LIB_H += convert.h
 LIB_H += credential.h
 LIB_H += csum-file.h
 LIB_H += decorate.h
 LIB_H += delta.h

-LIB_H += diffcore.h

 LIB_H += diff.h
 LIB_H += diff.h

+LIB_H += diffcore.h

 LIB_H += dir.h
 LIB_H += exec_cmd.h
 LIB_H += fmt-merge-msg.h
 LIB_H += dir.h
 LIB_H += exec_cmd.h
 LIB_H += fmt-merge-msg.h


@@ -718,8 +718,8 @@ LIB_OBJS += entry.o
 LIB_OBJS += environment.o
 LIB_OBJS += exec_cmd.o
 LIB_OBJS += fsck.o
 LIB_OBJS += environment.o
 LIB_OBJS += exec_cmd.o
 LIB_OBJS += fsck.o

-LIB_OBJS += gpg-interface.o

 LIB_OBJS += gettext.o
 LIB_OBJS += gettext.o

+LIB_OBJS += gpg-interface.o

 LIB_OBJS += graph.o
 LIB_OBJS += grep.o
 LIB_OBJS += hash.o
 LIB_OBJS += graph.o
 LIB_OBJS += grep.o
 LIB_OBJS += hash.o


@@ -768,9 +768,9 @@ LIB_OBJS += rerere.o
 LIB_OBJS += resolve-undo.o
 LIB_OBJS += revision.o
 LIB_OBJS += run-command.o
 LIB_OBJS += resolve-undo.o
 LIB_OBJS += revision.o
 LIB_OBJS += run-command.o

+LIB_OBJS += sequencer.o

 LIB_OBJS += server-info.o
 LIB_OBJS += setup.o
 LIB_OBJS += server-info.o
 LIB_OBJS += setup.o

-LIB_OBJS += sequencer.o

 LIB_OBJS += sha1-array.o
 LIB_OBJS += sha1-lookup.o
 LIB_OBJS += sha1_file.o
 LIB_OBJS += sha1-array.o
 LIB_OBJS += sha1-lookup.o
 LIB_OBJS += sha1_file.o