Skip to content

Commit 3221597

Browse files
avargitster
authored andcommitted
Makefile: use $(OBJECTS) instead of $(C_OBJ)
In the preceding commit $(C_OBJ) added in c373991 (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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 9dc523a commit 3221597

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

Makefile

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2590,9 +2590,7 @@ missing_compdb_dir =
25902590
compdb_args =
25912591
endif
25922592

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)
25962594
$(QUIET_CC)$(CC) -o $*.o -c $(dep_args) $(compdb_args) $(ALL_CFLAGS) $(EXTRA_CPPFLAGS) $<
25972595

25982596
%.s: %.c GIT-CFLAGS FORCE
@@ -3084,7 +3082,7 @@ t/helper/test-%$X: t/helper/test-%.o GIT-LDFLAGS $(GITLIBS) $(REFTABLE_TEST_LIB)
30843082
check-sha1:: t/helper/test-tool$X
30853083
t/helper/test-sha1.sh
30863084

3087-
SP_OBJ = $(patsubst %.o,%.sp,$(C_OBJ))
3085+
SP_OBJ = $(patsubst %.o,%.sp,$(OBJECTS))
30883086

30893087
$(SP_OBJ): %.sp: %.c %.o
30903088
$(QUIET_SP)cgcc -no-compile $(ALL_CFLAGS) $(EXTRA_CPPFLAGS) \

0 commit comments

Comments
 (0)