Transform psdk into a real dependency, instead of a target only created after rbuild.

Fixes case where compilation wasn't stopping if rbuild was failing/crashing

svn path=/trunk/; revision=28572

diff --git a/reactos/Makefile b/reactos/Makefile
index cc27327..f9636b0 100644 (file)
--- a/reactos/Makefile
+++ b/reactos/Makefile
@@ -420,7 +420,6 @@ $(ROS_AUTOMAKE): $(RBUILD_TARGET) $(PREAUTO) $(XMLBUILDFILES)
        ${mkdir} $(OUTPUT_)media$(SEP)inf 2>$(NUL)
        $(ECHO_RBUILD)
        $(Q)$(RBUILD_TARGET) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) mingw
-       @$(MAKE) psdk
 
 world: all bootcd livecd
 
@@ -626,5 +625,5 @@ clean: makefile_auto_clean
 
 .PHONY: depends
 depends:
-       @-$(rm) makefile.auto
+       @-$(rm) $(ROS_AUTOMAKE)
        @$(MAKE) $(filter-out depends, $(MAKECMDGOALS))

diff --git a/reactos/tools/rbuild/backend/mingw/modulehandler.cpp b/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
index f26f96c..7c16387 100644 (file)
--- a/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
+++ b/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
@@ -2193,6 +2193,11 @@ MingwModuleHandler::GetDefaultDependencies (
                && module.name != "hostzlib" )
 
                dependencies.push_back ( "$(INIT)" );
+
+       if ( module.type != BuildTool
+               && module.name != "psdk" )
+
+               dependencies.push_back ( "$(PSDK_TARGET)" );
 }
 
 void