2008-01-31 18:29 UTC+0100 Marek Paliwoda (mpaliwoda at interia pl)

* contrib/gtwvg/common.mak * contrib/hbapollo/common.mak * contrib/hbbmcdx/common.mak * contrib/hbbtree/common.mak * contrib/hbclipsm/common.mak * contrib/hbct/common.mak * contrib/hbfbird/common.mak * contrib/hbfimage/common.mak * contrib/hbgd/common.mak * contrib/hbgt/common.mak * contrib/hbmisc/common.mak * contrib/hbmsql/common.mak * contrib/hbmysql/common.mak * contrib/hbnf/common.mak * contrib/hbodbc/common.mak * contrib/hbole/common.mak * contrib/hbpgsql/common.mak * contrib/hbtip/common.mak * contrib/hbtpathy/common.mak * contrib/hbw32/common.mak * contrib/hbw32ddr/common.mak * contrib/hbwhat32/common.mak * contrib/hbziparch/common.mak * contrib/hbzlib/common.mak * contrib/mtpl_b32.mak * contrib/mtpl_vc.mak * contrib/rddado/common.mak * contrib/rddads/common.mak * contrib/xhb/common.mak * contrib/mtpl_gcc.mak ! Fixed possible error in Bcc build, related to recent changes + contrib/hbbmcdx/make_gcc.sh + contrib/hbbtree/make_gcc.sh + contrib/rddado/make_gcc.sh + contrib/make_gcc_all.sh + contrib/mtpl_gcc.sh + Readded, due to my wrong last commit, when these files were not added at all
2008-01-31 17:30:36 +00:00
parent ca8c0a0e89
commit fc69ecbf6e
35 changed files with 635 additions and 461 deletions
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,47 @@
   2002-12-01 13:30 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */

+2008-01-31 18:29 UTC+0100 Marek Paliwoda (mpaliwoda at interia pl)
+   * contrib/gtwvg/common.mak
+   * contrib/hbapollo/common.mak
+   * contrib/hbbmcdx/common.mak
+   * contrib/hbbtree/common.mak
+   * contrib/hbclipsm/common.mak
+   * contrib/hbct/common.mak
+   * contrib/hbfbird/common.mak
+   * contrib/hbfimage/common.mak
+   * contrib/hbgd/common.mak
+   * contrib/hbgt/common.mak
+   * contrib/hbmisc/common.mak
+   * contrib/hbmsql/common.mak
+   * contrib/hbmysql/common.mak
+   * contrib/hbnf/common.mak
+   * contrib/hbodbc/common.mak
+   * contrib/hbole/common.mak
+   * contrib/hbpgsql/common.mak
+   * contrib/hbtip/common.mak
+   * contrib/hbtpathy/common.mak
+   * contrib/hbw32/common.mak
+   * contrib/hbw32ddr/common.mak
+   * contrib/hbwhat32/common.mak
+   * contrib/hbziparch/common.mak
+   * contrib/hbzlib/common.mak
+   * contrib/mtpl_b32.mak
+   * contrib/mtpl_vc.mak
+   * contrib/rddado/common.mak
+   * contrib/rddads/common.mak
+   * contrib/xhb/common.mak
+   * contrib/mtpl_gcc.mak
+     ! Fixed possible error in Bcc build, related to recent changes
+
+   + contrib/hbbmcdx/make_gcc.sh
+   + contrib/hbbtree/make_gcc.sh
+   + contrib/rddado/make_gcc.sh
+   + contrib/make_gcc_all.sh
+   + contrib/mtpl_gcc.sh
+     + Readded, due to my wrong last commit, when these files
+       were not added at all
+
 2008-01-31 18:07 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
   * common.mak
   * harbour-ce-spec
@@ -17,7 +58,7 @@
   * utils/hbpptest/Makefile
   + utils/hbpptest/hbpptest.prg
   - utils/hbpptest/pretest.prg
-     ! Fixed hbpptest to have this name (instead of 'pretest') even 
+     ! Fixed hbpptest to have this name (instead of 'pretest') even
       when built with the GNU make system.

 2008-01-31 17:40 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
@@ -27,7 +68,7 @@

   * source/rtl/net.c
   * include/hbapi.h
-     + Added hb_netname() and hb_username() low level versions 
+     + Added hb_netname() and hb_username() low level versions
       of NETNAME() and hb_USERNAME().

 2008-01-31 17:40 UTC+0100 Ryszard Glab <harbour//rglab.pl>
@@ -41,7 +82,7 @@
     ! Removed non-compatible xhb extension from NetName().
     + hb_UserName() function added with the above functionality.
     ! Slight correction to the Win32 branch of hb_UserName().
-     + Added compatibility translations to NetName(1) for 
+     + Added compatibility translations to NetName(1) for
       xhb lib users (enough to #include "hbcompat.ch").

 2008-01-31 14:13 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
@@ -56,9 +97,9 @@

 2008-01-31 12:40 UTC+0100 Ryszard Glab <harbour//rglab.pl>
   * doc/howtosvn.txt
-      * svn update does not report locally modified files - it is 
+      * svn update does not report locally modified files - it is
        required to run 'svn status' to list all changed files
-        
+
   * config/lib.cf
   * config/bin.cf
   * config/darwin/gcc.cf
--- a/harbour/contrib/gtwvg/common.mak
+++ b/harbour/contrib/gtwvg/common.mak
@@ -4,7 +4,7 @@

 LIBNAME = $(LIBPREF)gtwvg

-LIB_PATH = $(LIB_DIR)/$(LIBNAME)$(LIBEXT)
+LIB_PATH = $(LIB_DIR)$(LIBNAME)$(LIBEXT)

 C_HEADERS=\
   gtwvg.h \
@@ -13,12 +13,12 @@ PRG_HEADERS=\
   wvtwin.ch \

 LIB_OBJS = \
-   $(OBJ_DIR)/wvtclass$(OBJEXT) \
-   $(OBJ_DIR)/wvtpaint$(OBJEXT) \
+   $(OBJ_DIR)wvtclass$(OBJEXT) \
+   $(OBJ_DIR)wvtpaint$(OBJEXT) \
   \
-   $(OBJ_DIR)/gtwvg$(OBJEXT) \
-   $(OBJ_DIR)/wvtcore$(OBJEXT) \
-   $(OBJ_DIR)/wvtutils$(OBJEXT) \
+   $(OBJ_DIR)gtwvg$(OBJEXT) \
+   $(OBJ_DIR)wvtcore$(OBJEXT) \
+   $(OBJ_DIR)wvtutils$(OBJEXT) \

 all: \
   $(LIB_PATH) \
--- a/harbour/contrib/hbapollo/common.mak
+++ b/harbour/contrib/hbapollo/common.mak
@@ -4,11 +4,11 @@

 LIBNAME = $(LIBPREF)hbapollo

-LIB_PATH = $(LIB_DIR)/$(LIBNAME)$(LIBEXT)
+LIB_PATH = $(LIB_DIR)$(LIBNAME)$(LIBEXT)

 LIB_OBJS = \
-    $(OBJ_DIR)/apollo$(OBJEXT) \
-    $(OBJ_DIR)/apollo1$(OBJEXT) \
+    $(OBJ_DIR)apollo$(OBJEXT) \
+    $(OBJ_DIR)apollo1$(OBJEXT) \

 all: \
    $(LIB_PATH) \
--- a/harbour/contrib/hbbmcdx/common.mak
+++ b/harbour/contrib/hbbmcdx/common.mak
@@ -4,11 +4,11 @@

 LIBNAME = $(LIBPREF)hbbmcdx

-LIB_PATH = $(LIB_DIR)/$(LIBNAME)$(LIBEXT)
+LIB_PATH = $(LIB_DIR)$(LIBNAME)$(LIBEXT)

 LIB_OBJS = \
-    $(OBJ_DIR)/bmdbfcdx1$(OBJEXT) \
-    $(OBJ_DIR)/bmsixcdx1$(OBJEXT) \
+    $(OBJ_DIR)bmdbfcdx1$(OBJEXT) \
+    $(OBJ_DIR)bmsixcdx1$(OBJEXT) \

 all: \
    $(LIB_PATH) \
--- a/harbour/contrib/hbbmcdx/make_gcc.sh
+++ b/harbour/contrib/hbbmcdx/make_gcc.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+#
+# $Id$
+#
+
+../mtpl_gcc.sh $1 $2 $3 $4 $5 $6 $7 $8 $9
--- a/harbour/contrib/hbbtree/common.mak
+++ b/harbour/contrib/hbbtree/common.mak
@@ -4,7 +4,7 @@

 LIBNAME = $(LIBPREF)hbbtree

-LIB_PATH = $(LIB_DIR)/$(LIBNAME)$(LIBEXT)
+LIB_PATH = $(LIB_DIR)$(LIBNAME)$(LIBEXT)

 C_HEADERS = \
    hb_btree.api \
@@ -13,9 +13,9 @@ PRG_HEADERS = \
    hb_btree.ch \

 LIB_OBJS = \
-    $(OBJ_DIR)/hb_btree$(OBJEXT) \
+    $(OBJ_DIR)hb_btree$(OBJEXT) \
    \
-    $(OBJ_DIR)/tbtree$(OBJEXT) \
+    $(OBJ_DIR)tbtree$(OBJEXT) \

 all: \
    $(LIB_PATH) \
--- a/harbour/contrib/hbbtree/make_gcc.sh
+++ b/harbour/contrib/hbbtree/make_gcc.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+#
+# $Id$
+#
+
+../mtpl_gcc.sh $1 $2 $3 $4 $5 $6 $7 $8 $9
--- a/harbour/contrib/hbclipsm/common.mak
+++ b/harbour/contrib/hbclipsm/common.mak
@@ -4,20 +4,20 @@

 LIBNAME = $(LIBPREF)hbclipsm

-LIB_PATH = $(LIB_DIR)/$(LIBNAME)$(LIBEXT)
+LIB_PATH = $(LIB_DIR)$(LIBNAME)$(LIBEXT)

 PRG_HEADERS = \
    time87.ch \

 LIB_OBJS = \
-    $(OBJ_DIR)/environ$(OBJEXT) \
-    $(OBJ_DIR)/date$(OBJEXT) \
-    $(OBJ_DIR)/dbf$(OBJEXT) \
-    $(OBJ_DIR)/gauge$(OBJEXT) \
-    $(OBJ_DIR)/num$(OBJEXT) \
-    $(OBJ_DIR)/stack$(OBJEXT) \
-    $(OBJ_DIR)/status$(OBJEXT) \
-    $(OBJ_DIR)/time$(OBJEXT) \
+    $(OBJ_DIR)environ$(OBJEXT) \
+    $(OBJ_DIR)date$(OBJEXT) \
+    $(OBJ_DIR)dbf$(OBJEXT) \
+    $(OBJ_DIR)gauge$(OBJEXT) \
+    $(OBJ_DIR)num$(OBJEXT) \
+    $(OBJ_DIR)stack$(OBJEXT) \
+    $(OBJ_DIR)status$(OBJEXT) \
+    $(OBJ_DIR)time$(OBJEXT) \

 all: \
    $(LIB_PATH) \
--- a/harbour/contrib/hbct/common.mak
+++ b/harbour/contrib/hbct/common.mak
@@ -4,7 +4,7 @@

 LIBNAME = $(LIBPREF)hbct

-LIB_PATH = $(LIB_DIR)/$(LIBNAME)$(LIBEXT)
+LIB_PATH = $(LIB_DIR)$(LIBNAME)$(LIBEXT)

 PRG_HEADERS = \
    ct.ch \
@@ -14,100 +14,100 @@ PRG_HEADERS = \
    ctvideo.ch \

 LIB_OBJS = \
-    $(OBJ_DIR)/addascii$(OBJEXT) \
-    $(OBJ_DIR)/asciisum$(OBJEXT) \
-    $(OBJ_DIR)/ascpos$(OBJEXT) \
-    $(OBJ_DIR)/atadjust$(OBJEXT) \
-    $(OBJ_DIR)/atnum$(OBJEXT) \
-    $(OBJ_DIR)/atrepl$(OBJEXT) \
-    $(OBJ_DIR)/bitnum$(OBJEXT) \
-    $(OBJ_DIR)/charevod$(OBJEXT) \
-    $(OBJ_DIR)/charlist$(OBJEXT) \
-    $(OBJ_DIR)/charmirr$(OBJEXT) \
-    $(OBJ_DIR)/charmix$(OBJEXT) \
-    $(OBJ_DIR)/charone$(OBJEXT) \
-    $(OBJ_DIR)/charonly$(OBJEXT) \
-    $(OBJ_DIR)/charop$(OBJEXT) \
-    $(OBJ_DIR)/charrepl$(OBJEXT) \
-    $(OBJ_DIR)/charsort$(OBJEXT) \
-    $(OBJ_DIR)/charsprd$(OBJEXT) \
-    $(OBJ_DIR)/charswap$(OBJEXT) \
-    $(OBJ_DIR)/color$(OBJEXT) \
-    $(OBJ_DIR)/count$(OBJEXT) \
-    $(OBJ_DIR)/ctc$(OBJEXT) \
-    $(OBJ_DIR)/ctchksum$(OBJEXT) \
-    $(OBJ_DIR)/ctcrypt$(OBJEXT) \
-    $(OBJ_DIR)/ctmath$(OBJEXT) \
-    $(OBJ_DIR)/ctmath2$(OBJEXT) \
-    $(OBJ_DIR)/ctnet$(OBJEXT) \
-    $(OBJ_DIR)/ctpad$(OBJEXT) \
-    $(OBJ_DIR)/ctset$(OBJEXT) \
-    $(OBJ_DIR)/ctstr$(OBJEXT) \
-    $(OBJ_DIR)/ctstrfil$(OBJEXT) \
-    $(OBJ_DIR)/ctwfunc$(OBJEXT) \
-    $(OBJ_DIR)/ctwin$(OBJEXT) \
-    $(OBJ_DIR)/cursor$(OBJEXT) \
-    $(OBJ_DIR)/datetime$(OBJEXT) \
-    $(OBJ_DIR)/dattime2$(OBJEXT) \
-    $(OBJ_DIR)/dattime3$(OBJEXT) \
-    $(OBJ_DIR)/dbftools$(OBJEXT) \
-    $(OBJ_DIR)/disk$(OBJEXT) \
-    $(OBJ_DIR)/expand$(OBJEXT) \
-    $(OBJ_DIR)/exponent$(OBJEXT) \
-    $(OBJ_DIR)/files$(OBJEXT) \
-    $(OBJ_DIR)/finan$(OBJEXT) \
-    $(OBJ_DIR)/ftoc$(OBJEXT) \
-    $(OBJ_DIR)/justify$(OBJEXT) \
-    $(OBJ_DIR)/keyset$(OBJEXT) \
-    $(OBJ_DIR)/like$(OBJEXT) \
-    $(OBJ_DIR)/lton$(OBJEXT) \
-    $(OBJ_DIR)/maxline$(OBJEXT) \
-    $(OBJ_DIR)/misc1$(OBJEXT) \
-    $(OBJ_DIR)/misc2$(OBJEXT) \
-    $(OBJ_DIR)/misc3$(OBJEXT) \
-    $(OBJ_DIR)/num1$(OBJEXT) \
-    $(OBJ_DIR)/numat$(OBJEXT) \
-    $(OBJ_DIR)/numcount$(OBJEXT) \
-    $(OBJ_DIR)/numline$(OBJEXT) \
-    $(OBJ_DIR)/pack$(OBJEXT) \
-    $(OBJ_DIR)/pos1$(OBJEXT) \
-    $(OBJ_DIR)/pos2$(OBJEXT) \
-    $(OBJ_DIR)/posdiff$(OBJEXT) \
-    $(OBJ_DIR)/print$(OBJEXT) \
-    $(OBJ_DIR)/range$(OBJEXT) \
-    $(OBJ_DIR)/relation$(OBJEXT) \
-    $(OBJ_DIR)/remove$(OBJEXT) \
-    $(OBJ_DIR)/replace$(OBJEXT) \
-    $(OBJ_DIR)/screen1$(OBJEXT) \
-    $(OBJ_DIR)/screen2$(OBJEXT) \
-    $(OBJ_DIR)/setlast$(OBJEXT) \
-    $(OBJ_DIR)/setrc$(OBJEXT) \
-    $(OBJ_DIR)/strdiff$(OBJEXT) \
-    $(OBJ_DIR)/strswap$(OBJEXT) \
-    $(OBJ_DIR)/tab$(OBJEXT) \
-    $(OBJ_DIR)/token1$(OBJEXT) \
-    $(OBJ_DIR)/token2$(OBJEXT) \
-    $(OBJ_DIR)/trig$(OBJEXT) \
-    $(OBJ_DIR)/video$(OBJEXT) \
-    $(OBJ_DIR)/wordrepl$(OBJEXT) \
-    $(OBJ_DIR)/wordtoch$(OBJEXT) \
+    $(OBJ_DIR)addascii$(OBJEXT) \
+    $(OBJ_DIR)asciisum$(OBJEXT) \
+    $(OBJ_DIR)ascpos$(OBJEXT) \
+    $(OBJ_DIR)atadjust$(OBJEXT) \
+    $(OBJ_DIR)atnum$(OBJEXT) \
+    $(OBJ_DIR)atrepl$(OBJEXT) \
+    $(OBJ_DIR)bitnum$(OBJEXT) \
+    $(OBJ_DIR)charevod$(OBJEXT) \
+    $(OBJ_DIR)charlist$(OBJEXT) \
+    $(OBJ_DIR)charmirr$(OBJEXT) \
+    $(OBJ_DIR)charmix$(OBJEXT) \
+    $(OBJ_DIR)charone$(OBJEXT) \
+    $(OBJ_DIR)charonly$(OBJEXT) \
+    $(OBJ_DIR)charop$(OBJEXT) \
+    $(OBJ_DIR)charrepl$(OBJEXT) \
+    $(OBJ_DIR)charsort$(OBJEXT) \
+    $(OBJ_DIR)charsprd$(OBJEXT) \
+    $(OBJ_DIR)charswap$(OBJEXT) \
+    $(OBJ_DIR)color$(OBJEXT) \
+    $(OBJ_DIR)count$(OBJEXT) \
+    $(OBJ_DIR)ctc$(OBJEXT) \
+    $(OBJ_DIR)ctchksum$(OBJEXT) \
+    $(OBJ_DIR)ctcrypt$(OBJEXT) \
+    $(OBJ_DIR)ctmath$(OBJEXT) \
+    $(OBJ_DIR)ctmath2$(OBJEXT) \
+    $(OBJ_DIR)ctnet$(OBJEXT) \
+    $(OBJ_DIR)ctpad$(OBJEXT) \
+    $(OBJ_DIR)ctset$(OBJEXT) \
+    $(OBJ_DIR)ctstr$(OBJEXT) \
+    $(OBJ_DIR)ctstrfil$(OBJEXT) \
+    $(OBJ_DIR)ctwfunc$(OBJEXT) \
+    $(OBJ_DIR)ctwin$(OBJEXT) \
+    $(OBJ_DIR)cursor$(OBJEXT) \
+    $(OBJ_DIR)datetime$(OBJEXT) \
+    $(OBJ_DIR)dattime2$(OBJEXT) \
+    $(OBJ_DIR)dattime3$(OBJEXT) \
+    $(OBJ_DIR)dbftools$(OBJEXT) \
+    $(OBJ_DIR)disk$(OBJEXT) \
+    $(OBJ_DIR)expand$(OBJEXT) \
+    $(OBJ_DIR)exponent$(OBJEXT) \
+    $(OBJ_DIR)files$(OBJEXT) \
+    $(OBJ_DIR)finan$(OBJEXT) \
+    $(OBJ_DIR)ftoc$(OBJEXT) \
+    $(OBJ_DIR)justify$(OBJEXT) \
+    $(OBJ_DIR)keyset$(OBJEXT) \
+    $(OBJ_DIR)like$(OBJEXT) \
+    $(OBJ_DIR)lton$(OBJEXT) \
+    $(OBJ_DIR)maxline$(OBJEXT) \
+    $(OBJ_DIR)misc1$(OBJEXT) \
+    $(OBJ_DIR)misc2$(OBJEXT) \
+    $(OBJ_DIR)misc3$(OBJEXT) \
+    $(OBJ_DIR)num1$(OBJEXT) \
+    $(OBJ_DIR)numat$(OBJEXT) \
+    $(OBJ_DIR)numcount$(OBJEXT) \
+    $(OBJ_DIR)numline$(OBJEXT) \
+    $(OBJ_DIR)pack$(OBJEXT) \
+    $(OBJ_DIR)pos1$(OBJEXT) \
+    $(OBJ_DIR)pos2$(OBJEXT) \
+    $(OBJ_DIR)posdiff$(OBJEXT) \
+    $(OBJ_DIR)print$(OBJEXT) \
+    $(OBJ_DIR)range$(OBJEXT) \
+    $(OBJ_DIR)relation$(OBJEXT) \
+    $(OBJ_DIR)remove$(OBJEXT) \
+    $(OBJ_DIR)replace$(OBJEXT) \
+    $(OBJ_DIR)screen1$(OBJEXT) \
+    $(OBJ_DIR)screen2$(OBJEXT) \
+    $(OBJ_DIR)setlast$(OBJEXT) \
+    $(OBJ_DIR)setrc$(OBJEXT) \
+    $(OBJ_DIR)strdiff$(OBJEXT) \
+    $(OBJ_DIR)strswap$(OBJEXT) \
+    $(OBJ_DIR)tab$(OBJEXT) \
+    $(OBJ_DIR)token1$(OBJEXT) \
+    $(OBJ_DIR)token2$(OBJEXT) \
+    $(OBJ_DIR)trig$(OBJEXT) \
+    $(OBJ_DIR)video$(OBJEXT) \
+    $(OBJ_DIR)wordrepl$(OBJEXT) \
+    $(OBJ_DIR)wordtoch$(OBJEXT) \
    \
-    $(OBJ_DIR)/blank$(OBJEXT) \
-    $(OBJ_DIR)/ct$(OBJEXT) \
-    $(OBJ_DIR)/ctmisc$(OBJEXT) \
-    $(OBJ_DIR)/ctrand$(OBJEXT) \
-    $(OBJ_DIR)/cttime$(OBJEXT) \
-    $(OBJ_DIR)/fcopy$(OBJEXT) \
-    $(OBJ_DIR)/getinfo$(OBJEXT) \
-    $(OBJ_DIR)/getinput$(OBJEXT) \
-    $(OBJ_DIR)/getsecrt$(OBJEXT) \
-    $(OBJ_DIR)/keysave$(OBJEXT) \
-    $(OBJ_DIR)/keysec$(OBJEXT) \
-    $(OBJ_DIR)/keytime$(OBJEXT) \
-    $(OBJ_DIR)/numconv$(OBJEXT) \
-    $(OBJ_DIR)/screen3$(OBJEXT) \
-    $(OBJ_DIR)/scrmark$(OBJEXT) \
-    $(OBJ_DIR)/showtime$(OBJEXT) \
+    $(OBJ_DIR)blank$(OBJEXT) \
+    $(OBJ_DIR)ct$(OBJEXT) \
+    $(OBJ_DIR)ctmisc$(OBJEXT) \
+    $(OBJ_DIR)ctrand$(OBJEXT) \
+    $(OBJ_DIR)cttime$(OBJEXT) \
+    $(OBJ_DIR)fcopy$(OBJEXT) \
+    $(OBJ_DIR)getinfo$(OBJEXT) \
+    $(OBJ_DIR)getinput$(OBJEXT) \
+    $(OBJ_DIR)getsecrt$(OBJEXT) \
+    $(OBJ_DIR)keysave$(OBJEXT) \
+    $(OBJ_DIR)keysec$(OBJEXT) \
+    $(OBJ_DIR)keytime$(OBJEXT) \
+    $(OBJ_DIR)numconv$(OBJEXT) \
+    $(OBJ_DIR)screen3$(OBJEXT) \
+    $(OBJ_DIR)scrmark$(OBJEXT) \
+    $(OBJ_DIR)showtime$(OBJEXT) \

 all: \
    $(LIB_PATH) \
--- a/harbour/contrib/hbfbird/common.mak
+++ b/harbour/contrib/hbfbird/common.mak
@@ -4,11 +4,11 @@

 LIBNAME = $(LIBPREF)hbfbird

-LIB_PATH = $(LIB_DIR)/$(LIBNAME)$(LIBEXT)
+LIB_PATH = $(LIB_DIR)$(LIBNAME)$(LIBEXT)

 LIB_OBJS = \
-    $(OBJ_DIR)/firebird$(OBJEXT) \
-    $(OBJ_DIR)/tfirebird$(OBJEXT) \
+    $(OBJ_DIR)firebird$(OBJEXT) \
+    $(OBJ_DIR)tfirebird$(OBJEXT) \

 all: \
    $(LIB_PATH) \
--- a/harbour/contrib/hbfimage/common.mak
+++ b/harbour/contrib/hbfimage/common.mak
@@ -4,14 +4,14 @@

 LIBNAME = $(LIBPREF)hbfimage

-LIB_PATH = $(LIB_DIR)/$(LIBNAME)$(LIBEXT)
+LIB_PATH = $(LIB_DIR)$(LIBNAME)$(LIBEXT)

 PRG_HEADERS = \
    freeimage.ch \

 LIB_OBJS = \
-    $(OBJ_DIR)/fi_winfu$(OBJEXT) \
-    $(OBJ_DIR)/fi_wrp$(OBJEXT) \
+    $(OBJ_DIR)fi_winfu$(OBJEXT) \
+    $(OBJ_DIR)fi_wrp$(OBJEXT) \

 all: \
    $(LIB_PATH) \
--- a/harbour/contrib/hbgd/common.mak
+++ b/harbour/contrib/hbgd/common.mak
@@ -4,19 +4,19 @@

 LIBNAME = $(LIBPREF)hbgd

-LIB_PATH = $(LIB_DIR)/$(LIBNAME)$(LIBEXT)
+LIB_PATH = $(LIB_DIR)$(LIBNAME)$(LIBEXT)

 PRG_HEADERS = \
    gd.ch \
    gdexternal.ch \

 LIB_OBJS = \
-    $(OBJ_DIR)/gdwrp$(OBJEXT) \
-    $(OBJ_DIR)/gd$(OBJEXT) \
-    $(OBJ_DIR)/gdimage$(OBJEXT) \
-    $(OBJ_DIR)/gdchart$(OBJEXT) \
-    $(OBJ_DIR)/gdbar$(OBJEXT) \
-    $(OBJ_DIR)/gdbarcod$(OBJEXT) \
+    $(OBJ_DIR)gdwrp$(OBJEXT) \
+    $(OBJ_DIR)gd$(OBJEXT) \
+    $(OBJ_DIR)gdimage$(OBJEXT) \
+    $(OBJ_DIR)gdchart$(OBJEXT) \
+    $(OBJ_DIR)gdbar$(OBJEXT) \
+    $(OBJ_DIR)gdbarcod$(OBJEXT) \

 all: \
    $(LIB_PATH) \
--- a/harbour/contrib/hbgt/common.mak
+++ b/harbour/contrib/hbgt/common.mak
@@ -4,26 +4,26 @@

 LIBNAME = $(LIBPREF)hbgt

-LIB_PATH = $(LIB_DIR)/$(LIBNAME)$(LIBEXT)
+LIB_PATH = $(LIB_DIR)$(LIBNAME)$(LIBEXT)

 LIB_OBJS = \
-    $(OBJ_DIR)/asciisum$(OBJEXT) \
-    $(OBJ_DIR)/ascpos$(OBJEXT) \
-    $(OBJ_DIR)/atdiff$(OBJEXT) \
-    $(OBJ_DIR)/chareven$(OBJEXT) \
-    $(OBJ_DIR)/charmix$(OBJEXT) \
-    $(OBJ_DIR)/charodd$(OBJEXT) \
-    $(OBJ_DIR)/chrcount$(OBJEXT) \
-    $(OBJ_DIR)/chrfirst$(OBJEXT) \
-    $(OBJ_DIR)/chrtotal$(OBJEXT) \
-    $(OBJ_DIR)/strasint$(OBJEXT) \
-    $(OBJ_DIR)/strcount$(OBJEXT) \
-    $(OBJ_DIR)/strcspn$(OBJEXT) \
-    $(OBJ_DIR)/strdiff$(OBJEXT) \
-    $(OBJ_DIR)/strexpan$(OBJEXT) \
-    $(OBJ_DIR)/strleft$(OBJEXT) \
-    $(OBJ_DIR)/strpbrk$(OBJEXT) \
-    $(OBJ_DIR)/strright$(OBJEXT) \
+    $(OBJ_DIR)asciisum$(OBJEXT) \
+    $(OBJ_DIR)ascpos$(OBJEXT) \
+    $(OBJ_DIR)atdiff$(OBJEXT) \
+    $(OBJ_DIR)chareven$(OBJEXT) \
+    $(OBJ_DIR)charmix$(OBJEXT) \
+    $(OBJ_DIR)charodd$(OBJEXT) \
+    $(OBJ_DIR)chrcount$(OBJEXT) \
+    $(OBJ_DIR)chrfirst$(OBJEXT) \
+    $(OBJ_DIR)chrtotal$(OBJEXT) \
+    $(OBJ_DIR)strasint$(OBJEXT) \
+    $(OBJ_DIR)strcount$(OBJEXT) \
+    $(OBJ_DIR)strcspn$(OBJEXT) \
+    $(OBJ_DIR)strdiff$(OBJEXT) \
+    $(OBJ_DIR)strexpan$(OBJEXT) \
+    $(OBJ_DIR)strleft$(OBJEXT) \
+    $(OBJ_DIR)strpbrk$(OBJEXT) \
+    $(OBJ_DIR)strright$(OBJEXT) \

 all: \
    $(LIB_PATH) \
--- a/harbour/contrib/hbmisc/common.mak
+++ b/harbour/contrib/hbmisc/common.mak
@@ -4,22 +4,22 @@

 LIBNAME = $(LIBPREF)hbmisc

-LIB_PATH = $(LIB_DIR)/$(LIBNAME)$(LIBEXT)
+LIB_PATH = $(LIB_DIR)$(LIBNAME)$(LIBEXT)

 LIB_OBJS = \
-    $(OBJ_DIR)/dates2$(OBJEXT) \
-    $(OBJ_DIR)/dbftools$(OBJEXT) \
-    $(OBJ_DIR)/hb_f$(OBJEXT) \
-    $(OBJ_DIR)/mathx$(OBJEXT) \
-    $(OBJ_DIR)/strfmt$(OBJEXT) \
-    $(OBJ_DIR)/stringsx$(OBJEXT) \
+    $(OBJ_DIR)dates2$(OBJEXT) \
+    $(OBJ_DIR)dbftools$(OBJEXT) \
+    $(OBJ_DIR)hb_f$(OBJEXT) \
+    $(OBJ_DIR)mathx$(OBJEXT) \
+    $(OBJ_DIR)strfmt$(OBJEXT) \
+    $(OBJ_DIR)stringsx$(OBJEXT) \
    \
-    $(OBJ_DIR)/fileread$(OBJEXT) \
-    $(OBJ_DIR)/nconvert$(OBJEXT) \
-    $(OBJ_DIR)/numtxten$(OBJEXT) \
-    $(OBJ_DIR)/numtxthu$(OBJEXT) \
-    $(OBJ_DIR)/stringp$(OBJEXT) \
-    $(OBJ_DIR)/twirler$(OBJEXT) \
+    $(OBJ_DIR)fileread$(OBJEXT) \
+    $(OBJ_DIR)nconvert$(OBJEXT) \
+    $(OBJ_DIR)numtxten$(OBJEXT) \
+    $(OBJ_DIR)numtxthu$(OBJEXT) \
+    $(OBJ_DIR)stringp$(OBJEXT) \
+    $(OBJ_DIR)twirler$(OBJEXT) \

 all: \
    $(LIB_PATH) \
--- a/harbour/contrib/hbmsql/common.mak
+++ b/harbour/contrib/hbmsql/common.mak
@@ -4,15 +4,15 @@

 LIBNAME = $(LIBPREF)hbmsql

-LIB_PATH = $(LIB_DIR)/$(LIBNAME)$(LIBEXT)
+LIB_PATH = $(LIB_DIR)$(LIBNAME)$(LIBEXT)

 PRG_HEADERS = \
    msql.ch \

 LIB_OBJS = \
-    $(OBJ_DIR)/msql$(OBJEXT) \
+    $(OBJ_DIR)msql$(OBJEXT) \
    \
-    $(OBJ_DIR)/tmsql$(OBJEXT) \
+    $(OBJ_DIR)tmsql$(OBJEXT) \

 all: \
    $(LIB_PATH) \
--- a/harbour/contrib/hbmysql/common.mak
+++ b/harbour/contrib/hbmysql/common.mak
@@ -4,16 +4,16 @@

 LIBNAME = $(LIBPREF)hbmysql

-LIB_PATH = $(LIB_DIR)/$(LIBNAME)$(LIBEXT)
+LIB_PATH = $(LIB_DIR)$(LIBNAME)$(LIBEXT)

 PRG_HEADERS = \
    mysql.ch \

 LIB_OBJS = \
-    $(OBJ_DIR)/mysql$(OBJEXT) \
+    $(OBJ_DIR)mysql$(OBJEXT) \
    \
-    $(OBJ_DIR)/tmysql$(OBJEXT) \
-    $(OBJ_DIR)/tsqlbrw$(OBJEXT) \
+    $(OBJ_DIR)tmysql$(OBJEXT) \
+    $(OBJ_DIR)tsqlbrw$(OBJEXT) \

 all: \
    $(LIB_PATH) \
--- a/harbour/contrib/hbnf/common.mak
+++ b/harbour/contrib/hbnf/common.mak
@@ -4,146 +4,146 @@

 LIBNAME = $(LIBPREF)hbnf

-LIB_PATH = $(LIB_DIR)/$(LIBNAME)$(LIBEXT)
+LIB_PATH = $(LIB_DIR)$(LIBNAME)$(LIBEXT)

 PRG_HEADERS = \
    ftmenuto.ch \

 LIB_OBJS = \
-    $(OBJ_DIR)/caplock$(OBJEXT) \
-    $(OBJ_DIR)/color2n$(OBJEXT) \
-    $(OBJ_DIR)/descend$(OBJEXT) \
-    $(OBJ_DIR)/numlock$(OBJEXT) \
-    $(OBJ_DIR)/proper$(OBJEXT) \
-    $(OBJ_DIR)/shift$(OBJEXT) \
-    $(OBJ_DIR)/mouse$(OBJEXT) \
-    $(OBJ_DIR)/getvid$(OBJEXT) \
-    $(OBJ_DIR)/setkeys$(OBJEXT) \
-    $(OBJ_DIR)/setlastk$(OBJEXT) \
-    $(OBJ_DIR)/ftisprn$(OBJEXT) \
-    $(OBJ_DIR)/ftidle$(OBJEXT) \
-    $(OBJ_DIR)/iamidle$(OBJEXT) \
-    $(OBJ_DIR)/chdir$(OBJEXT) \
-    $(OBJ_DIR)/rmdir$(OBJEXT) \
-    $(OBJ_DIR)/alt$(OBJEXT) \
-    $(OBJ_DIR)/ctrl$(OBJEXT) \
-    $(OBJ_DIR)/getenvrn$(OBJEXT) \
-    $(OBJ_DIR)/n2color$(OBJEXT) \
-    $(OBJ_DIR)/origin$(OBJEXT) \
-    $(OBJ_DIR)/prtscr$(OBJEXT) \
-    $(OBJ_DIR)/stod$(OBJEXT) \
-    $(OBJ_DIR)/kspeed$(OBJEXT) \
-    $(OBJ_DIR)/mkdir$(OBJEXT) \
-    $(OBJ_DIR)/getver$(OBJEXT) \
-    $(OBJ_DIR)/ftattr$(OBJEXT) \
-    $(OBJ_DIR)/dispc$(OBJEXT) \
-    $(OBJ_DIR)/fttext$(OBJEXT) \
-    $(OBJ_DIR)/ftshadow$(OBJEXT) \
-    $(OBJ_DIR)/putkey$(OBJEXT) \
+    $(OBJ_DIR)caplock$(OBJEXT) \
+    $(OBJ_DIR)color2n$(OBJEXT) \
+    $(OBJ_DIR)descend$(OBJEXT) \
+    $(OBJ_DIR)numlock$(OBJEXT) \
+    $(OBJ_DIR)proper$(OBJEXT) \
+    $(OBJ_DIR)shift$(OBJEXT) \
+    $(OBJ_DIR)mouse$(OBJEXT) \
+    $(OBJ_DIR)getvid$(OBJEXT) \
+    $(OBJ_DIR)setkeys$(OBJEXT) \
+    $(OBJ_DIR)setlastk$(OBJEXT) \
+    $(OBJ_DIR)ftisprn$(OBJEXT) \
+    $(OBJ_DIR)ftidle$(OBJEXT) \
+    $(OBJ_DIR)iamidle$(OBJEXT) \
+    $(OBJ_DIR)chdir$(OBJEXT) \
+    $(OBJ_DIR)rmdir$(OBJEXT) \
+    $(OBJ_DIR)alt$(OBJEXT) \
+    $(OBJ_DIR)ctrl$(OBJEXT) \
+    $(OBJ_DIR)getenvrn$(OBJEXT) \
+    $(OBJ_DIR)n2color$(OBJEXT) \
+    $(OBJ_DIR)origin$(OBJEXT) \
+    $(OBJ_DIR)prtscr$(OBJEXT) \
+    $(OBJ_DIR)stod$(OBJEXT) \
+    $(OBJ_DIR)kspeed$(OBJEXT) \
+    $(OBJ_DIR)mkdir$(OBJEXT) \
+    $(OBJ_DIR)getver$(OBJEXT) \
+    $(OBJ_DIR)ftattr$(OBJEXT) \
+    $(OBJ_DIR)dispc$(OBJEXT) \
+    $(OBJ_DIR)fttext$(OBJEXT) \
+    $(OBJ_DIR)ftshadow$(OBJEXT) \
+    $(OBJ_DIR)putkey$(OBJEXT) \
    \
-    $(OBJ_DIR)/aading$(OBJEXT) \
-    $(OBJ_DIR)/aavg$(OBJEXT) \
-    $(OBJ_DIR)/acctadj$(OBJEXT) \
-    $(OBJ_DIR)/acctmnth$(OBJEXT) \
-    $(OBJ_DIR)/acctqtr$(OBJEXT) \
-    $(OBJ_DIR)/acctweek$(OBJEXT) \
-    $(OBJ_DIR)/acctyear$(OBJEXT) \
-    $(OBJ_DIR)/adessort$(OBJEXT) \
-    $(OBJ_DIR)/aemaxlen$(OBJEXT) \
-    $(OBJ_DIR)/aeminlen$(OBJEXT) \
-    $(OBJ_DIR)/amedian$(OBJEXT) \
-    $(OBJ_DIR)/anomatch$(OBJEXT) \
-    $(OBJ_DIR)/any2any$(OBJEXT) \
-    $(OBJ_DIR)/aredit$(OBJEXT) \
-    $(OBJ_DIR)/asum$(OBJEXT) \
-    $(OBJ_DIR)/at2$(OBJEXT) \
-    $(OBJ_DIR)/bitclr$(OBJEXT) \
-    $(OBJ_DIR)/bitset$(OBJEXT) \
-    $(OBJ_DIR)/blink$(OBJEXT) \
-    $(OBJ_DIR)/byt2bit$(OBJEXT) \
-    $(OBJ_DIR)/byt2hex$(OBJEXT) \
-    $(OBJ_DIR)/byteand$(OBJEXT) \
-    $(OBJ_DIR)/byteneg$(OBJEXT) \
-    $(OBJ_DIR)/bytenot$(OBJEXT) \
-    $(OBJ_DIR)/byteor$(OBJEXT) \
-    $(OBJ_DIR)/bytexor$(OBJEXT) \
-    $(OBJ_DIR)/calendar$(OBJEXT) \
-    $(OBJ_DIR)/clrsel$(OBJEXT) \
-    $(OBJ_DIR)/cntryset$(OBJEXT) \
-    $(OBJ_DIR)/d2e$(OBJEXT) \
-    $(OBJ_DIR)/datecnfg$(OBJEXT) \
-    $(OBJ_DIR)/dayofyr$(OBJEXT) \
-    $(OBJ_DIR)/daytobow$(OBJEXT) \
-    $(OBJ_DIR)/dectobin$(OBJEXT) \
-    $(OBJ_DIR)/diskfunc$(OBJEXT) \
-    $(OBJ_DIR)/dispmsg$(OBJEXT) \
-    $(OBJ_DIR)/dosver$(OBJEXT) \
-    $(OBJ_DIR)/e2d$(OBJEXT) \
-    $(OBJ_DIR)/easter$(OBJEXT) \
-    $(OBJ_DIR)/elapmil$(OBJEXT) \
-    $(OBJ_DIR)/elapsed$(OBJEXT) \
-    $(OBJ_DIR)/eltime$(OBJEXT) \
-    $(OBJ_DIR)/findith$(OBJEXT) \
-    $(OBJ_DIR)/firstday$(OBJEXT) \
-    $(OBJ_DIR)/gcd$(OBJEXT) \
-    $(OBJ_DIR)/hex2dec$(OBJEXT) \
-    $(OBJ_DIR)/invclr$(OBJEXT) \
-    $(OBJ_DIR)/isbit$(OBJEXT) \
-    $(OBJ_DIR)/isbiton$(OBJEXT) \
-    $(OBJ_DIR)/isshare$(OBJEXT) \
-    $(OBJ_DIR)/lastday$(OBJEXT) \
-    $(OBJ_DIR)/linked$(OBJEXT) \
-    $(OBJ_DIR)/madd$(OBJEXT) \
-    $(OBJ_DIR)/menu1$(OBJEXT) \
-    $(OBJ_DIR)/menuto$(OBJEXT) \
-    $(OBJ_DIR)/metaph$(OBJEXT) \
-    $(OBJ_DIR)/miltime$(OBJEXT) \
-    $(OBJ_DIR)/min2dhm$(OBJEXT) \
-    $(OBJ_DIR)/month$(OBJEXT) \
-    $(OBJ_DIR)/mouse1$(OBJEXT) \
-    $(OBJ_DIR)/netpv$(OBJEXT) \
-    $(OBJ_DIR)/nooccur$(OBJEXT) \
-    $(OBJ_DIR)/ntow$(OBJEXT) \
-    $(OBJ_DIR)/nwlstat$(OBJEXT) \
-    $(OBJ_DIR)/page$(OBJEXT) \
-    $(OBJ_DIR)/pchr$(OBJEXT) \
-    $(OBJ_DIR)/pegs$(OBJEXT) \
-    $(OBJ_DIR)/pending$(OBJEXT) \
-    $(OBJ_DIR)/pickday$(OBJEXT) \
-    $(OBJ_DIR)/popadder$(OBJEXT) \
-    $(OBJ_DIR)/prtesc$(OBJEXT) \
-    $(OBJ_DIR)/pvid$(OBJEXT) \
-    $(OBJ_DIR)/qtr$(OBJEXT) \
-    $(OBJ_DIR)/rand1$(OBJEXT) \
-    $(OBJ_DIR)/restsets$(OBJEXT) \
-    $(OBJ_DIR)/ftround$(OBJEXT) \
-    $(OBJ_DIR)/savearr$(OBJEXT) \
-    $(OBJ_DIR)/savesets$(OBJEXT) \
-    $(OBJ_DIR)/scregion$(OBJEXT) \
-    $(OBJ_DIR)/sinkey$(OBJEXT) \
-    $(OBJ_DIR)/sleep$(OBJEXT) \
-    $(OBJ_DIR)/sqzn$(OBJEXT) \
-    $(OBJ_DIR)/tbwhile$(OBJEXT) \
-    $(OBJ_DIR)/tempfile$(OBJEXT) \
-    $(OBJ_DIR)/vertmenu$(OBJEXT) \
-    $(OBJ_DIR)/vidmode$(OBJEXT) \
-    $(OBJ_DIR)/wda$(OBJEXT) \
-    $(OBJ_DIR)/week$(OBJEXT) \
-    $(OBJ_DIR)/workdays$(OBJEXT) \
-    $(OBJ_DIR)/woy$(OBJEXT) \
-    $(OBJ_DIR)/xbox$(OBJEXT) \
-    $(OBJ_DIR)/year$(OBJEXT)
+    $(OBJ_DIR)aading$(OBJEXT) \
+    $(OBJ_DIR)aavg$(OBJEXT) \
+    $(OBJ_DIR)acctadj$(OBJEXT) \
+    $(OBJ_DIR)acctmnth$(OBJEXT) \
+    $(OBJ_DIR)acctqtr$(OBJEXT) \
+    $(OBJ_DIR)acctweek$(OBJEXT) \
+    $(OBJ_DIR)acctyear$(OBJEXT) \
+    $(OBJ_DIR)adessort$(OBJEXT) \
+    $(OBJ_DIR)aemaxlen$(OBJEXT) \
+    $(OBJ_DIR)aeminlen$(OBJEXT) \
+    $(OBJ_DIR)amedian$(OBJEXT) \
+    $(OBJ_DIR)anomatch$(OBJEXT) \
+    $(OBJ_DIR)any2any$(OBJEXT) \
+    $(OBJ_DIR)aredit$(OBJEXT) \
+    $(OBJ_DIR)asum$(OBJEXT) \
+    $(OBJ_DIR)at2$(OBJEXT) \
+    $(OBJ_DIR)bitclr$(OBJEXT) \
+    $(OBJ_DIR)bitset$(OBJEXT) \
+    $(OBJ_DIR)blink$(OBJEXT) \
+    $(OBJ_DIR)byt2bit$(OBJEXT) \
+    $(OBJ_DIR)byt2hex$(OBJEXT) \
+    $(OBJ_DIR)byteand$(OBJEXT) \
+    $(OBJ_DIR)byteneg$(OBJEXT) \
+    $(OBJ_DIR)bytenot$(OBJEXT) \
+    $(OBJ_DIR)byteor$(OBJEXT) \
+    $(OBJ_DIR)bytexor$(OBJEXT) \
+    $(OBJ_DIR)calendar$(OBJEXT) \
+    $(OBJ_DIR)clrsel$(OBJEXT) \
+    $(OBJ_DIR)cntryset$(OBJEXT) \
+    $(OBJ_DIR)d2e$(OBJEXT) \
+    $(OBJ_DIR)datecnfg$(OBJEXT) \
+    $(OBJ_DIR)dayofyr$(OBJEXT) \
+    $(OBJ_DIR)daytobow$(OBJEXT) \
+    $(OBJ_DIR)dectobin$(OBJEXT) \
+    $(OBJ_DIR)diskfunc$(OBJEXT) \
+    $(OBJ_DIR)dispmsg$(OBJEXT) \
+    $(OBJ_DIR)dosver$(OBJEXT) \
+    $(OBJ_DIR)e2d$(OBJEXT) \
+    $(OBJ_DIR)easter$(OBJEXT) \
+    $(OBJ_DIR)elapmil$(OBJEXT) \
+    $(OBJ_DIR)elapsed$(OBJEXT) \
+    $(OBJ_DIR)eltime$(OBJEXT) \
+    $(OBJ_DIR)findith$(OBJEXT) \
+    $(OBJ_DIR)firstday$(OBJEXT) \
+    $(OBJ_DIR)gcd$(OBJEXT) \
+    $(OBJ_DIR)hex2dec$(OBJEXT) \
+    $(OBJ_DIR)invclr$(OBJEXT) \
+    $(OBJ_DIR)isbit$(OBJEXT) \
+    $(OBJ_DIR)isbiton$(OBJEXT) \
+    $(OBJ_DIR)isshare$(OBJEXT) \
+    $(OBJ_DIR)lastday$(OBJEXT) \
+    $(OBJ_DIR)linked$(OBJEXT) \
+    $(OBJ_DIR)madd$(OBJEXT) \
+    $(OBJ_DIR)menu1$(OBJEXT) \
+    $(OBJ_DIR)menuto$(OBJEXT) \
+    $(OBJ_DIR)metaph$(OBJEXT) \
+    $(OBJ_DIR)miltime$(OBJEXT) \
+    $(OBJ_DIR)min2dhm$(OBJEXT) \
+    $(OBJ_DIR)month$(OBJEXT) \
+    $(OBJ_DIR)mouse1$(OBJEXT) \
+    $(OBJ_DIR)netpv$(OBJEXT) \
+    $(OBJ_DIR)nooccur$(OBJEXT) \
+    $(OBJ_DIR)ntow$(OBJEXT) \
+    $(OBJ_DIR)nwlstat$(OBJEXT) \
+    $(OBJ_DIR)page$(OBJEXT) \
+    $(OBJ_DIR)pchr$(OBJEXT) \
+    $(OBJ_DIR)pegs$(OBJEXT) \
+    $(OBJ_DIR)pending$(OBJEXT) \
+    $(OBJ_DIR)pickday$(OBJEXT) \
+    $(OBJ_DIR)popadder$(OBJEXT) \
+    $(OBJ_DIR)prtesc$(OBJEXT) \
+    $(OBJ_DIR)pvid$(OBJEXT) \
+    $(OBJ_DIR)qtr$(OBJEXT) \
+    $(OBJ_DIR)rand1$(OBJEXT) \
+    $(OBJ_DIR)restsets$(OBJEXT) \
+    $(OBJ_DIR)ftround$(OBJEXT) \
+    $(OBJ_DIR)savearr$(OBJEXT) \
+    $(OBJ_DIR)savesets$(OBJEXT) \
+    $(OBJ_DIR)scregion$(OBJEXT) \
+    $(OBJ_DIR)sinkey$(OBJEXT) \
+    $(OBJ_DIR)sleep$(OBJEXT) \
+    $(OBJ_DIR)sqzn$(OBJEXT) \
+    $(OBJ_DIR)tbwhile$(OBJEXT) \
+    $(OBJ_DIR)tempfile$(OBJEXT) \
+    $(OBJ_DIR)vertmenu$(OBJEXT) \
+    $(OBJ_DIR)vidmode$(OBJEXT) \
+    $(OBJ_DIR)wda$(OBJEXT) \
+    $(OBJ_DIR)week$(OBJEXT) \
+    $(OBJ_DIR)workdays$(OBJEXT) \
+    $(OBJ_DIR)woy$(OBJEXT) \
+    $(OBJ_DIR)xbox$(OBJEXT) \
+    $(OBJ_DIR)year$(OBJEXT)

-#   $(OBJ_DIR)/sysmem$(OBJEXT) \
-#   $(OBJ_DIR)/dfile$(OBJEXT) \
-#   $(OBJ_DIR)/vidcur$(OBJEXT) \
-#   $(OBJ_DIR)/scancode$(OBJEXT) \
-#   $(OBJ_DIR)/setdate$(OBJEXT) \
-#   $(OBJ_DIR)/settime$(OBJEXT) \
-#   $(OBJ_DIR)/nwsem$(OBJEXT) \
-#   $(OBJ_DIR)/nwuid$(OBJEXT) \
+#   $(OBJ_DIR)sysmem$(OBJEXT) \
+#   $(OBJ_DIR)dfile$(OBJEXT) \
+#   $(OBJ_DIR)vidcur$(OBJEXT) \
+#   $(OBJ_DIR)scancode$(OBJEXT) \
+#   $(OBJ_DIR)setdate$(OBJEXT) \
+#   $(OBJ_DIR)settime$(OBJEXT) \
+#   $(OBJ_DIR)nwsem$(OBJEXT) \
+#   $(OBJ_DIR)nwuid$(OBJEXT) \

-#   $(OBJ_DIR)/floptst$(OBJEXT) \
+#   $(OBJ_DIR)floptst$(OBJEXT) \

 all: \
    $(LIB_PATH) \
--- a/harbour/contrib/hbodbc/common.mak
+++ b/harbour/contrib/hbodbc/common.mak
@@ -4,16 +4,16 @@

 LIBNAME = $(LIBPREF)hbodbc

-LIB_PATH = $(LIB_DIR)/$(LIBNAME)$(LIBEXT)
+LIB_PATH = $(LIB_DIR)$(LIBNAME)$(LIBEXT)

 PRG_HEADERS = \
    sql.ch \

 LIB_OBJS = \
-    $(OBJ_DIR)/odbc$(OBJEXT) \
+    $(OBJ_DIR)odbc$(OBJEXT) \
    \
-    $(OBJ_DIR)/todbc$(OBJEXT) \
-    $(OBJ_DIR)/browodbc$(OBJEXT) \
+    $(OBJ_DIR)todbc$(OBJEXT) \
+    $(OBJ_DIR)browodbc$(OBJEXT) \

 all: \
    $(LIB_PATH) \
--- a/harbour/contrib/hbole/common.mak
+++ b/harbour/contrib/hbole/common.mak
@@ -4,12 +4,12 @@

 LIBNAME = $(LIBPREF)hbole

-LIB_PATH = $(LIB_DIR)/$(LIBNAME)$(LIBEXT)
+LIB_PATH = $(LIB_DIR)$(LIBNAME)$(LIBEXT)

 LIB_OBJS = \
-    $(OBJ_DIR)/ole2$(OBJEXT) \
+    $(OBJ_DIR)ole2$(OBJEXT) \
    \
-    $(OBJ_DIR)/oleauto$(OBJEXT) \
+    $(OBJ_DIR)oleauto$(OBJEXT) \

 all: \
    $(LIB_PATH) \
--- a/harbour/contrib/hbpgsql/common.mak
+++ b/harbour/contrib/hbpgsql/common.mak
@@ -4,16 +4,16 @@

 LIBNAME = $(LIBPREF)hbpgsql

-LIB_PATH = $(LIB_DIR)/$(LIBNAME)$(LIBEXT)
+LIB_PATH = $(LIB_DIR)$(LIBNAME)$(LIBEXT)

 PRG_HEADERS = \
    postgres.ch \

 LIB_OBJS = \
-    $(OBJ_DIR)/postgres$(OBJEXT) \
+    $(OBJ_DIR)postgres$(OBJEXT) \
    \
-    $(OBJ_DIR)/tpostgre$(OBJEXT) \
-    $(OBJ_DIR)/pgrdd$(OBJEXT) \
+    $(OBJ_DIR)tpostgre$(OBJEXT) \
+    $(OBJ_DIR)pgrdd$(OBJEXT) \

 all: \
    $(LIB_PATH) \
--- a/harbour/contrib/hbtip/common.mak
+++ b/harbour/contrib/hbtip/common.mak
@@ -4,32 +4,32 @@

 LIBNAME = $(LIBPREF)hbtip

-LIB_PATH = $(LIB_DIR)/$(LIBNAME)$(LIBEXT)
+LIB_PATH = $(LIB_DIR)$(LIBNAME)$(LIBEXT)

 PRG_HEADERS = \
    thtml.ch \
    tip.ch \

 LIB_OBJS = \
-    $(OBJ_DIR)/base64x$(OBJEXT) \
-    $(OBJ_DIR)/encmthd$(OBJEXT) \
-    $(OBJ_DIR)/utils$(OBJEXT) \
+    $(OBJ_DIR)base64x$(OBJEXT) \
+    $(OBJ_DIR)encmthd$(OBJEXT) \
+    $(OBJ_DIR)utils$(OBJEXT) \
    \
-    $(OBJ_DIR)/cgi$(OBJEXT) \
-    $(OBJ_DIR)/client$(OBJEXT) \
-    $(OBJ_DIR)/credent$(OBJEXT) \
-    $(OBJ_DIR)/encb64$(OBJEXT) \
-    $(OBJ_DIR)/encoder$(OBJEXT) \
-    $(OBJ_DIR)/encqp$(OBJEXT) \
-    $(OBJ_DIR)/encurl$(OBJEXT) \
-    $(OBJ_DIR)/ftpcln$(OBJEXT) \
-    $(OBJ_DIR)/httpcln$(OBJEXT) \
-    $(OBJ_DIR)/mail$(OBJEXT) \
-    $(OBJ_DIR)/popcln$(OBJEXT) \
-    $(OBJ_DIR)/sessid$(OBJEXT) \
-    $(OBJ_DIR)/smtpcln$(OBJEXT) \
-    $(OBJ_DIR)/thtml$(OBJEXT) \
-    $(OBJ_DIR)/url$(OBJEXT) \
+    $(OBJ_DIR)cgi$(OBJEXT) \
+    $(OBJ_DIR)client$(OBJEXT) \
+    $(OBJ_DIR)credent$(OBJEXT) \
+    $(OBJ_DIR)encb64$(OBJEXT) \
+    $(OBJ_DIR)encoder$(OBJEXT) \
+    $(OBJ_DIR)encqp$(OBJEXT) \
+    $(OBJ_DIR)encurl$(OBJEXT) \
+    $(OBJ_DIR)ftpcln$(OBJEXT) \
+    $(OBJ_DIR)httpcln$(OBJEXT) \
+    $(OBJ_DIR)mail$(OBJEXT) \
+    $(OBJ_DIR)popcln$(OBJEXT) \
+    $(OBJ_DIR)sessid$(OBJEXT) \
+    $(OBJ_DIR)smtpcln$(OBJEXT) \
+    $(OBJ_DIR)thtml$(OBJEXT) \
+    $(OBJ_DIR)url$(OBJEXT) \

 all: \
    $(LIB_PATH) \
--- a/harbour/contrib/hbtpathy/common.mak
+++ b/harbour/contrib/hbtpathy/common.mak
@@ -4,12 +4,12 @@

 LIBNAME = $(LIBPREF)hbtpathy

-LIB_PATH = $(LIB_DIR)/$(LIBNAME)$(LIBEXT)
+LIB_PATH = $(LIB_DIR)$(LIBNAME)$(LIBEXT)

 LIB_OBJS = \
-    $(OBJ_DIR)/tpwin32$(OBJEXT) \
+    $(OBJ_DIR)tpwin32$(OBJEXT) \
    \
-    $(OBJ_DIR)/telepath$(OBJEXT) \
+    $(OBJ_DIR)telepath$(OBJEXT) \

 all: \
    $(LIB_PATH) \
--- a/harbour/contrib/hbw32/common.mak
+++ b/harbour/contrib/hbw32/common.mak
@@ -4,15 +4,15 @@

 LIBNAME = $(LIBPREF)hbw32

-LIB_PATH = $(LIB_DIR)/$(LIBNAME)$(LIBEXT)
+LIB_PATH = $(LIB_DIR)$(LIBNAME)$(LIBEXT)

 LIB_OBJS = \
-    $(OBJ_DIR)/tprinter$(OBJEXT) \
-    $(OBJ_DIR)/w32_ole$(OBJEXT) \
-    $(OBJ_DIR)/w32_prn$(OBJEXT) \
+    $(OBJ_DIR)tprinter$(OBJEXT) \
+    $(OBJ_DIR)w32_ole$(OBJEXT) \
+    $(OBJ_DIR)w32_prn$(OBJEXT) \
    \
-    $(OBJ_DIR)/w32_tole$(OBJEXT) \
-    $(OBJ_DIR)/w32_tprn$(OBJEXT) \
+    $(OBJ_DIR)w32_tole$(OBJEXT) \
+    $(OBJ_DIR)w32_tprn$(OBJEXT) \

 all: \
   $(LIB_PATH) \
--- a/harbour/contrib/hbw32ddr/common.mak
+++ b/harbour/contrib/hbw32ddr/common.mak
@@ -4,10 +4,10 @@

 LIBNAME = $(LIBPREF)hbw32ddr

-LIB_PATH = $(LIB_DIR)/$(LIBNAME)$(LIBEXT)
+LIB_PATH = $(LIB_DIR)$(LIBNAME)$(LIBEXT)

 LIB_OBJS = \
-    $(OBJ_DIR)/w32_ddrw$(OBJEXT) \
+    $(OBJ_DIR)w32_ddrw$(OBJEXT) \

 all: \
    $(LIB_PATH) \
--- a/harbour/contrib/hbwhat32/common.mak
+++ b/harbour/contrib/hbwhat32/common.mak
@@ -4,7 +4,7 @@

 LIBNAME = $(LIBPREF)hbwhat32

-LIB_PATH = $(LIB_DIR)/$(LIBNAME)$(LIBEXT)
+LIB_PATH = $(LIB_DIR)$(LIBNAME)$(LIBEXT)

 PRG_HEADERS = \
    commctrl.ch \
@@ -20,64 +20,64 @@ PRG_HEADERS = \
    winuser.ch \

 LIB_OBJS = \
-    $(OBJ_DIR)/_winbmp$(OBJEXT) \
-    $(OBJ_DIR)/_winbrsh$(OBJEXT) \
-    $(OBJ_DIR)/_wincall$(OBJEXT) \
-    $(OBJ_DIR)/_wincdlg$(OBJEXT) \
-    $(OBJ_DIR)/_winclpb$(OBJEXT) \
-    $(OBJ_DIR)/_wincomm$(OBJEXT) \
-    $(OBJ_DIR)/_wincret$(OBJEXT) \
-    $(OBJ_DIR)/_windate$(OBJEXT) \
-    $(OBJ_DIR)/_windc$(OBJEXT) \
-    $(OBJ_DIR)/_windir$(OBJEXT) \
-    $(OBJ_DIR)/_windlg$(OBJEXT) \
-    $(OBJ_DIR)/_windll$(OBJEXT) \
-    $(OBJ_DIR)/_windraw$(OBJEXT) \
-    $(OBJ_DIR)/_winfont$(OBJEXT) \
-    $(OBJ_DIR)/_wingdi$(OBJEXT) \
-    $(OBJ_DIR)/_winhead$(OBJEXT) \
-    $(OBJ_DIR)/_winicon$(OBJEXT) \
-    $(OBJ_DIR)/_winilst$(OBJEXT) \
-    $(OBJ_DIR)/_wininet$(OBJEXT) \
-    $(OBJ_DIR)/_winini$(OBJEXT) \
-    $(OBJ_DIR)/_winkbrd$(OBJEXT) \
-    $(OBJ_DIR)/_winlv$(OBJEXT) \
-    $(OBJ_DIR)/_winmain$(OBJEXT) \
-    $(OBJ_DIR)/_winmapi$(OBJEXT) \
-    $(OBJ_DIR)/_winmem$(OBJEXT) \
-    $(OBJ_DIR)/_winmenu$(OBJEXT) \
-    $(OBJ_DIR)/_winmeta$(OBJEXT) \
-    $(OBJ_DIR)/_winmisc$(OBJEXT) \
-    $(OBJ_DIR)/_winmmcap$(OBJEXT) \
-    $(OBJ_DIR)/_winmous$(OBJEXT) \
-    $(OBJ_DIR)/_winmsg$(OBJEXT) \
-    $(OBJ_DIR)/_winpen$(OBJEXT) \
-    $(OBJ_DIR)/_winprn$(OBJEXT) \
-    $(OBJ_DIR)/_winrect$(OBJEXT) \
-    $(OBJ_DIR)/_winreg$(OBJEXT) \
-    $(OBJ_DIR)/_winrgn$(OBJEXT) \
-    $(OBJ_DIR)/_winscrlb$(OBJEXT) \
-    $(OBJ_DIR)/_winserial$(OBJEXT) \
-    $(OBJ_DIR)/_winshell$(OBJEXT) \
-    $(OBJ_DIR)/_winsock$(OBJEXT) \
-    $(OBJ_DIR)/_winsys$(OBJEXT) \
-    $(OBJ_DIR)/_wintab$(OBJEXT) \
-    $(OBJ_DIR)/_wintbar$(OBJEXT) \
-    $(OBJ_DIR)/_wintext$(OBJEXT) \
-    $(OBJ_DIR)/_wintree$(OBJEXT) \
-    $(OBJ_DIR)/_winview$(OBJEXT) \
-    $(OBJ_DIR)/_winwnd$(OBJEXT) \
+    $(OBJ_DIR)_winbmp$(OBJEXT) \
+    $(OBJ_DIR)_winbrsh$(OBJEXT) \
+    $(OBJ_DIR)_wincall$(OBJEXT) \
+    $(OBJ_DIR)_wincdlg$(OBJEXT) \
+    $(OBJ_DIR)_winclpb$(OBJEXT) \
+    $(OBJ_DIR)_wincomm$(OBJEXT) \
+    $(OBJ_DIR)_wincret$(OBJEXT) \
+    $(OBJ_DIR)_windate$(OBJEXT) \
+    $(OBJ_DIR)_windc$(OBJEXT) \
+    $(OBJ_DIR)_windir$(OBJEXT) \
+    $(OBJ_DIR)_windlg$(OBJEXT) \
+    $(OBJ_DIR)_windll$(OBJEXT) \
+    $(OBJ_DIR)_windraw$(OBJEXT) \
+    $(OBJ_DIR)_winfont$(OBJEXT) \
+    $(OBJ_DIR)_wingdi$(OBJEXT) \
+    $(OBJ_DIR)_winhead$(OBJEXT) \
+    $(OBJ_DIR)_winicon$(OBJEXT) \
+    $(OBJ_DIR)_winilst$(OBJEXT) \
+    $(OBJ_DIR)_wininet$(OBJEXT) \
+    $(OBJ_DIR)_winini$(OBJEXT) \
+    $(OBJ_DIR)_winkbrd$(OBJEXT) \
+    $(OBJ_DIR)_winlv$(OBJEXT) \
+    $(OBJ_DIR)_winmain$(OBJEXT) \
+    $(OBJ_DIR)_winmapi$(OBJEXT) \
+    $(OBJ_DIR)_winmem$(OBJEXT) \
+    $(OBJ_DIR)_winmenu$(OBJEXT) \
+    $(OBJ_DIR)_winmeta$(OBJEXT) \
+    $(OBJ_DIR)_winmisc$(OBJEXT) \
+    $(OBJ_DIR)_winmmcap$(OBJEXT) \
+    $(OBJ_DIR)_winmous$(OBJEXT) \
+    $(OBJ_DIR)_winmsg$(OBJEXT) \
+    $(OBJ_DIR)_winpen$(OBJEXT) \
+    $(OBJ_DIR)_winprn$(OBJEXT) \
+    $(OBJ_DIR)_winrect$(OBJEXT) \
+    $(OBJ_DIR)_winreg$(OBJEXT) \
+    $(OBJ_DIR)_winrgn$(OBJEXT) \
+    $(OBJ_DIR)_winscrlb$(OBJEXT) \
+    $(OBJ_DIR)_winserial$(OBJEXT) \
+    $(OBJ_DIR)_winshell$(OBJEXT) \
+    $(OBJ_DIR)_winsock$(OBJEXT) \
+    $(OBJ_DIR)_winsys$(OBJEXT) \
+    $(OBJ_DIR)_wintab$(OBJEXT) \
+    $(OBJ_DIR)_wintbar$(OBJEXT) \
+    $(OBJ_DIR)_wintext$(OBJEXT) \
+    $(OBJ_DIR)_wintree$(OBJEXT) \
+    $(OBJ_DIR)_winview$(OBJEXT) \
+    $(OBJ_DIR)_winwnd$(OBJEXT) \
    \
-    $(OBJ_DIR)/whatutil$(OBJEXT) \
-    $(OBJ_DIR)/wincdlg$(OBJEXT) \
-    $(OBJ_DIR)/wincomm$(OBJEXT) \
-    $(OBJ_DIR)/wincore$(OBJEXT) \
-    $(OBJ_DIR)/windebug$(OBJEXT) \
-    $(OBJ_DIR)/winerror$(OBJEXT) \
-    $(OBJ_DIR)/winini$(OBJEXT) \
-    $(OBJ_DIR)/winrbar$(OBJEXT) \
-    $(OBJ_DIR)/wintabs$(OBJEXT) \
-    $(OBJ_DIR)/wintbar$(OBJEXT) \
+    $(OBJ_DIR)whatutil$(OBJEXT) \
+    $(OBJ_DIR)wincdlg$(OBJEXT) \
+    $(OBJ_DIR)wincomm$(OBJEXT) \
+    $(OBJ_DIR)wincore$(OBJEXT) \
+    $(OBJ_DIR)windebug$(OBJEXT) \
+    $(OBJ_DIR)winerror$(OBJEXT) \
+    $(OBJ_DIR)winini$(OBJEXT) \
+    $(OBJ_DIR)winrbar$(OBJEXT) \
+    $(OBJ_DIR)wintabs$(OBJEXT) \
+    $(OBJ_DIR)wintbar$(OBJEXT) \

 all: \
    $(LIB_PATH) \
--- a/harbour/contrib/hbziparch/common.mak
+++ b/harbour/contrib/hbziparch/common.mak
@@ -4,27 +4,27 @@

 LIBNAME = $(LIBPREF)hbziparch

-LIB_PATH = $(LIB_DIR)/$(LIBNAME)$(LIBEXT)
+LIB_PATH = $(LIB_DIR)$(LIBNAME)$(LIBEXT)

 LIB_OBJS = \
-    $(OBJ_DIR)/ziparchive$(OBJEXT) \
-    $(OBJ_DIR)/zip$(OBJEXT) \
-    $(OBJ_DIR)/hbcomprs$(OBJEXT) \
-    $(OBJ_DIR)/zipplatform$(OBJEXT) \
-    $(OBJ_DIR)/zipstorage$(OBJEXT) \
-    $(OBJ_DIR)/zipstring$(OBJEXT) \
-    $(OBJ_DIR)/zipplatformcomm$(OBJEXT) \
-    $(OBJ_DIR)/zippathcomponent$(OBJEXT) \
-    $(OBJ_DIR)/zipmemfile$(OBJEXT) \
-    $(OBJ_DIR)/zipfileheader$(OBJEXT) \
-    $(OBJ_DIR)/zipfile$(OBJEXT) \
-    $(OBJ_DIR)/zipnew$(OBJEXT) \
-    $(OBJ_DIR)/zipcomp$(OBJEXT) \
-    $(OBJ_DIR)/zipexception$(OBJEXT) \
-    $(OBJ_DIR)/zipcompatibility$(OBJEXT) \
-    $(OBJ_DIR)/zipcentraldir$(OBJEXT) \
-    $(OBJ_DIR)/zipautobuffer$(OBJEXT) \
-    $(OBJ_DIR)/stdafx$(OBJEXT) \
+    $(OBJ_DIR)ziparchive$(OBJEXT) \
+    $(OBJ_DIR)zip$(OBJEXT) \
+    $(OBJ_DIR)hbcomprs$(OBJEXT) \
+    $(OBJ_DIR)zipplatform$(OBJEXT) \
+    $(OBJ_DIR)zipstorage$(OBJEXT) \
+    $(OBJ_DIR)zipstring$(OBJEXT) \
+    $(OBJ_DIR)zipplatformcomm$(OBJEXT) \
+    $(OBJ_DIR)zippathcomponent$(OBJEXT) \
+    $(OBJ_DIR)zipmemfile$(OBJEXT) \
+    $(OBJ_DIR)zipfileheader$(OBJEXT) \
+    $(OBJ_DIR)zipfile$(OBJEXT) \
+    $(OBJ_DIR)zipnew$(OBJEXT) \
+    $(OBJ_DIR)zipcomp$(OBJEXT) \
+    $(OBJ_DIR)zipexception$(OBJEXT) \
+    $(OBJ_DIR)zipcompatibility$(OBJEXT) \
+    $(OBJ_DIR)zipcentraldir$(OBJEXT) \
+    $(OBJ_DIR)zipautobuffer$(OBJEXT) \
+    $(OBJ_DIR)stdafx$(OBJEXT) \

 all: \
    $(LIB_PATH) \
--- a/harbour/contrib/hbzlib/common.mak
+++ b/harbour/contrib/hbzlib/common.mak
@@ -4,17 +4,17 @@

 LIBNAME = $(LIBPREF)hbzlib

-LIB_PATH = $(LIB_DIR)/$(LIBNAME)$(LIBEXT)
+LIB_PATH = $(LIB_DIR)$(LIBNAME)$(LIBEXT)

 PRG_HEADERS = \
    hbzlib.ch \

 LIB_OBJS = \
-    $(OBJ_DIR)/ioapi$(OBJEXT) \
-    $(OBJ_DIR)/zip$(OBJEXT) \
-    $(OBJ_DIR)/unzip$(OBJEXT) \
-    $(OBJ_DIR)/hbzlib$(OBJEXT) \
-    $(OBJ_DIR)/hbmzip$(OBJEXT) \
+    $(OBJ_DIR)ioapi$(OBJEXT) \
+    $(OBJ_DIR)zip$(OBJEXT) \
+    $(OBJ_DIR)unzip$(OBJEXT) \
+    $(OBJ_DIR)hbzlib$(OBJEXT) \
+    $(OBJ_DIR)hbmzip$(OBJEXT) \

 all: \
    $(LIB_PATH) \
--- a/harbour/contrib/make_gcc_all.sh
+++ b/harbour/contrib/make_gcc_all.sh
@@ -0,0 +1,58 @@
+#!/bin/sh
+
+# ---------------------------------------------------------------
+# Partly based on harbour/make_gcc.sh by :
+# Copyright 2007 Przemyslaw Czerpak (druzus/at/priv.onet.pl),
+# See doc/license.txt for licensing terms.
+# ---------------------------------------------------------------
+
+if [ -z "$HB_ARCHITECTURE" ]; then
+   if [ "$OSTYPE" = "msdosdjgpp" ]; then
+      hb_arch="dos"
+   else
+      hb_arch=`uname -s | tr -d "[-]" | tr '[A-Z]' '[a-z]' 2>/dev/null`
+      case "$hb_arch" in
+         *windows*|*mingw32*|msys*)   hb_arch="w32" ;;
+         *cygwin*)                    hb_arch="cyg" ;;
+         *dos)                        hb_arch="dos" ;;
+         *bsd)                        hb_arch="bsd" ;;
+      esac
+   fi
+   export HB_ARCHITECTURE="$hb_arch" HB_ARCH_SAVED=1
+fi
+
+#**************************************************************
+
+if [ -z "$HB_CC_NAME" ]; then
+   case "$HB_ARCHITECTURE" in
+      w32) HB_CC_NAME="mingw" ;;
+      dos) HB_CC_NAME="djgpp" ;;
+      *)   HB_CC_NAME="gcc" ;;
+   esac
+   export HB_CC_NAME HB_CC_NAME_SAVED=1
+fi
+
+#**************************************************************
+
+export _HB_DIRS_1="hbbmcdx rddado"
+export _HB_DIRS_2="hbbtree"
+
+#echo ${_HB_DIRS_1} ${_HB_DIRS_2}
+
+#**************************************************************
+
+for n in ${_HB_DIRS_1} ${_HB_DIRS_2}; do
+  if [ -d $n ]; then
+    echo Entering $n ... \( $1 $2 $3 $4 $5\)
+    cd $n
+    [ -f ./make_gcc.sh ] && ${SHELL} -c "./make_gcc.sh $1 $2 $3 $4 $5"
+    cd ..
+  fi
+done
+
+#**************************************************************
+
+unset _HB_DIRS_1 _HB_DIRS_2
+
+if [ -n "$HB_CC_NAME_SAVED" ]; then unset HB_CC_NAME HB_CC_NAME_SAVED;   fi
+if [ -n "$HB_ARCH_SAVED" ];    then unset HB_ARCHITECTURE HB_ARCH_SAVED; fi
--- a/harbour/contrib/mtpl_b32.mak
+++ b/harbour/contrib/mtpl_b32.mak
@@ -77,9 +77,9 @@ HB_LIB_INSTALL = $(HB_INSTALL_PREFIX)\lib
 HB_CC_DIRNAME = $(_HB_CC_NAME)
 !endif

-OBJ_DIR = $(HB_ROOT)\obj\$(HB_CC_DIRNAME)
-LIB_DIR = $(HB_ROOT)\lib\$(HB_CC_DIRNAME)
-BIN_DIR = $(HB_ROOT)\bin\$(HB_CC_DIRNAME)
+OBJ_DIR = $(HB_ROOT)\obj\$(HB_CC_DIRNAME)\\
+LIB_DIR = $(HB_ROOT)\lib\$(HB_CC_DIRNAME)\\
+BIN_DIR = $(HB_ROOT)\bin\$(HB_CC_DIRNAME)\\

 INCLUDE_DIR = $(HB_ROOT)\include

@@ -87,7 +87,7 @@ INCLUDE_DIR = $(HB_ROOT)\include
 # Macros to access Harbour executable and other goodies
 #**********************************************************

-HARBOUR_EXE = $(BIN_DIR)\harbour.exe
+HARBOUR_EXE = $(BIN_DIR)harbour.exe

 #**********************************************************
 # C compiler definition and C flags. These should never have to change.
--- a/harbour/contrib/mtpl_gcc.sh
+++ b/harbour/contrib/mtpl_gcc.sh
@@ -0,0 +1,54 @@
+#!/bin/sh
+
+#
+# $Id$
+#
+
+# ---------------------------------------------------------------
+# Partly based on harbour/make_gcc.sh and harbour/contrib/mtpl_*.bat
+# by :
+#   Copyright 2007 Przemyslaw Czerpak (druzus/at/priv.onet.pl),
+#   Copyright 1999-2001 Viktor Szakats (viktor.szakats@syenar.hu)
+# See doc/license.txt for licensing terms.
+# ---------------------------------------------------------------
+
+# ---------------------------------------------------------------
+# This is a generic template file, if it doesn't fit your own needs
+# please DON'T MODIFY IT.
+#
+# Instead, make a local copy and modify that one, or make a call to
+# this batch file from your customized one. [vszakats]
+#
+# export any of the below settings to customize your build process:
+#    export HB_MAKE_PROGRAM=
+#    export HB_MAKE_FLAGS=
+# ---------------------------------------------------------------
+
+export _HB_CC_NAME=${HB_CC_NAME}
+export _HB_MAKE_PROGRAM=${HB_MAKE_PROGRAM}
+export _HB_MAKEFILE=${HB_MAKEFILE}
+
+if [ -z "$_HB_CC_NAME" ]; then
+   hb_arch=`uname -s | tr -d "[-]" | tr '[A-Z]' '[a-z]' 2>/dev/null`
+   case "$hb_arch" in
+      *windows*|*mingw32*|msys*)   _HB_CC_NAME="mingw" ;;
+      *dos)                        _HB_CC_NAME="djgpp" ;;
+      *)                           _HB_CC_NAME="gcc" ;;
+   esac
+   export _HB_CC_NAME
+   unset hb_arch
+fi
+if [ -z "${_HB_MAKE_PROGRAM}" ]; then export _HB_MAKE_PROGRAM=make; fi
+if [ -z "${_HB_MAKEFILE}" ];     then export _HB_MAKEFILE=../mtpl_gcc.mak; fi
+
+export HB_EXIT_LEVEL=
+
+# ---------------------------------------------------------------
+
+${_HB_MAKE_PROGRAM} ${HB_MAKE_FLAGS} -f ${_HB_MAKEFILE} $1 $2 $3 || export HB_EXIT_LEVEL=1
+
+# ---------------------------------------------------------------
+
+unset _HB_CC_NAME
+unset _HB_MAKE_PROGRAM
+unset _HB_MAKEFILE
--- a/harbour/contrib/mtpl_vc.mak
+++ b/harbour/contrib/mtpl_vc.mak
@@ -74,9 +74,9 @@ HB_LIB_INSTALL = $(HB_INSTALL_PREFIX)\lib
 HB_CC_DIRNAME = $(_HB_CC_NAME)
 !endif

-OBJ_DIR = $(HB_ROOT)\obj\$(HB_CC_DIRNAME)
-LIB_DIR = $(HB_ROOT)\lib\$(HB_CC_DIRNAME)
-BIN_DIR = $(HB_ROOT)\bin\$(HB_CC_DIRNAME)
+OBJ_DIR = $(HB_ROOT)\obj\$(HB_CC_DIRNAME)\\
+LIB_DIR = $(HB_ROOT)\lib\$(HB_CC_DIRNAME)\\
+BIN_DIR = $(HB_ROOT)\bin\$(HB_CC_DIRNAME)\\

 INCLUDE_DIR = $(HB_ROOT)\include

@@ -84,7 +84,7 @@ INCLUDE_DIR = $(HB_ROOT)\include
 # Macros to access Harbour executable and other goodies
 #**********************************************************

-HARBOUR_EXE = $(BIN_DIR)\harbour.exe
+HARBOUR_EXE = $(BIN_DIR)harbour.exe

 #**********************************************************
 # C compiler definition and C flags. These should never have to change.
--- a/harbour/contrib/rddado/common.mak
+++ b/harbour/contrib/rddado/common.mak
@@ -4,13 +4,13 @@

 LIBNAME = $(LIBPREF)rddado

-LIB_PATH = $(LIB_DIR)/$(LIBNAME)$(LIBEXT)
+LIB_PATH = $(LIB_DIR)$(LIBNAME)$(LIBEXT)

 PRG_HEADERS = \
    adordd.ch \

 LIB_OBJS = \
-    $(OBJ_DIR)/adordd$(OBJEXT)
+    $(OBJ_DIR)adordd$(OBJEXT)

 all: \
    $(LIB_PATH) \
--- a/harbour/contrib/rddado/make_gcc.sh
+++ b/harbour/contrib/rddado/make_gcc.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+#
+# $Id$
+#
+
+../mtpl_gcc.sh $1 $2 $3 $4 $5 $6 $7 $8 $9
--- a/harbour/contrib/rddads/common.mak
+++ b/harbour/contrib/rddads/common.mak
@@ -4,15 +4,15 @@

 LIBNAME = $(LIBPREF)rddads

-LIB_PATH = $(LIB_DIR)/$(LIBNAME)$(LIBEXT)
+LIB_PATH = $(LIB_DIR)$(LIBNAME)$(LIBEXT)

 PRG_HEADERS = \
    ads.ch \

 LIB_OBJS = \
-    $(OBJ_DIR)/ads1$(OBJEXT) \
-    $(OBJ_DIR)/adsfunc$(OBJEXT) \
-    $(OBJ_DIR)/adsmgmnt$(OBJEXT) \
+    $(OBJ_DIR)ads1$(OBJEXT) \
+    $(OBJ_DIR)adsfunc$(OBJEXT) \
+    $(OBJ_DIR)adsmgmnt$(OBJEXT) \

 all: \
    $(LIB_PATH) \
--- a/harbour/contrib/xhb/common.mak
+++ b/harbour/contrib/xhb/common.mak
@@ -4,7 +4,7 @@

 LIBNAME = $(LIBPREF)xhb

-LIB_PATH = $(LIB_DIR)/$(LIBNAME)$(LIBEXT)
+LIB_PATH = $(LIB_DIR)$(LIBNAME)$(LIBEXT)

 C_HEADERS = \
    hbcompat.h \
@@ -21,23 +21,23 @@ PRG_HEADERS = \
    xhbextrn.ch \

 LIB_OBJS = \
-    $(OBJ_DIR)/hbxml$(OBJEXT) \
-    $(OBJ_DIR)/hbsyslog$(OBJEXT) \
-    $(OBJ_DIR)/hboutdbg$(OBJEXT) \
-    $(OBJ_DIR)/cstructc$(OBJEXT) \
-    $(OBJ_DIR)/xhbenum$(OBJEXT) \
-    $(OBJ_DIR)/xhbfunc$(OBJEXT) \
-    $(OBJ_DIR)/xhbmsgs$(OBJEXT) \
-    $(OBJ_DIR)/xhbqself$(OBJEXT) \
-    $(OBJ_DIR)/xhbwith$(OBJEXT) \
-    $(OBJ_DIR)/hbcomprs$(OBJEXT) \
-    $(OBJ_DIR)/hbchksum$(OBJEXT) \
+    $(OBJ_DIR)hbxml$(OBJEXT) \
+    $(OBJ_DIR)hbsyslog$(OBJEXT) \
+    $(OBJ_DIR)hboutdbg$(OBJEXT) \
+    $(OBJ_DIR)cstructc$(OBJEXT) \
+    $(OBJ_DIR)xhbenum$(OBJEXT) \
+    $(OBJ_DIR)xhbfunc$(OBJEXT) \
+    $(OBJ_DIR)xhbmsgs$(OBJEXT) \
+    $(OBJ_DIR)xhbqself$(OBJEXT) \
+    $(OBJ_DIR)xhbwith$(OBJEXT) \
+    $(OBJ_DIR)hbcomprs$(OBJEXT) \
+    $(OBJ_DIR)hbchksum$(OBJEXT) \
    \
-    $(OBJ_DIR)/txml$(OBJEXT) \
-    $(OBJ_DIR)/hblog$(OBJEXT) \
-    $(OBJ_DIR)/hblognet$(OBJEXT) \
-    $(OBJ_DIR)/cstruct$(OBJEXT) \
-    $(OBJ_DIR)/xhbcomp$(OBJEXT) \
+    $(OBJ_DIR)txml$(OBJEXT) \
+    $(OBJ_DIR)hblog$(OBJEXT) \
+    $(OBJ_DIR)hblognet$(OBJEXT) \
+    $(OBJ_DIR)cstruct$(OBJEXT) \
+    $(OBJ_DIR)xhbcomp$(OBJEXT) \

 all: \
    $(LIB_PATH) \