summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2009-06-22 19:39:42 (GMT)
committerRemko Tronçon <git@el-tramo.be>2009-06-22 19:39:42 (GMT)
commit9c9f97dc9ab10b644f59a9753c69b9691622025b (patch)
tree4a8c463c03122b9f277c33932f96413aa26a52fe
parent0bebf1a69870f75432517cfcb6d115996cf5be4f (diff)
downloadswift-contrib-9c9f97dc9ab10b644f59a9753c69b9691622025b.zip
swift-contrib-9c9f97dc9ab10b644f59a9753c69b9691622025b.tar.bz2
Include Swift/Controllers dependencies in Makefile.
-rw-r--r--Makefile1
-rw-r--r--Swift/Controllers/Makefile.inc1
2 files changed, 2 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index dc9b8c2..f0eaad0 100644
--- a/Makefile
+++ b/Makefile
@@ -81,6 +81,7 @@ 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/Swift/Controllers/Makefile.inc b/Swift/Controllers/Makefile.inc
index 1a6ab4e..5e30a63 100644
--- a/Swift/Controllers/Makefile.inc
+++ b/Swift/Controllers/Makefile.inc
@@ -18,6 +18,7 @@ SWIFT_CONTROLLERS_OBJECTS = \
TARGETS += $(SWIFT_CONTROLLERS_TARGET)
UNITTEST_LIBS += $(SWIFT_CONTROLLERS_TARGET)
CLEANFILES += $(SWIFT_CONTROLLERS_TARGET) $(SWIFT_CONTROLLERS_OBJECTS)
+DEPS += $(SWIFT_CONTROLLERS_SOURCES:.cpp=.dep)
$(SWIFT_CONTROLLERS_TARGET): $(SWIFT_CONTROLLERS_OBJECTS)
$(QUIET_AR)$(AR) $(ARFLAGS) $@ $(SWIFT_CONTROLLERS_OBJECTS)