From c7ca6ba59502a540b2a6522aec1c340bfd3d5f9b Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Mon, 2 Aug 2010 16:32:50 +0000
Subject: [PATCH] 2010-08-02 18:32 UTC+0200 Viktor Szakats (harbour.01
 syenar.hu)   * contrib/hbxbp/hbxbp.hbp     ! Missed to update hbqt .hbc file
 references.

  * contrib/make.hbs
    * Deleted unused code.
---
 harbour/ChangeLog               |  7 +++++++
 harbour/contrib/hbxbp/hbxbp.hbp |  3 ++-
 harbour/contrib/make.hbs        | 15 ++-------------
 3 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 347bc6641b..65fc78da0f 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,13 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2010-08-02 18:32 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/hbxbp/hbxbp.hbp
+    ! Missed to update hbqt .hbc file references.
+
+  * contrib/make.hbs
+    * Deleted unused code.
+
 2010-08-02 18:22 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   + contrib/hbqt/hbqtgui.hbc
   + contrib/hbqt/hbqtnetwork.hbc
diff --git a/harbour/contrib/hbxbp/hbxbp.hbp b/harbour/contrib/hbxbp/hbxbp.hbp
index 534975adca..c944a8d711 100644
--- a/harbour/contrib/hbxbp/hbxbp.hbp
+++ b/harbour/contrib/hbxbp/hbxbp.hbp
@@ -9,7 +9,8 @@
 
 -w3 -es2
 
-../hbqt/hbqt.hbc
+../hbqt/hbqtcore.hbc
+../hbqt/hbqtgui.hbc
 
 -instfile=inc:appevent.ch
 -instfile=inc:gra.ch
diff --git a/harbour/contrib/make.hbs b/harbour/contrib/make.hbs
index 3528236723..0974fafcca 100755
--- a/harbour/contrib/make.hbs
+++ b/harbour/contrib/make.hbs
@@ -474,7 +474,6 @@ STATIC FUNCTION call_hbmk2_hbinfo( cProjectPath, hProject )
          IF ! Empty( tmp )
             hb_FNameSplit( LTrim( tmp ), @cDir, @cName )
             AAdd( hProject[ "aDept" ], { "nDepth" => Len( tmp ) - Len( LTrim( tmp ) ),;
-                                         "cFileName_HBC" => LTrim( tmp ),;
                                          "cFileName_HBP" => StrTran( PathNormalize( PathMakeAbsolute( FNameExtSet( PathSepToSelf( LTrim( tmp ) ), ".hbp" ), s_cRebase ) ), "\", "/" ) } )
          ENDIF
       NEXT
@@ -504,16 +503,6 @@ STATIC FUNCTION hbmk2_hbinfo_getitem( cString, cItem, lAll )
 
    RETURN cRetVal
 
-STATIC FUNCTION DepListToStr( aDeptHBC )
-   LOCAL cOptionsLibDyn := ""
-   LOCAL hDept
-
-   FOR EACH hDept IN aDeptHBC
-      cOptionsLibDyn += " " + hDept[ "cFileName_HBC" ]
-   NEXT
-
-   RETURN cOptionsLibDyn
-
 STATIC FUNCTION call_hbmk2( cProjectPath, cOptionsPre, lLibDyn )
    LOCAL nErrorLevel
    LOCAL cOptionsLibDyn := ""
@@ -548,11 +537,11 @@ STATIC FUNCTION call_hbmk2( cProjectPath, cOptionsPre, lLibDyn )
 
    RETURN .T.
 
-STATIC FUNCTION mk_hb_processRun( cCommand )
+STATIC FUNCTION mk_hb_processRun( cCommand, ... )
 
    OutStd( cCommand + hb_eol() )
 
-   RETURN hb_processRun( cCommand )
+   RETURN hb_processRun( cCommand, ... )
 
 STATIC FUNCTION mk_hbd( cDir )
    LOCAL cName