[PATCH v3 2/2] Makefile: use $(OBJECTS) instead of $(C_OBJ)
- From
Ævar Arnfjörð Bjarmason <avarab@gmail.com>
- Date
- Aug 31, 2022, 09:18 UTC
- Message-ID
- <patch-v3-2.2-cb3bc8b5029-20220831T090744Z-avarab@gmail.com>
- In-Reply-To
- <cover-v3-0.2-00000000000-20220831T090744Z-avarab@gmail.com>
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> --- Makefile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile index 7feda7e79be..8956cace8eb 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) \
-- 2.37.3.1406.g184357183a6