aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-02-03 07:02:30 +0000
committermarha <marha@users.sourceforge.net>2011-02-03 07:02:30 +0000
commitbb0b8a5bed072a5203baf3ea963106c50ec2287e (patch)
tree3d2ae19e2bf6b34954f10ae0119e559a3ecebc39
parent6bae47acf680a896f1f68f39a307c7910d5c1e2f (diff)
downloadvcxsrv-bb0b8a5bed072a5203baf3ea963106c50ec2287e.tar.gz
vcxsrv-bb0b8a5bed072a5203baf3ea963106c50ec2287e.tar.bz2
vcxsrv-bb0b8a5bed072a5203baf3ea963106c50ec2287e.zip
Solved problem of auto dependency scan not happening in case a rule exists (and not only for implicit rule)
-rw-r--r--tools/mhmake/src/build.cpp4
-rw-r--r--tools/mhmake/src/util.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/tools/mhmake/src/build.cpp b/tools/mhmake/src/build.cpp
index f45624843..682a98410 100644
--- a/tools/mhmake/src/build.cpp
+++ b/tools/mhmake/src/build.cpp
@@ -1373,8 +1373,8 @@ mh_time_t mhmakefileparser::StartBuildTarget(fileinfo* pTarget,bool bCheckTarget
}
mh_time_t TargetDate=pTarget->GetDate();
- bool MakeTarget=false;
mh_time_t YoungestDate=TargetDate;
+ bool MakeTarget=!TargetDate.DoesExist();
if (!pRule || !pRule->GetCommands().size())
{
@@ -1456,7 +1456,7 @@ mh_time_t mhmakefileparser::StartBuildTarget(fileinfo* pTarget,bool bCheckTarget
pRule->PrintCommands(pTarget);
}
#endif
- if (!TargetDate.DoesExist() || ThisYoungestDate.IsNewer(TargetDate))
+ if (ThisYoungestDate.IsNewer(TargetDate))
{
#ifdef _DEBUG
if (pRule,g_pPrintDependencyCheck && ThisYoungestDate.IsExistingFile() && TargetDate.IsExistingFile())
diff --git a/tools/mhmake/src/util.h b/tools/mhmake/src/util.h
index 68ff03992..f789584a1 100644
--- a/tools/mhmake/src/util.h
+++ b/tools/mhmake/src/util.h
@@ -50,7 +50,7 @@
#define PLATFORM "linux"
#endif
-#define MHMAKEVER "2.4.4"
+#define MHMAKEVER "2.4.5"
class makecommand
{