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 <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ævar Arnfjörð Bjarmason committed
Aug 31, 2022 at 11:18 UTC
32215974330d1403a2bf8874ad2acc1efd585be0
1 file changed
+2
-4
Makefile
+2
-4
@@ -2590,9 +2590,7 @@ missing_compdb_dir =
2590
compdb_args =
2591
endif
2592
2593
-C_OBJ := $(OBJECTS)
2594
-
2595
-$(C_OBJ): %.o: %.c GIT-CFLAGS $(missing_dep_dirs) $(missing_compdb_dir)
2593
+$(OBJECTS): %.o: %.c GIT-CFLAGS $(missing_dep_dirs) $(missing_compdb_dir)
2594
$(QUIET_CC)$(CC) -o $*.o -c $(dep_args) $(compdb_args) $(ALL_CFLAGS) $(EXTRA_CPPFLAGS) $<
2595
2596
%.s: %.c GIT-CFLAGS FORCE
@@ -3084,7 +3082,7 @@ t/helper/test-%$X: t/helper/test-%.o GIT-LDFLAGS $(GITLIBS) $(REFTABLE_TEST_LIB)
3082
check-sha1:: t/helper/test-tool$X
3083
t/helper/test-sha1.sh
3084
3087
-SP_OBJ = $(patsubst %.o,%.sp,$(C_OBJ))
3085
+SP_OBJ = $(patsubst %.o,%.sp,$(OBJECTS))
3086
3087
$(SP_OBJ): %.sp: %.c %.o
3088
$(QUIET_SP)cgcc -no-compile $(ALL_CFLAGS) $(EXTRA_CPPFLAGS) \