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
This commit is contained in:
Hervé Poussineau
2007-08-26 12:06:28 +00:00
parent 718e6afb4c
commit c34ec8ad1d
2 changed files with 6 additions and 2 deletions
+1 -2
View File
@@ -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))
@@ -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