[ros-diffs] [hpoussin] 28572: 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

[hpoussin at svn.reactos.org]

Author: hpoussin
Date: Sun Aug 26 16:06:28 2007
New Revision: 28572

URL: http://svn.reactos.org/svn/reactos?rev=28572&view=rev
Log:
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

Modified:
    trunk/reactos/Makefile
    trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp

Modified: trunk/reactos/Makefile
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/Makefile?rev=28572&r1=28571&r2=28572&view=diff
==============================================================================
--- trunk/reactos/Makefile (original)
+++ trunk/reactos/Makefile Sun Aug 26 16:06:28 2007
@@ -420,7 +420,6 @@
 	${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 @@
 
 .PHONY: depends
 depends:
-	@-$(rm) makefile.auto
+	@-$(rm) $(ROS_AUTOMAKE)
 	@$(MAKE) $(filter-out depends, $(MAKECMDGOALS))

Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp?rev=28572&r1=28571&r2=28572&view=diff
==============================================================================
--- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original)
+++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Sun Aug 26 16:06:28 2007
@@ -2193,6 +2193,11 @@
 		&& module.name != "hostzlib" )
 
 		dependencies.push_back ( "$(INIT)" );
+
+	if ( module.type != BuildTool
+		&& module.name != "psdk" )
+
+		dependencies.push_back ( "$(PSDK_TARGET)" );
 }
 
 void