2008-01-30 21:30 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/rddado/common.mak * contrib/rddads/common.mak * contrib/xhb/common.mak ! Changed to be compatible with GNU make for alternative building system centered around common.mak. + contrib/make_gcc_all.sh + contrib/mtpl_gcc.mak + contrib/mtpl_gcc.sh + New files for building contrib libs with GNU make using alternative building system centered around common.mak. + contrib/hbbmcdx/make_gcc.sh + contrib/hbbtree/make_gcc.sh + contrib/rddado/make_gcc.sh + New files for building contrib libs with GNU make using alternative building system centered around common.mak. Work in progress. * contrib/make_b32_all.bat * contrib/make_vc_all.bat + Added Copyright notes. * contrib/mtpl_b32.bat * contrib/mtpl_b32.mak * contrib/mtpl_vc.bat * contrib/mtpl_vc.mak ! Minor cleanup and formatting. * make_gcc.mak * make_gcc.sh ! Minor fix related to Cygwin platform
2008-01-30 20:39:26 +00:00
parent 735787b94d
commit 541265b357
36 changed files with 569 additions and 503 deletions
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,19 +8,77 @@
   2002-12-01 13:30 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */

+2008-01-30 21:30 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/rddado/common.mak
+   * contrib/rddads/common.mak
+   * contrib/xhb/common.mak
+     ! Changed to be compatible with GNU make for alternative
+       building system centered around common.mak.
+
+   + contrib/make_gcc_all.sh
+   + contrib/mtpl_gcc.mak
+   + contrib/mtpl_gcc.sh
+     + New files for building contrib libs with GNU make using
+       alternative building system centered around common.mak.
+
+   + contrib/hbbmcdx/make_gcc.sh
+   + contrib/hbbtree/make_gcc.sh
+   + contrib/rddado/make_gcc.sh
+     + New files for building contrib libs with GNU make using
+       alternative building system centered around common.mak.
+       Work in progress.
+
+   * contrib/make_b32_all.bat
+   * contrib/make_vc_all.bat
+     + Added Copyright notes.
+
+   * contrib/mtpl_b32.bat
+   * contrib/mtpl_b32.mak
+   * contrib/mtpl_vc.bat
+   * contrib/mtpl_vc.mak
+     ! Minor cleanup and formatting.
+
+   * make_gcc.mak
+   * make_gcc.sh
+     ! Minor fix related to Cygwin platform
+
 2008-01-29 01:00 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
   * ChangeLog
     ! Typos.

   * utils/hbpp/hbpplib.c
     ! Replaced RTE code 1001 with 1002.
-       (almost the same error condition, but better have 
+       (almost the same error condition, but better have
       it different to avoid any support confusions).

 2008-01-28 12:10 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
   * include/hbapierr.h
   * source/rtl/errorapi.c
-     ! Removed HB_ERR_SS_TOOLS non-core #define (formerly used by 
+     ! Removed HB_ERR_SS_TOOLS non-core #define (formerly used by
       /contrib/hbct) from core header.
     ! Removed non-core related Error API call hb_errRT_TOOLS()
       (functionality was similar to hb_errRT_BASE())
@@ -64,12 +122,12 @@
     ! Minor formatting.

   * contrib/hbzlib/make_b32.bat
-     ! -a added to implib until a better fix is found 
+     ! -a added to implib until a better fix is found
       for the problem.

   * source/rdd/dbfntx/dbfntx1.c
   * source/rdd/dbfcdx/dbfcdx1.c
-     ! Changed previously used internal error code 
+     ! Changed previously used internal error code
       ranges to better fit in already used ones.
       (70??/71?? -> 93??)

--- a/harbour/contrib/gtwvg/common.mak
+++ b/harbour/contrib/gtwvg/common.mak
@@ -2,9 +2,9 @@
 # $Id$
 #

-LIBNAME = gtwvg
+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
@@ -2,13 +2,13 @@
 # $Id$
 #

-LIBNAME = hbapollo
+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
@@ -2,13 +2,13 @@
 # $Id$
 #

-LIBNAME = hbbmcdx
+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/hbbtree/common.mak
+++ b/harbour/contrib/hbbtree/common.mak
@@ -2,9 +2,9 @@
 # $Id$
 #

-LIBNAME = hbbtree
+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/hbclipsm/common.mak
+++ b/harbour/contrib/hbclipsm/common.mak
@@ -2,22 +2,22 @@
 # $Id$
 #

-LIBNAME = hbclipsm
+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
@@ -2,9 +2,9 @@
 # $Id$
 #

-LIBNAME = hbct
+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
@@ -2,13 +2,13 @@
 # $Id$
 #

-LIBNAME = hbfbird
+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
@@ -2,16 +2,16 @@
 # $Id$
 #

-LIBNAME = hbfimage
+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
@@ -2,21 +2,21 @@
 # $Id$
 #

-LIBNAME = hbgd
+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
@@ -2,28 +2,28 @@
 # $Id$
 #

-LIBNAME = hbgt
+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
@@ -2,24 +2,24 @@
 # $Id$
 #

-LIBNAME = hbmisc
+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
@@ -2,17 +2,17 @@
 # $Id$
 #

-LIBNAME = hbmsql
+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
@@ -2,18 +2,18 @@
 # $Id$
 #

-LIBNAME = hbmysql
+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
@@ -2,148 +2,148 @@
 # $Id$
 #

-LIBNAME = hbnf
+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
@@ -2,18 +2,18 @@
 # $Id$
 #

-LIBNAME = hbodbc
+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
@@ -2,14 +2,14 @@
 # $Id$
 #

-LIBNAME = hbole
+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
@@ -2,18 +2,18 @@
 # $Id$
 #

-LIBNAME = hbpgsql
+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
@@ -2,34 +2,34 @@
 # $Id$
 #

-LIBNAME = hbtip
+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
@@ -2,14 +2,14 @@
 # $Id: common.mak 7935 2007-11-10 11:31:17Z vszakats $
 #

-LIBNAME = hbtpathy
+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
@@ -2,17 +2,17 @@
 # $Id$
 #

-LIBNAME = hbw32
+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
@@ -2,12 +2,12 @@
 # $Id$
 #

-LIBNAME = hbw32ddr
+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
@@ -2,9 +2,9 @@
 # $Id$
 #

-LIBNAME = hbwhat32
+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
@@ -2,29 +2,29 @@
 # $Id$
 #

-LIBNAME = hbziparch
+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
@@ -2,19 +2,19 @@
 # $Id$
 #

-LIBNAME = hbzlib
+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_b32_all.bat
+++ b/harbour/contrib/make_b32_all.bat
@@ -3,6 +3,16 @@ rem
 rem $Id$
 rem

+rem *******************************************************
+rem Bat file for creating (almost all) Contrib libs
+rem for Harbour Project for Borland C/C++
+rem *******************************************************
+
+rem *******************************************************
+rem Copyright 2007 Marek Paliwoda (mpaliwoda "at" interia "dot" pl)
+rem See doc/license.txt for licensing terms.
+rem *******************************************************
+
 rem *******************************************************
 rem The compilation is done in three steps. PLEASE DO NOT MODIFY IT
 rem or you will break a Windows9x command.com line length limit !!!
--- a/harbour/contrib/make_vc_all.bat
+++ b/harbour/contrib/make_vc_all.bat
@@ -3,6 +3,16 @@ rem
 rem $Id$
 rem

+rem *******************************************************
+rem Bat file for creating (almost all) contrib libs
+rem for Harbour Project for Microsoft Visual C/C++
+rem *******************************************************
+
+rem *******************************************************
+rem Copyright 2007 Marek Paliwoda (mpaliwoda "at" interia "dot" pl)
+rem See doc/license.txt for licensing terms.
+rem *******************************************************
+
 rem *******************************************************
 rem The compilation is done in three steps. PLEASE DO NOT MODIFY IT
 rem or you will break a Windows9x command.com line length limit !!!
--- a/harbour/contrib/mtpl_b32.bat
+++ b/harbour/contrib/mtpl_b32.bat
@@ -22,6 +22,7 @@ set _HB_MAKEFILE=%HB_MAKEFILE%
 if "%_HB_CC_NAME%"      == "" set _HB_CC_NAME=b32
 if "%_HB_MAKE_PROGRAM%" == "" set _HB_MAKE_PROGRAM=make.exe
 if "%_HB_MAKEFILE%"     == "" set _HB_MAKEFILE=..\mtpl_%_HB_CC_NAME%.mak
+
 set HB_EXIT_LEVEL=

 rem ---------------------------------------------------------------
--- a/harbour/contrib/mtpl_b32.mak
+++ b/harbour/contrib/mtpl_b32.mak
@@ -131,18 +131,10 @@ $(OBJ_DIR);\
    $(CC) $(CLIBFLAGS) -o$@ $<
 #**********************************************************
 # General *.prg --> *.obj COMPILE rule for STATIC Libraries
-{$(ALL_LIB_SRC_DIRS)}.prg{$(DLL_OBJ_DIR)}$(OBJEXT):
+{$(ALL_LIB_SRC_DIRS)}.prg{$(OBJ_DIR)}$(OBJEXT):
    $(HARBOUR_EXE) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $**
    $(CC) $(CLIBFLAGS) -o$@ $(OBJ_DIR)\$&.c
 #**********************************************************
-# General Library BUILD rule - does not work
-#{$(OBJ_DIR)}.obj{$(LIB_DIR)}.lib:
-#   if exist "$@" $(DEL) "$@" > NUL
-#   $(MKLIB) "$@" $(ARFLAGS) @&&!
-#+$(**: = &^
-#+)
-#!
-#**********************************************************

 !include common.mak

--- a/harbour/contrib/mtpl_vc.bat
+++ b/harbour/contrib/mtpl_vc.bat
@@ -22,6 +22,7 @@ set _HB_MAKEFILE=%HB_MAKEFILE%
 if "%_HB_CC_NAME%"      == "" set _HB_CC_NAME=vc
 if "%_HB_MAKE_PROGRAM%" == "" set _HB_MAKE_PROGRAM=nmake.exe
 if "%_HB_MAKEFILE%"     == "" set _HB_MAKEFILE=..\mtpl_%_HB_CC_NAME%.mak
+
 set HB_EXIT_LEVEL=

 rem ---------------------------------------------------------------
--- a/harbour/contrib/mtpl_vc.mak
+++ b/harbour/contrib/mtpl_vc.mak
@@ -127,13 +127,6 @@ LDFLAGS        = $(LDFLAGS)
    $(HARBOUR_EXE) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $<
    $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c
 #**********************************************************
-# General Library BUILD rule - does not work
-#{$(OBJ_DIR)}$(OBJEXT){$(LIB_PATH)}.lib:
-#   if exist "$@" $(DEL) "$@" > nul
-#   $(MKLIB) /out:$@ @<<
-#$**
-#<<$(KEEPSTATE)
-#**********************************************************

 !include common.mak

--- a/harbour/contrib/rddado/common.mak
+++ b/harbour/contrib/rddado/common.mak
@@ -2,15 +2,15 @@
 # $Id$
 #

-LIBNAME = rddado
+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/rddads/common.mak
+++ b/harbour/contrib/rddads/common.mak
@@ -2,17 +2,17 @@
 # $Id$
 #

-LIBNAME = rddads
+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
@@ -2,9 +2,9 @@
 # $Id$
 #

-LIBNAME = xhb
+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) \
--- a/harbour/make_gcc.mak
+++ b/harbour/make_gcc.mak
@@ -64,10 +64,11 @@

 #**********************************************************

-#ifeq ($(HB_ARCHITECTURE),cyg)
-## Cygwin is "Linux on Windows"
-#HB_ARCHITECTURE = w32
-#endif
+ifeq ($(HB_ARCHITECTURE),cyg)
+# Revert Cygwin architecture to w32.
+# After all it's under Windows OS.
+HB_ARCHITECTURE = w32
+endif

 #**********************************************************

--- a/harbour/make_gcc.sh
+++ b/harbour/make_gcc.sh
@@ -182,10 +182,10 @@ mkdir -p obj/$HB_CC_NAME lib/$HB_CC_NAME bin/$HB_CC_NAME

 # Revert Cygwin architecture to w32.
 # After all it's under Windows OS.
-if [ "$HB_ARCHITECTURE" == "cyg" ]
-then
-   export HB_ARCHITECTURE=w32
-fi
+#if [ "$HB_ARCHITECTURE" == "cyg" ]
+#then
+#   export HB_ARCHITECTURE=w32
+#fi

 sed -e 's/;/ /g'             \
    -e 's!\\\(.\)!/\1!g'     \