From 75ef19188d021a5e965198bde774c1c33bedc1f3 Mon Sep 17 00:00:00 2001 From: marha Date: Sat, 30 Oct 2010 18:34:27 +0000 Subject: Increased gnu make compatibility. --- tools/mhmake/src/commandqueue.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tools/mhmake/src/commandqueue.cpp') diff --git a/tools/mhmake/src/commandqueue.cpp b/tools/mhmake/src/commandqueue.cpp index fca26f997..6f3fd4d1a 100644 --- a/tools/mhmake/src/commandqueue.cpp +++ b/tools/mhmake/src/commandqueue.cpp @@ -116,7 +116,7 @@ void commandqueue::ThrowCommandExecutionError(refptr pActiveEntry) { fileinfo* pTarget=pActiveEntry->pTarget; const string &Command=pActiveEntry->Command; - mhmakeparser *pMakefile=pTarget->GetRule()->GetMakefile(); + mhmakefileparser *pMakefile=pTarget->GetRule()->GetMakefile(); string ErrorMessage = string("Error running command: ")+ Command +"\n"; ErrorMessage += "Command defined in makefile: " + pMakefile->GetMakeDir()->GetQuotedFullFileName(); @@ -167,7 +167,7 @@ void commandqueue::RemoveActiveEntry(unsigned Entry) bool commandqueue::StartExecuteNextCommand(refptr pActiveEntry, mh_pid_t *pActiveProcess) { fileinfo* pTarget=pActiveEntry->pTarget; - mhmakeparser *pMakefile=pTarget->GetRule()->GetMakefile(); + mhmakefileparser *pMakefile=pTarget->GetRule()->GetMakefile(); pMakefile->SetRuleThatIsBuild(pTarget); // Make sure that the command expension is correct string Command=pMakefile->ExpandExpression(*pActiveEntry->CurrentCommandIt); @@ -222,7 +222,7 @@ void commandqueue::TargetBuildFinished(refptr pActiveEntry) pTarget->SetCommandsMd5_32(Md5_32); /* If the rule of the target was added with an implicit rule the targets in the rule is empty */ refptr pRule=pTarget->GetRule(); - mhmakeparser *pMakefile=pRule->GetMakefile(); + mhmakefileparser *pMakefile=pRule->GetMakefile(); pMakefile->AddTarget(pTarget); pMakefile->SetAutoDepsDirty(); @@ -251,7 +251,7 @@ bool commandqueue::StartExecuteCommands(fileinfo* pTarget) cout << "Building " << pTarget->GetQuotedFullFileName()< pRule=pTarget->GetRule(); - mhmakeparser *pMakefile=pRule->GetMakefile(); + mhmakefileparser *pMakefile=pRule->GetMakefile(); vector::iterator CommandIt=pRule->GetCommands().begin(); refptr pActiveEntry=CreateActiveEntry(); -- cgit v1.2.3