From 496f64f3de5201b8cb5e6c3f6fb11f7b3f5eae05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Remko=20Tron=C3=A7on?= Date: Mon, 22 Jun 2009 21:57:11 +0200 Subject: Let each module define its own .dep files. 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) -- cgit v0.10.2-6-g49f6