Author: hpoussin
Date: Tue Sep 9 02:21:37 2008
New Revision: 36077
URL:
http://svn.reactos.org/svn/reactos?rev=36077&view=rev
Log:
Remove GetExtraDependencies() function.
It was only called when the file extension was .c/.cc/.cpp/.cxx, and the function was
returning empty string in those cases.
Modified:
trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h
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] Tue Sep 9
02:21:37 2008
@@ -261,33 +261,6 @@
if ( index != string::npos )
return filename.substr ( 0, index );
return "";
-}
-
-string
-MingwModuleHandler::GetExtraDependencies (
- const FileLocation *file ) const
-{
- string extension = GetExtension ( *file );
- if ( extension == ".idl" || extension == ".IDL" )
- {
- const FileLocation *header;
- switch ( module.type )
- {
- case RpcServer: header = GetRpcServerHeaderFilename ( file ); break;
- case RpcClient: header = GetRpcClientHeaderFilename ( file ); break;
- case RpcProxy: header = GetRpcProxyHeaderFilename ( file ); break;
- case IdlHeader: header = GetIdlHeaderFilename ( file ); break;
- default: header = NULL; break;
- }
- if ( !header )
- return "";
-
- string dependencies = backend->GetFullName ( *header );
- delete header;
- return " " + dependencies;
- }
- else
- return "";
}
string
@@ -1327,7 +1300,7 @@
{
GenerateGccCommand ( &sourceFile,
customRule,
- GetCompilationUnitDependencies ( compilationUnit ) +
GetExtraDependencies ( &sourceFile ) + extraDependencies );
+ GetCompilationUnitDependencies ( compilationUnit ) +
extraDependencies );
}
else if ( customRule )
customRule->Execute ( fMakefile, backend, module, &sourceFile, clean_files );
Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw…
==============================================================================
--- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h [iso-8859-1] (original)
+++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h [iso-8859-1] Tue Sep 9
02:21:37 2008
@@ -80,7 +80,6 @@
virtual void GetModuleSpecificCompilationUnits (
std::vector<CompilationUnit*>& compilationUnits );
std::string GetWorkingDirectory () const;
std::string GetBasename ( const std::string& filename ) const;
- std::string GetExtraDependencies ( const FileLocation *file ) const;
std::string GetCompilationUnitDependencies ( const CompilationUnit& compilationUnit
) const;
const FileLocation* GetModuleArchiveFilename () const;
std::string GetImportLibraryDependency ( const Module& importedModule );