From 53cc6cb6ba430aad512bbdfc9828dd9b98682fbd Mon Sep 17 00:00:00 2001 From: marha Date: Thu, 19 Nov 2009 07:35:58 +0000 Subject: Now the automatic dependency filename is derived from the makefile filename. --- tools/mhmake/src/util.cpp | 4 ++-- tools/mhmake/src/util.h | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) (limited to 'tools/mhmake/src') diff --git a/tools/mhmake/src/util.cpp b/tools/mhmake/src/util.cpp index 95f8b68c9..a6f042446 100644 --- a/tools/mhmake/src/util.cpp +++ b/tools/mhmake/src/util.cpp @@ -510,7 +510,7 @@ void loadedmakefile::LoadMakefile() { throw string("When making use of MHMAKECONF, you have to define OBJDIR in makefile.before"); } - DepFile=GetFileInfo(ObjDirName+OSPATHSEPSTR MAKEDEPFILE); + DepFile=GetFileInfo(ObjDirName+OSPATHSEPSTR "." + m_Makefile->GetName()+ ".dep"); m_pParser->SetVariable(AUTODEPFILE,DepFile->GetQuotedFullFileName()); } else @@ -532,7 +532,7 @@ void loadedmakefile::LoadMakefile() char ID[10]; sprintf(ID,"_%x",md5_finish32( &ctx)); - DepFile=GetFileInfo(string(MAKEDEPFILE)+ID); + DepFile=GetFileInfo(string(".") + m_Makefile->GetName()+ ".dep"+ID); m_pParser->SetVariable(AUTODEPFILE,DepFile->GetQuotedFullFileName()); } diff --git a/tools/mhmake/src/util.h b/tools/mhmake/src/util.h index 9f632ab48..2665e0e0c 100644 --- a/tools/mhmake/src/util.h +++ b/tools/mhmake/src/util.h @@ -50,9 +50,7 @@ #define PLATFORM "linux" #endif -#define MHMAKEVER "1.4.6" - -#define MAKEDEPFILE ".makefile.dep" +#define MHMAKEVER "1.4.7" class makecommand { -- cgit v1.2.3