Makefile: split OBJECTS into OBJECTS and GIT_OBJS

Add a new GIT_OBJS variable, with the objects sufficient to get to a
git.o or common-main.o.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Ævar Arnfjörð Bjarmason 2021-02-23 12:41:30 +01:00 committed by Junio C Hamano
parent d6da8b328e
commit abc3c87f3d
1 changed files with 7 additions and 4 deletions

View File

@ -582,6 +582,7 @@ GENERATED_H =
EXTRA_CPPFLAGS = EXTRA_CPPFLAGS =
FUZZ_OBJS = FUZZ_OBJS =
FUZZ_PROGRAMS = FUZZ_PROGRAMS =
GIT_OBJS =
LIB_OBJS = LIB_OBJS =
OBJECTS = OBJECTS =
PROGRAM_OBJS = PROGRAM_OBJS =
@ -2388,10 +2389,12 @@ XDIFF_OBJS += xdiff/xutils.o


TEST_OBJS := $(patsubst %$X,%.o,$(TEST_PROGRAMS)) $(patsubst %,t/helper/%,$(TEST_BUILTINS_OBJS)) TEST_OBJS := $(patsubst %$X,%.o,$(TEST_PROGRAMS)) $(patsubst %,t/helper/%,$(TEST_BUILTINS_OBJS))


OBJECTS += $(LIB_OBJS) GIT_OBJS += $(LIB_OBJS)
OBJECTS += $(BUILTIN_OBJS) GIT_OBJS += $(BUILTIN_OBJS)
OBJECTS += common-main.o GIT_OBJS += common-main.o
OBJECTS += git.o GIT_OBJS += git.o

OBJECTS += $(GIT_OBJS)
OBJECTS += $(PROGRAM_OBJS) OBJECTS += $(PROGRAM_OBJS)
OBJECTS += $(TEST_OBJS) OBJECTS += $(TEST_OBJS)
OBJECTS += $(XDIFF_OBJS) OBJECTS += $(XDIFF_OBJS)