[ros-diffs] [hyperion] 36929: modified tools/rbuild/backend/mingw/modulehandler.cpp Allow static libraries to "link" to other static libraries Removed some dead code modified dll/nls/normaliz_redist/normaliz_redist.rbuild modified dll/win32/kernel32/kernel32.rbuild No need to specify icu4ros explicitely anymore, thanks to the rbuild changes Make kernel32_base include normalize, rather than linking it as an external dependency of kernel32

Author: hyperion
Date: Fri Oct 24 21:52:24 2008
New Revision: 36929
URL: http://svn.reactos.org/svn/reactos?rev=36929&view=rev
Log:
modified   tools/rbuild/backend/mingw/modulehandler.cpp
   Allow static libraries to "link" to other static libraries
   Removed some dead code
modified   dll/nls/normaliz_redist/normaliz_redist.rbuild
modified   dll/win32/kernel32/kernel32.rbuild
   No need to specify icu4ros explicitely anymore, thanks to the rbuild changes
   Make kernel32_base include normalize, rather than linking it as an external dependency
of kernel32
Modified:
    trunk/reactos/dll/nls/normaliz_redist/normaliz_redist.rbuild
    trunk/reactos/dll/win32/kernel32/kernel32.rbuild
    trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
Modified: trunk/reactos/dll/nls/normaliz_redist/normaliz_redist.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/nls/normaliz_redist/no…
==============================================================================
--- trunk/reactos/dll/nls/normaliz_redist/normaliz_redist.rbuild [iso-8859-1] (original)
+++ trunk/reactos/dll/nls/normaliz_redist/normaliz_redist.rbuild [iso-8859-1] Fri Oct 24
21:52:24 2008
@@ -7,7 +7,6 @@
 <module name="normaliz_redist" type="win32dll"
installname="normaliz_redist.dll">
        <library>normalize</library>
        <library>idna</library>
-       <library>icu4ros</library>
        <library>normaliz_redist_data</library>
        <library>libcntpr</library>
        <library>kernel32</library>
Modified: trunk/reactos/dll/win32/kernel32/kernel32.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3…
==============================================================================
--- trunk/reactos/dll/win32/kernel32/kernel32.rbuild [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/kernel32/kernel32.rbuild [iso-8859-1] Fri Oct 24 21:52:24 2008
@@ -120,6 +120,8 @@
                                </directory>
                        </if>
                </directory>
+
+               <library>normalize</library>
        </module>
        <module name="kernel32" type="win32dll"
baseaddress="${BASEADDRESS_KERNEL32}" installbase="system32"
installname="kernel32.dll">
                <importlibrary definition="kernel32.def" />
@@ -134,9 +136,6 @@
                <file>kernel32.rc</file>
-               <library>normalize</library>
-               <library>icu4ros</library>
-
                <library>ntdll</library>
        </module>
 </group>
Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw…
==============================================================================
--- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] (original)
+++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] Fri Oct 24
21:52:24 2008
@@ -347,6 +347,18 @@
                dep = backend->GetFullName ( *library_target );
                delete library_target;
        }
+
+       if ( IsStaticLibrary ( importedModule ) || importedModule.type == ObjectLibrary )
+       {
+               const std::vector<Library*>& libraries =
importedModule.non_if_data.libraries;
+
+               for ( size_t i = 0; i < libraries.size (); ++ i )
+               {
+                       dep += " ";
+                       dep += GetImportLibraryDependency (
*libraries[i]->importedModule );
+               }
+       }
+
        return dep;
 }
@@ -2891,7 +2903,6 @@
        CLEAN_FILE ( junk_tmp );
        string objectsMacro = GetObjectsMacro ( module );
        string linkDepsMacro = GetLinkingDependenciesMacro ();
-       string libsMacro = GetLibsMacro ();
        GenerateRules ();
@@ -2968,7 +2979,6 @@
        CLEAN_FILE ( junk_cpy );
        string objectsMacro = GetObjectsMacro ( module );
        string linkDepsMacro = GetLinkingDependenciesMacro ();
-       string libsMacro = GetLibsMacro ();
        const Module *payload = module.project.LocateModule ( module.payload );
        GenerateRules ();