diff options
| author | marha <marha@users.sourceforge.net> | 2009-11-19 07:35:58 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-11-19 07:35:58 +0000 |
| commit | 53cc6cb6ba430aad512bbdfc9828dd9b98682fbd (patch) | |
| tree | 8c8339237136cbd414f055c84cbb6376614e79c7 | |
| parent | b6ebd3b00a6080469e40e83c1c97571fded386e2 (diff) | |
| download | vcxsrv-53cc6cb6ba430aad512bbdfc9828dd9b98682fbd.tar.gz vcxsrv-53cc6cb6ba430aad512bbdfc9828dd9b98682fbd.tar.bz2 vcxsrv-53cc6cb6ba430aad512bbdfc9828dd9b98682fbd.zip | |
Now the automatic dependency filename is derived from the makefile filename.
| -rw-r--r-- | tools/mhmake/src/util.cpp | 4 | ||||
| -rw-r--r-- | tools/mhmake/src/util.h | 4 |
2 files changed, 3 insertions, 5 deletions
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
{
|