From 9b408fda9c4a642917be3ff96141cee9f471ee15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Kijewski?= <rene.kijewski@fu-berlin.de>
Date: Wed, 13 Aug 2014 20:46:47 +0200
Subject: [PATCH] make: don't invoke wildcard repeatedly
---
Makefile.base | 31 +++++++++++++++----------------
1 file changed, 15 insertions(+), 16 deletions(-)
diff --git a/Makefile.base b/Makefile.base
index e10ead1715..3a36829abe 100644
--- a/Makefile.base
+++ b/Makefile.base
@@ -22,27 +22,26 @@ ${DIRS:%=ALL--%}:
${DIRS:%=CLEAN--%}:
"$(MAKE)" -C ${@:CLEAN--%=%} clean
-ASMSRC = $(wildcard *.s)
-ASSMSRC = $(wildcard *.S)
-ASMOBJ = $(ASMSRC:%.s=$(BINDIR)$(MODULE)/%.o)
-ASMOBJ += $(ASSMSRC:%.S=$(BINDIR)$(MODULE)/%.o)
-
ifeq ($(strip $(SRC)),)
- SRC = $(wildcard *.c)
+ SRC := $(wildcard *.c)
endif
-
ifeq ($(strip $(SRCXX)),)
- SRCXX = $(wildcard *.cpp)
+ SRCXX := $(wildcard *.cpp)
+endif
+ifeq ($(strip $(ASMSRC)),)
+ ASMSRC := $(wildcard *.s)
+endif
+ifeq ($(strip $(ASSMSRC)),)
+ ASSMSRC := $(wildcard *.S)
endif
-OBJC = $(SRC:%.c=$(BINDIR)$(MODULE)/%.o)
-OBJCXX = $(SRCXX:%.cpp=$(BINDIR)$(MODULE)/%.o)
-
-OBJ = $(OBJC)
-OBJ += $(OBJCXX)
+OBJC := $(SRC:%.c=$(BINDIR)$(MODULE)/%.o)
+OBJCXX := $(SRCXX:%.cpp=$(BINDIR)$(MODULE)/%.o)
+ASMOBJ := $(ASMSRC:%.s=$(BINDIR)$(MODULE)/%.o)
+ASSMOBJ := $(ASSMSRC:%.S=$(BINDIR)$(MODULE)/%.o)
-DEP = $(SRC:%.c=$(BINDIR)$(MODULE)/%.d)
-DEP += $(SRCXX:%.cpp=$(BINDIR)$(MODULE)/%.d)
+OBJ := $(OBJC) $(OBJCXX) $(ASMOBJ) $(ASSMOBJ)
+DEP := $(OBJC:.o=.d) $(OBJCXX:.o=.d) $(ASSMOBJ:.o=.d)
$(BINDIR)$(MODULE)/:
$(AD)mkdir -p $@
@@ -68,4 +67,4 @@ $(BINDIR)$(MODULE)/%.o: %.S $(BINDIR)$(MODULE)/
# pull in dependency info for *existing* .o files
# deleted header files will be silently ignored
--include $(OBJ:.o=.d)
+-include $(DEP)
--
GitLab