From: Ævar Arnfjörð Bjarmason Date: Wed, 31 Aug 2022 09:18:44 +0000 (+0200) Subject: Makefile: use $(OBJECTS) instead of $(C_OBJ) X-Git-Tag: v2.38.0-rc0~23^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=32215974330d1403a2bf8874ad2acc1efd585be0;p=thirdparty%2Fgit.git Makefile: use $(OBJECTS) instead of $(C_OBJ) In the preceding commit $(C_OBJ) added in c373991375a (Makefile: list generated object files in OBJECTS, 2010-01-26) became synonymous with $(OBJECTS). Let's avoid the indirection and use the $(OBJECTS) variable directly instead. Signed-off-by: Ævar Arnfjörð Bjarmason Signed-off-by: Junio C Hamano --- diff --git a/Makefile b/Makefile index 7feda7e79b..8956cace8e 100644 --- a/Makefile +++ b/Makefile @@ -2590,9 +2590,7 @@ missing_compdb_dir = compdb_args = endif -C_OBJ := $(OBJECTS) - -$(C_OBJ): %.o: %.c GIT-CFLAGS $(missing_dep_dirs) $(missing_compdb_dir) +$(OBJECTS): %.o: %.c GIT-CFLAGS $(missing_dep_dirs) $(missing_compdb_dir) $(QUIET_CC)$(CC) -o $*.o -c $(dep_args) $(compdb_args) $(ALL_CFLAGS) $(EXTRA_CPPFLAGS) $< %.s: %.c GIT-CFLAGS FORCE @@ -3084,7 +3082,7 @@ t/helper/test-%$X: t/helper/test-%.o GIT-LDFLAGS $(GITLIBS) $(REFTABLE_TEST_LIB) check-sha1:: t/helper/test-tool$X t/helper/test-sha1.sh -SP_OBJ = $(patsubst %.o,%.sp,$(C_OBJ)) +SP_OBJ = $(patsubst %.o,%.sp,$(OBJECTS)) $(SP_OBJ): %.sp: %.c %.o $(QUIET_SP)cgcc -no-compile $(ALL_CFLAGS) $(EXTRA_CPPFLAGS) \