[PATCH 18/19] Don't hardcode the paths for mkdir: just get them from the target
Thiago Macieira
thiago at macieira.org
Mon Apr 22 23:48:24 PDT 2013
The $(@D) (equivalent to $(dir $@)) tells us what the directory the
target is in. We could also have used the one for the source. They're
equivalent there.
Signed-off-by: Thiago Macieira <thiago at macieira.org>
---
Rules.mk | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/Rules.mk b/Rules.mk
index ee99773..d3c8c79 100644
--- a/Rules.mk
+++ b/Rules.mk
@@ -143,12 +143,12 @@ MOCFLAGS = $(filter -I%, $(CXXFLAGS) $(EXTRA_FLAGS)) $(filter -D%, $(CXXFLAGS) $
%.o: %.c
@$(PRETTYECHO) ' CC' $<
- @mkdir -p .dep .dep/qt-ui
+ @mkdir -p .dep/$(@D)
$(COMPILE_PREFIX)$(CC) $(CFLAGS) $(EXTRA_FLAGS) -MD -MF .dep/$@.dep -c -o $@ $<
%.o: %.cpp
@$(PRETTYECHO) ' CXX' $<
- @mkdir -p .dep .dep/qt-ui
+ @mkdir -p .dep/$(@D)
$(COMPILE_PREFIX)$(CXX) $(CXXFLAGS) $(EXTRA_FLAGS) -MD -MF .dep/$@.dep -c -o $@ $<
# This rule is for running the moc on QObject subclasses defined in the .h
@@ -220,7 +220,7 @@ confclean: clean
ifneq ($(CONFIGURED)$(CONFIGURING),)
.dep/%.o.dep: %.cpp
- @mkdir -p .dep .dep/qt-ui
+ @mkdir -p $(@D)
@$(CXX) $(CXXFLAGS) $(EXTRA_FLAGS) -MM -MG -MF $@ -MT $(<:.cpp=.o) -c $<
endif
--
1.7.11.7
More information about the subsurface
mailing list