[ros-diffs] [hpoussin] 29176: Do not put .h files in object files, it causes problems at link time

Author: hpoussin
Date: Mon Sep 24 15:00:17 2007
New Revision: 29176

URL: http://svn.reactos.org/svn/reactos?rev=29176&view=rev
Log:
Do not put .h files in object files, it causes problems at link time

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…
==============================================================================
--- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original)
+++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Mon Sep 24 15:00:17 2007
@@ -500,7 +500,7 @@
 		else if ( module.type == RpcClient )
 			newExtension = "_c.o";
 		else
-			newExtension = ".h";
+			return NULL;
 	}
 	else
 		newExtension = ".o";
@@ -913,11 +913,13 @@
 			CompilationUnit& compilationUnit = *compilationUnits[i];
 			if ( !compilationUnit.IsFirstFile () )
 			{
-				fprintf (
-					fMakefile,
-					"%s%s",
-					( i%10 == 9 ? " \\\n\t" : " " ),
-					backend->GetFullName ( *GetObjectFilename ( compilationUnit.GetFilename (), NULL
) ).c_str () );
+				const FileLocation *objectFilename = GetObjectFilename ( compilationUnit.GetFilename
(), NULL );
+				if ( objectFilename )
+					fprintf (
+						fMakefile,
+						"%s%s",
+						( i%10 == 9 ? " \\\n\t" : " " ),
+						backend->GetFullName ( *objectFilename ).c_str () );
 			}
 		}
 		fprintf ( fMakefile, "\n" );