[ros-diffs] [cfinck] 28629: Merge 28572:28574 ("make depends" fixes)

[cfinck at svn.reactos.org]

Author: cfinck
Date: Tue Aug 28 23:50:18 2007
New Revision: 28629

URL: http://svn.reactos.org/svn/reactos?rev=28629&view=rev
Log:
Merge 28572:28574 ("make depends" fixes)

Modified:
    branches/ros-branch-0_3_3-new/reactos/Makefile
    branches/ros-branch-0_3_3-new/reactos/tools/rbuild/backend/mingw/modulehandler.cpp

Modified: branches/ros-branch-0_3_3-new/reactos/Makefile
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/Makefile?rev=28629&r1=28628&r2=28629&view=diff
==============================================================================
--- branches/ros-branch-0_3_3-new/reactos/Makefile (original)
+++ branches/ros-branch-0_3_3-new/reactos/Makefile Tue Aug 28 23:50:18 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
 
@@ -625,6 +624,6 @@
 clean: makefile_auto_clean
 
 .PHONY: depends
-depends:
-	@-$(rm) makefile.auto
-	@$(MAKE) $(filter-out depends, $(MAKECMDGOALS))
+depends: $(RBUILD_TARGET)
+	$(ECHO_RBUILD)
+	$(Q)$(RBUILD_TARGET) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) mingw

Modified: branches/ros-branch-0_3_3-new/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/tools/rbuild/backend/mingw/modulehandler.cpp?rev=28629&r1=28628&r2=28629&view=diff
==============================================================================
--- branches/ros-branch-0_3_3-new/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original)
+++ branches/ros-branch-0_3_3-new/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Tue Aug 28 23:50:18 2007
@@ -615,7 +615,7 @@
 	fprintf ( fMakefile,
 	          "\t$(ECHO_RBUILD)\n" );
 	fprintf ( fMakefile,
-	          "\t$(Q)$(RBUILD_TARGET) -dm%s mingw\n",
+	          "\t$(Q)$(RBUILD_TARGET) $(RBUILD_FLAGS) -dm%s mingw\n",
 	          module.name.c_str () );
 }
 
@@ -2193,6 +2193,11 @@
 		&& module.name != "hostzlib" )
 
 		dependencies.push_back ( "$(INIT)" );
+
+	if ( module.type != BuildTool
+		&& module.name != "psdk" )
+
+		dependencies.push_back ( "$(PSDK_TARGET)" );
 }
 
 void