[chorns] 14314: Output rules for objectlibrary files

Output rules for objectlibrary files
Modified:
branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp
Modified:
branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler
.cpp
Modified: branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp
  _____

Modified:
branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp
--- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp
2005-03-25 15:48:03 UTC (rev 14313)
+++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp
2005-03-25 16:32:46 UTC (rev 14314)
@@ -143,6 +143,7 @@

for ( i = 0; i < iend; i++ )
    	v[i]->GenerateObjectMacro();
+	fprintf ( fMakefile, "\n" );
    for ( i = 0; i < iend; i++ )
    	v[i]->GenerateTargetMacro();
    fprintf ( fMakefile, "\n" );
  _____

Modified:
branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler
.cpp
---
branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler
.cpp	2005-03-25 15:48:03 UTC (rev 14313)
+++
branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler
.cpp	2005-03-25 16:32:46 UTC (rev 14314)
@@ -1234,7 +1234,7 @@

fprintf (
    	fMakefile,
-		"%s += $(%s)",
+		"%s += $(%s)\n",
    	linkDepsMacro.c_str (),
    	libsMacro.c_str () );

@@ -1281,17 +1281,18 @@
    	module.name.c_str (),
    	GetTargetMacro ( module ).c_str () );

+	string ar_target;
    if ( module.type != ObjectLibrary )
-	{
-		string ar_target =
-			GenerateArchiveTarget ( ar, objectsMacro );
+		ar_target = GenerateArchiveTarget ( ar, objectsMacro );

-		GenerateObjectFileTargets ( cc,
-
cppc,
-
cflagsMacro,
-
nasmflagsMacro,
-
windresflagsMacro );
+	GenerateObjectFileTargets ( cc,
+								cppc,
+
cflagsMacro,
+
nasmflagsMacro,
+
windresflagsMacro );

+	if ( module.type != ObjectLibrary )
+	{
    	if ( targetMacro != ar_target )
    	{
    		CLEAN_FILE ( ar_target );
@@ -1722,8 +1723,7 @@
    {
    	GenerateRules ();

-		string dependencies =
-			objectsMacro + " " + linkDepsMacro;
+		string dependencies = objectsMacro + " " +
linkDepsMacro;

string linkerParameters = ssprintf (
"-Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,%s
-Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles
-mdll",

module.entrypoint.c_str (),
  _____

Modified: branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp
--- branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp
2005-03-25 15:48:03 UTC (rev 14313)
+++ branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp
2005-03-25 16:32:46 UTC (rev 14314)
@@ -561,11 +561,6 @@

if ( HasImportLibrary () )
    {
    	return ReplaceExtension ( GetPath(), ".a" );
-		/*return ssprintf ( "dk%cnkm%clib%clib%s.a",
-		                  CSEP,
-		                  CSEP,
-		                  CSEP,
-		                  name.c_str () );*/
    }
    else
    	return GetPath();