From 040db982fbcedad897b212f5ef7d2a58086c8124 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Tue, 12 Mar 2013 23:12:02 +0000 Subject: [PATCH] 2013-03-13 00:09 UTC+0100 Viktor Szakats (harbour syenar.net) * utils/hbmk2/hbmk2.prg ! do not issue pointless pair warning for -rebuildall, it may be useful because it applies to subprojects --- harbour/ChangeLog.txt | 7 ++++++- harbour/utils/hbmk2/hbmk2.prg | 1 - 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/harbour/ChangeLog.txt b/harbour/ChangeLog.txt index 5d3c3e60c2..7938c3aa85 100644 --- a/harbour/ChangeLog.txt +++ b/harbour/ChangeLog.txt @@ -10,6 +10,11 @@ * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment */ +2013-03-13 00:09 UTC+0100 Viktor Szakats (harbour syenar.net) + * utils/hbmk2/hbmk2.prg + ! do not issue pointless pair warning for -rebuildall, + it may be useful because it applies to subprojects + 2013-03-12 23:42 UTC+0100 Viktor Szakats (harbour syenar.net) * utils/hbmk2/hbmk2.prg + smarter help output requiring less manual tweaking, @@ -32,7 +37,7 @@ * utils/hbmk2/hbmk2.*.po * utils/hbmk2/hbmk2.prg - + show warning when both -inc and -rebuild[all] options are + + show warning when both -inc and -rebuild options are unconditionally passed together on command-line or inside one make file. These instruct hbmk2 to do all the extra work involved diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index 2e26b36c55..1f6b004728 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -2617,7 +2617,6 @@ STATIC FUNCTION __hbmk( aArgs, nArgTarget, nLevel, /* @ */ lPause, /* @ */ lExit hbmk[ _HBMK_lINC ] := .T. hbmk[ _HBMK_lREBUILD ] := .T. - PointlessPairWarning( hbmk, @aParamINC, aParam, cParamL, "-rebuildall" ) CASE cParamL == "-rebuildpo" ; hbmk[ _HBMK_lREBUILDPO ] := .T. CASE cParamL == "-minipo" ; hbmk[ _HBMK_lMINIPO ] := .T.