[hpoussin] 32705: Remove some more circular dependencies. May fix bug 3131

Author: hpoussin
Date: Mon Mar 17 05:29:43 2008
New Revision: 32705

URL: http://svn.reactos.org/svn/reactos?rev=3D32705&view=3Drev
Log:
Remove some more circular dependencies.
May fix bug 3131

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

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=3D32705&r1=3D32704&r2=3D32705&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original)
+++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Mon Mar 17 0=
5:29:43 2008
@@ -1253,21 +1253,25 @@
 Rule arHostRule2 ( "\t$(ECHO_AR)\n"
                    "\t${host_ar} -rc $@ $($(module_name)_OBJS)\n",
                    NULL );
-Rule gasRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noex=
t)_$(module_name).o: $(source) ${$(module_name)_precondition}$(dependencies=
) | $(INTERMEDIATE)$(SEP)$(source_dir)\n"
+Rule gasRule ( "$(source): ${$(module_name)_precondition}\n"
+               "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noex=
t)_$(module_name).o: $(source)$(dependencies) | $(INTERMEDIATE)$(SEP)$(sour=
ce_dir)\n"
                "\t$(ECHO_GAS)\n"
                "\t${gcc} -x assembler-with-cpp -c $< -o $@ -D__ASM__ $($(m=
odule_name)_CFLAGS)\n",
                "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noex=
t)_$(module_name).o",
                "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL );
-Rule bootRule ( "$(module_output): $(source) ${$(module_name)_precondition=
}$(dependencies) | $(OUTPUT)$(SEP)$(source_dir)\n"
+Rule bootRule ( "$(source): ${$(module_name)_precondition}\n"
+                "$(module_output): $(source)$(dependencies) | $(OUTPUT)$(S=
EP)$(source_dir)\n"
                 "\t$(ECHO_NASM)\n"
                 "\t$(Q)${nasm} -f win32 $< -o $@ $($(module_name)_NASMFLAG=
S)\n",
                 "$(OUTPUT)$(SEP)$(source_dir)$(SEP)", NULL );
-Rule nasmRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noe=
xt)_$(module_name).o: $(source) ${$(module_name)_precondition}$(dependencie=
s) | $(INTERMEDIATE)$(SEP)$(source_dir)\n"
+Rule nasmRule ( "$(source): ${$(module_name)_precondition}\n"
+                "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noe=
xt)_$(module_name).o: $(source)$(dependencies) | $(INTERMEDIATE)$(SEP)$(sou=
rce_dir)\n"
                 "\t$(ECHO_NASM)\n"
                 "\t$(Q)${nasm} -f win32 $< -o $@ $($(module_name)_NASMFLAG=
S)\n",
                 "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noe=
xt)_$(module_name).o",
                 "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL );
-Rule windresRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_=
noext)_$(module_name).coff: $(source) ${$(module_name)_precondition}$(depen=
dencies) $(WRC_TARGET) | $(INTERMEDIATE)$(SEP)$(source_dir) $(TEMPORARY)\n"
+Rule windresRule ( "$(source): ${$(module_name)_precondition}\n"
+                   "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_=
noext)_$(module_name).coff: $(source)$(dependencies) $(WRC_TARGET) | $(INTE=
RMEDIATE)$(SEP)$(source_dir) $(TEMPORARY)\n"
                    "\t$(ECHO_WRC)\n"
                    "\t${gcc} -xc -E -DRC_INVOKED ${$(module_name)_RCFLAGS}=
 $(source) > $(TEMPORARY)$(SEP)$(module_name).$(source_name_noext).rci.tmp=
n"
                    "\t$(Q)$(WRC_TARGET) ${$(module_name)_RCFLAGS} $(TEMPOR=
ARY)$(SEP)$(module_name).$(source_name_noext).rci.tmp $(TEMPORARY)$(SEP)$(m=
odule_name).$(source_name_noext).res.tmp\n"
@@ -1280,7 +1284,7 @@
                "\t$(ECHO_WMC)\n"
                "\t$(Q)$(WMC_TARGET) -i -H $(INTERMEDIATE)$(SEP)include$(SE=
P)reactos$(SEP)$(source_name_noext).h -o $(INTERMEDIATE)$(SEP)$(source_dir)=
$(SEP)$(source_name_noext).rc $(source)\n",
                "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noex=
t).rc", "$(INTERMEDIATE)$(SEP)include$(SEP)reactos$(SEP)$(source_name_noext=
).h", NULL );
-Rule winebuildRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_nam=
e_noext).spec.def: $(source) $(dependencies) $(WINEBUILD_TARGET) | $(INTERM=
EDIATE)$(SEP)$(source_dir)\n"
+Rule winebuildRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_nam=
e_noext).spec.def: $(source)$(dependencies) $(WINEBUILD_TARGET) | $(INTERME=
DIATE)$(SEP)$(source_dir)\n"
                      "\t$(ECHO_WINEBLD)\n"
                      "\t$(Q)$(WINEBUILD_TARGET) $(WINEBUILD_FLAGS) -o $(IN=
TERMEDIATE)$(SEP)$(source_path)$(SEP)$(source_name_noext).spec.def --def -E=
 $(source_path)$(SEP)$(source_name_noext).spec\n"
                      "$(INTERMEDIATE)$(SEP)$(source_path)$(SEP)$(source_na=
me_noext).stubs.c: $(source_path)$(SEP)$(source_name_noext).spec $(WINEBUIL=
D_TARGET)\n"
@@ -1293,12 +1297,14 @@
                      "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_nam=
e_noext).stubs.c",
                      "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_nam=
e_noext).stubs.o",
                      "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL );
-Rule widlHeaderRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_na=
me_noext).h: $(source) ${$(module_name)_precondition}$(dependencies) $(WIDL=
_TARGET) | $(INTERMEDIATE)$(SEP)$(source_dir)\n"
+Rule widlHeaderRule ( "$(source): ${$(module_name)_precondition}\n"
+                      "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_na=
me_noext).h: $(source)$(dependencies) $(WIDL_TARGET) | $(INTERMEDIATE)$(SEP=
)$(source_dir)\n"
                       "\t$(ECHO_WIDL)\n"
                       "\t$(Q)$(WIDL_TARGET) $($(module_name)_WIDLFLAGS) -h=
 -H $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).h $(source=
)\n",
                       "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_na=
me_noext).h",
                       "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL );
-Rule widlServerRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_na=
me_noext)_s.c $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_=
s.h: $(source) ${$(module_name)_precondition}$(dependencies) $(WIDL_TARGET)=
 | $(INTERMEDIATE)$(SEP)$(source_dir)\n"
+Rule widlServerRule ( "$(source): ${$(module_name)_precondition}\n"
+                      "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_na=
me_noext)_s.c $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_=
s.h: $(source)$(dependencies) $(WIDL_TARGET) | $(INTERMEDIATE)$(SEP)$(sourc=
e_dir)\n"
                       "\t$(ECHO_WIDL)\n"
                       "\t$(Q)$(WIDL_TARGET) $($(module_name)_WIDLFLAGS) -h=
 -H $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_s.h -s -S =
$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_s.c $(source)=
n"
                       "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_na=
me_noext)_s.o: $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)=
_s.c $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_s.h$(depe=
ndencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n"
@@ -1308,7 +1314,8 @@
                       "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_na=
me_noext)_s.c",
                       "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_na=
me_noext)_s.o",
                       "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL );
-Rule widlClientRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_na=
me_noext)_c.c $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_=
c.h: $(source) ${$(module_name)_precondition}$(dependencies) $(WIDL_TARGET)=
 | $(INTERMEDIATE)$(SEP)$(source_dir)\n"
+Rule widlClientRule ( "$(source): ${$(module_name)_precondition}\n"
+                      "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_na=
me_noext)_c.c $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_=
c.h: $(source)$(dependencies) $(WIDL_TARGET) | $(INTERMEDIATE)$(SEP)$(sourc=
e_dir)\n"
                       "\t$(ECHO_WIDL)\n"
                       "\t$(Q)$(WIDL_TARGET) $($(module_name)_WIDLFLAGS) -h=
 -H $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_c.h -c -C =
$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_c.c $(source)=
n"
                       "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_na=
me_noext)_c.o: $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)=
_c.c $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_c.h$(depe=
ndencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n"
@@ -1318,7 +1325,8 @@
                       "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_na=
me_noext)_c.c",
                       "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_na=
me_noext)_c.o",
                       "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL );
-Rule widlProxyRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_nam=
e_noext)_p.c $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p=
.h: $(source) ${$(module_name)_precondition}$(dependencies) $(WIDL_TARGET) =
| $(INTERMEDIATE)$(SEP)$(source_dir)\n"
+Rule widlProxyRule ( "$(source): ${$(module_name)_precondition}\n"
+                     "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_nam=
e_noext)_p.c $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p=
.h: $(source)$(dependencies) $(WIDL_TARGET) | $(INTERMEDIATE)$(SEP)$(source=
_dir)\n"
                      "\t$(ECHO_WIDL)\n"
                      "\t$(Q)$(WIDL_TARGET) $($(module_name)_WIDLFLAGS) -h =
-H $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.h -p -P $=
(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.c $(source)\n"
                      "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_nam=
e_noext)_p.o: $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_=
p.c $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.h$(depen=
dencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n"
@@ -1328,7 +1336,8 @@
                      "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_nam=
e_noext)_p.c",
                      "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_nam=
e_noext)_p.o",
                      "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL );
-Rule widlTlbRule ( "$(OUTPUT)$(SEP)$(source_dir)$(SEP)$(module_name).tlb: =
$(source) ${$(module_name)_precondition}$(dependencies) $(WIDL_TARGET) | $(=
INTERMEDIATE)$(SEP)$(source_dir)\n"
+Rule widlTlbRule ( "$(source): ${$(module_name)_precondition}\n"
+                   "$(OUTPUT)$(SEP)$(source_dir)$(SEP)$(module_name).tlb: =
$(source)$(dependencies) $(WIDL_TARGET) | $(INTERMEDIATE)$(SEP)$(source_dir=
)\n"
                    "\t$(ECHO_WIDL)\n"
                    "\t$(Q)$(WIDL_TARGET) $($(module_name)_WIDLFLAGS) -t -T=
 $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).tlb $(source)=
\n",
                    "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL );
@@ -1864,10 +1873,10 @@
    	delete definitionFilename;
    }
 =

-    if(module.type =3D=3D HostStaticLibrary)
-        arHostRule2.Execute ( fMakefile, backend, module, archiveFilename,=
 clean_files );
-    else
-        arRule2.Execute ( fMakefile, backend, module, archiveFilename, cle=
an_files );
+	if(module.type =3D=3D HostStaticLibrary)
+		arHostRule2.Execute ( fMakefile, backend, module, archiveFilename, clean=
_files );
+	else
+		arRule2.Execute ( fMakefile, backend, module, archiveFilename, clean_fil=
es );
 =

GenerateCleanObjectsAsYouGoCode ();
 =

@@ -2286,9 +2295,8 @@
    if ( module.host =3D=3D HostTrue )
    	return;
 =

-	dependencies.push_back ( "$(INIT)" );
    if ( module.name !=3D "psdk" )
-		dependencies.push_back ( "$(PSDK_TARGET) $(psdk_HEADERS)" );
+		dependencies.push_back ( "$(INIT) $(PSDK_TARGET) $(psdk_HEADERS)" );
 =

/* Check if any dependent library relies on the generated headers */
    for ( size_t i =3D 0; i < module.project.modules.size (); i++ )