diff --git a/Makefile b/Makefile
index 68f4e78e..417c16bf 100644
--- a/Makefile
+++ b/Makefile
@@ -713,7 +713,9 @@ ifeq ($(USE_LOCAL_HEADERS),1)
 endif
 
 ifeq ($(GENERATE_DEPENDENCIES),1)
-  BASE_CFLAGS += -MMD
+  DEPEND_CFLAGS = -MMD
+else
+  DEPEND_CFLAGS =
 endif
 
 ifeq ($(USE_SVN),1)
@@ -783,10 +785,12 @@ default: release
 all: debug release
 
 debug:
-	@$(MAKE) targets B=$(BD) CFLAGS="$(CFLAGS) $(DEBUG_CFLAGS)" V=$(V)
+	@$(MAKE) targets B=$(BD) CFLAGS="$(CFLAGS) $(DEPEND_CFLAGS) \
+		$(DEBUG_CFLAGS)" V=$(V)
 
 release:
-	@$(MAKE) targets B=$(BR) CFLAGS="$(CFLAGS) $(RELEASE_CFLAGS)" V=$(V)
+	@$(MAKE) targets B=$(BR) CFLAGS="$(CFLAGS) $(DEPEND_CFLAGS) \
+		$(RELEASE_CFLAGS)" V=$(V)
 
 # Create the build directories, check libraries and print out
 # an informational message, then start building