summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2009-06-22 19:57:11 (GMT)
committerRemko Tronçon <git@el-tramo.be>2009-06-22 19:57:11 (GMT)
commit496f64f3de5201b8cb5e6c3f6fb11f7b3f5eae05 (patch)
treedf6a023a71712e747fe047420ba357e52cd0252c
parent216cdc29eb9454f5eb772f3324ccf5210c48528a (diff)
downloadswift-contrib-496f64f3de5201b8cb5e6c3f6fb11f7b3f5eae05.zip
swift-contrib-496f64f3de5201b8cb5e6c3f6fb11f7b3f5eae05.tar.bz2
Let each module define its own .dep files.
-rw-r--r--Makefile5
-rw-r--r--QA/UnitTest/Makefile.inc1
-rw-r--r--Swiften/Makefile.inc3
3 files changed, 5 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index f0eaad0..4434a2e 100644
--- a/Makefile
+++ b/Makefile
@@ -69,7 +69,7 @@ clean: clean-deps $(CLEAN_TARGETS)
.PHONY: clean-deps
clean-deps:
- -$(RM) $(SWIFTEN_SOURCES:.cpp=.dep) $(SWIFTEN_OBJECTIVE_SOURCES:.mm=.dep) $(UNITTEST_SOURCES:.cpp=.dep)
+ -$(RM) $(DEPS)
################################################################################
@@ -78,9 +78,6 @@ clean-deps:
ifeq (,$(findstring clean, $(MAKECMDGOALS)))
ifeq (,$(findstring clean-deps, $(MAKECMDGOALS)))
--include $(SWIFTEN_SOURCES:.cpp=.dep)
--include $(SWIFTEN_OBJECTIVE_SOURCES:.mm=.dep)
--include $(UNITTEST_SOURCES:.cpp=.dep)
-include $(DEPS)
endif
endif
diff --git a/QA/UnitTest/Makefile.inc b/QA/UnitTest/Makefile.inc
index 820fb64..531f616 100644
--- a/QA/UnitTest/Makefile.inc
+++ b/QA/UnitTest/Makefile.inc
@@ -7,6 +7,7 @@ UNITTEST_OBJECTS = \
TEST_TARGETS += check
CLEANFILES += $(UNITTEST_OBJECTS) $(UNITTEST_TARGET)
+DEPS += $(UNITTEST_SOURCES:.cpp=.dep)
.PHONY: check
check: $(UNITTEST_TARGET)
diff --git a/Swiften/Makefile.inc b/Swiften/Makefile.inc
index 4b09bf3..d5bf0f5 100644
--- a/Swiften/Makefile.inc
+++ b/Swiften/Makefile.inc
@@ -39,6 +39,9 @@ TARGETS += $(SWIFTEN_TARGET)
INSTALL_TARGETS += install-swiften
UNITTEST_LIBS += $(SWIFTEN_TARGET)
CLEANFILES += $(SWIFTEN_TARGET) $(SWIFTEN_OBJECTS)
+DEPS += \
+ $(SWIFTEN_SOURCES:.cpp=.dep) \
+ $(SWIFTEN_OBJECTIVE_SOURCES:.mm=.dep)
.PHONY: lib
lib: $(SWIFTEN_TARGET)