From: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date: Tue, 23 Feb 2021 11:41:29 +0000 (+0100)
Subject: Makefile: sort OBJECTS assignment for subsequent change
X-Git-Tag: v2.32.0-rc0~131^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d6da8b328e83337d866502ff308e9a7b30209466;p=thirdparty%2Fgit.git

Makefile: sort OBJECTS assignment for subsequent change

Change the order of the OBJECTS assignment, this makes a follow-up
change where we split it up into two variables smaller.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/Makefile b/Makefile
index ba21075d7c..da26a5d350 100644
--- a/Makefile
+++ b/Makefile
@@ -2390,12 +2390,12 @@ TEST_OBJS := $(patsubst %$X,%.o,$(TEST_PROGRAMS)) $(patsubst %,t/helper/%,$(TEST
 
 OBJECTS += $(LIB_OBJS)
 OBJECTS += $(BUILTIN_OBJS)
+OBJECTS += common-main.o
+OBJECTS += git.o
 OBJECTS += $(PROGRAM_OBJS)
 OBJECTS += $(TEST_OBJS)
 OBJECTS += $(XDIFF_OBJS)
 OBJECTS += $(FUZZ_OBJS)
-OBJECTS += common-main.o
-OBJECTS += git.o
 ifndef NO_CURL
 	OBJECTS += http.o http-walker.o remote-curl.o
 endif