Skip to content

Commit 29fcd4a

Browse files
committed
Makefile common.mk: Fix that EXTRA_DEPS was overwritten
If defining COPY_STATS then EXTRA_DEPS variable was overwritten. Thus, the subdir Makefile EXTRA_DEPS defines were lost. Fix this by using "+=" instead of ":=". This bug was introduced in commit 0c73a0b ("Makefile common, let COPY_STATS add extra deps"). Fixes: 0c73a0b ("Makefile common, let COPY_STATS add extra deps") Signed-off-by: Jesper Dangaard Brouer <brouer@redhat.com>
1 parent d14308b commit 29fcd4a

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

common/common.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ $(COPY_STATS): $(LOADER_DIR)/${COPY_STATS:=.c} $(COMMON_H)
6868
make -C $(LOADER_DIR) $(COPY_STATS)
6969
cp $(LOADER_DIR)/$(COPY_STATS) $(COPY_STATS)
7070
# Needing xdp_stats imply depending on header files:
71-
EXTRA_DEPS := $(COMMON_DIR)/xdp_stats_kern.h $(COMMON_DIR)/xdp_stats_kern_user.h
71+
EXTRA_DEPS += $(COMMON_DIR)/xdp_stats_kern.h $(COMMON_DIR)/xdp_stats_kern_user.h
7272
endif
7373

7474
# For build dependency on this file, if it gets updated

packet-solutions/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ COMMON_DIR = ../common
88

99
COPY_LOADER := xdp_loader
1010
COPY_STATS := xdp_stats
11-
EXTRA_DEPS := $(COMMON_DIR)/parsing_helpers.h
11+
EXTRA_DEPS += $(COMMON_DIR)/parsing_helpers.h
1212

1313
include $(COMMON_DIR)/common.mk

0 commit comments

Comments
 (0)