From aa2ee4084deb9a94335659edbdff11135cae1128 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:41:48 +0200
Subject: [PATCH] make: use $@ and $<
---
Makefile.base | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/Makefile.base b/Makefile.base
index 1ff14f2d94..1001ca9009 100644
--- a/Makefile.base
+++ b/Makefile.base
@@ -50,19 +50,22 @@ $(BINDIR)$(MODULE)/:
$(BINDIR)$(MODULE).a: $(OBJ) $(ASMOBJ) ${DIRS:%=ALL--%} $(BINDIR)$(MODULE)/
$(AD)$(AR) -rc $(BINDIR)$(MODULE).a $(OBJ) $(ASMOBJ)
-# pull in dependency info for *existing* .o files
-# deleted header files will be silently ignored
--include $(OBJ:.o=.d)
+CXXFLAGS = $(filter-out $(CXXUWFLAGS), $(CFLAGS)) $(CXXEXFLAGS)
# compile and generate dependency info
+
$(BINDIR)$(MODULE)/%.o: %.c $(BINDIR)$(MODULE)/
- $(AD)$(CC) $(CFLAGS) $(INCLUDES) -MD -MP -c -o $(BINDIR)$(MODULE)/$*.o $(abspath $*.c)
+ $(AD)$(CC) $(CFLAGS) $(INCLUDES) -MD -MP -c -o $@ $(abspath $<)
$(BINDIR)$(MODULE)/%.o: %.cpp $(BINDIR)$(MODULE)/
- $(AD)$(CXX) $(filter-out $(CXXUWFLAGS), $(CFLAGS)) $(CXXEXFLAGS) $(INCLUDES) -MD -MP -c -o $(BINDIR)$(MODULE)/$*.o $(abspath $*.cpp)
+ $(AD)$(CXX) $(CXXFLAGS) $(INCLUDES) -MD -MP -c -o $@ $(abspath $<)
$(BINDIR)$(MODULE)/%.o: %.s $(BINDIR)$(MODULE)/
- $(AD)$(AS) $(ASFLAGS) $*.s -o $(BINDIR)$(MODULE)/$*.o
+ $(AD)$(AS) $(ASFLAGS) -o $@ $(abspath $<)
$(BINDIR)$(MODULE)/%.o: %.S $(BINDIR)$(MODULE)/
- $(AD)$(CC) $(CFLAGS) $(INCLUDES) -MD -MP -c -o $(BINDIR)$(MODULE)/$*.o $(abspath $*.S)
+ $(AD)$(CC) $(CFLAGS) $(INCLUDES) -MD -MP -c -o $@ $(abspath $<)
+
+# pull in dependency info for *existing* .o files
+# deleted header files will be silently ignored
+-include $(OBJ:.o=.d)
--
GitLab