diff --git a/harbour/ChangeLog b/harbour/ChangeLog index c0d70bc62f..6d33d22ff7 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,41 @@ The license applies to all entries newer than 2009-04-28. */ +2012-02-28 16:45 UTC+0100 Viktor Szakats (harbour syenar.net) + * contrib/sddpg/sddpg.hbp + * contrib/sddpg/sddpg.hbc + * contrib/hbziparc/hbziparc.hbp + * contrib/hbziparc/hbziparc.hbc + * contrib/hbhttpd/hbhttpd.hbc + * contrib/hbhttpd/hbhttpds.hbp + * contrib/hbhttpd/hbhttpds.hbc + * contrib/gtwvg/gtwvg.hbc + * contrib/gtwvg/gtwvg.hbp + * contrib/sddsqlt3/sddsqlt3.hbp + * contrib/sddsqlt3/sddsqlt3.hbc + * contrib/sddmy/sddmy.hbp + * contrib/sddmy/sddmy.hbc + * contrib/xhb/xhb.hbc + * contrib/xhb/xhb.hbp + * contrib/sddfb/sddfb.hbp + * contrib/sddfb/sddfb.hbc + * contrib/sddodbc/sddodbc.hbp + * contrib/sddodbc/sddodbc.hbc + * contrib/hbgd/hbgd.hbc + * contrib/hbgd/hbgd.hbp + * contrib/sddoci/sddoci.hbc + * contrib/sddoci/sddoci.hbp + * contrib/hbtip/hbtipssl.hbc + * contrib/hbtip/hbtipssl.hbp + * contrib/hbtip/hbtip.hbc + + removed relative path from .hbc references from contrib area + except: hbqt related cases, which is more complicated + and hbmk.hbm files in test dirs (to avoid this extra point + of failure for now). + ; path-free reference to hbc files was pioneered by hbrun + and it works on all systems (except one or two, yet to + be determined why). + 2012-02-28 16:35 UTC+0100 Viktor Szakats (harbour syenar.net) * contrib/hbmysql/utils/hbmk.hbm * contrib/hbnetio/utils/hbnetio/hbnetio.hbp diff --git a/harbour/contrib/gtwvg/gtwvg.hbc b/harbour/contrib/gtwvg/gtwvg.hbc index 4500a4e7ea..5083f6c55a 100644 --- a/harbour/contrib/gtwvg/gtwvg.hbc +++ b/harbour/contrib/gtwvg/gtwvg.hbc @@ -8,7 +8,7 @@ incpaths=. gt=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF} -libs=../hbwin/hbwin.hbc +libs=hbwin.hbc gui=yes mt=yes diff --git a/harbour/contrib/gtwvg/gtwvg.hbp b/harbour/contrib/gtwvg/gtwvg.hbp index 9eb815245d..d5f0546b66 100644 --- a/harbour/contrib/gtwvg/gtwvg.hbp +++ b/harbour/contrib/gtwvg/gtwvg.hbp @@ -13,7 +13,7 @@ -stop{!win|hbdyn} -../hbwin/hbwin.hbc +hbwin.hbc # Optimize build time and make sure we build even with this option -cflag=-DWIN32_LEAN_AND_MEAN @@ -58,4 +58,3 @@ wvgtoolb.prg wvgtreev.prg wvgwnd.prg wvggenrc.prg - diff --git a/harbour/contrib/hbgd/hbgd.hbc b/harbour/contrib/hbgd/hbgd.hbc index dbd2c8c0d6..ef99394477 100644 --- a/harbour/contrib/hbgd/hbgd.hbc +++ b/harbour/contrib/hbgd/hbgd.hbc @@ -11,4 +11,4 @@ libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF} {darwin}libs=gd {darwin}libpaths=/opt/local/lib -libs=../hbct/hbct.hbc +libs=hbct.hbc diff --git a/harbour/contrib/hbgd/hbgd.hbp b/harbour/contrib/hbgd/hbgd.hbp index 902a9096be..05fcd4de63 100644 --- a/harbour/contrib/hbgd/hbgd.hbp +++ b/harbour/contrib/hbgd/hbgd.hbp @@ -9,7 +9,7 @@ -w3 -es2 -../hbct/hbct.hbc +hbct.hbc -deppkgname=gd:gd-devel -depkeyhead=gd:gd.h diff --git a/harbour/contrib/hbhttpd/hbhttpd.hbc b/harbour/contrib/hbhttpd/hbhttpd.hbc index 84a48a2a9d..209824690e 100644 --- a/harbour/contrib/hbhttpd/hbhttpd.hbc +++ b/harbour/contrib/hbhttpd/hbhttpd.hbc @@ -6,6 +6,6 @@ incpaths=. {!HB_HTTPD_OPENSSL|dos}libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF} {HB_HTTPD_OPENSSL&!dos}libs=${_HB_DYNPREF}${hb_name}s${_HB_DYNSUFF} -{HB_HTTPD_OPENSSL&!dos}libs=../hbssl/hbssl.hbc +{HB_HTTPD_OPENSSL&!dos}libs=hbssl.hbc mt=yes diff --git a/harbour/contrib/hbhttpd/hbhttpds.hbc b/harbour/contrib/hbhttpd/hbhttpds.hbc index 029395ded2..e41928eded 100644 --- a/harbour/contrib/hbhttpd/hbhttpds.hbc +++ b/harbour/contrib/hbhttpd/hbhttpds.hbc @@ -8,4 +8,4 @@ libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF} mt=yes -libs=../hbssl/hbssl.hbc +libs=hbssl.hbc diff --git a/harbour/contrib/hbhttpd/hbhttpds.hbp b/harbour/contrib/hbhttpd/hbhttpds.hbp index 847a9e86f4..1903007b6e 100644 --- a/harbour/contrib/hbhttpd/hbhttpds.hbp +++ b/harbour/contrib/hbhttpd/hbhttpds.hbp @@ -4,6 +4,6 @@ @hbhttpd.hbp -../hbssl/hbssl.hbc +hbssl.hbc -DHB_HAS_OPENSSL diff --git a/harbour/contrib/hbtip/hbtip.hbc b/harbour/contrib/hbtip/hbtip.hbc index 925097b520..648da8c268 100644 --- a/harbour/contrib/hbtip/hbtip.hbc +++ b/harbour/contrib/hbtip/hbtip.hbc @@ -6,4 +6,4 @@ incpaths=. {!HB_TIP_OPENSSL|dos}libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF} {HB_TIP_OPENSSL&!dos}libs=${_HB_DYNPREF}${hb_name}ssl${_HB_DYNSUFF} -{HB_TIP_OPENSSL&!dos}libs=../hbssl/hbssl.hbc +{HB_TIP_OPENSSL&!dos}libs=hbssl.hbc diff --git a/harbour/contrib/hbtip/hbtipssl.hbc b/harbour/contrib/hbtip/hbtipssl.hbc index 561bea397a..fe4d106367 100644 --- a/harbour/contrib/hbtip/hbtipssl.hbc +++ b/harbour/contrib/hbtip/hbtipssl.hbc @@ -5,4 +5,4 @@ incpaths=. libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF} -libs=../hbssl/hbssl.hbc +libs=hbssl.hbc diff --git a/harbour/contrib/hbtip/hbtipssl.hbp b/harbour/contrib/hbtip/hbtipssl.hbp index 23762e0a3b..ba0fb879d4 100644 --- a/harbour/contrib/hbtip/hbtipssl.hbp +++ b/harbour/contrib/hbtip/hbtipssl.hbp @@ -4,6 +4,6 @@ hbtip.hbm -../hbssl/hbssl.hbc +hbssl.hbc -DHB_HAS_OPENSSL diff --git a/harbour/contrib/hbziparc/hbziparc.hbc b/harbour/contrib/hbziparc/hbziparc.hbc index 2ecfdaf7a0..bfe5228f83 100644 --- a/harbour/contrib/hbziparc/hbziparc.hbc +++ b/harbour/contrib/hbziparc/hbziparc.hbc @@ -3,4 +3,4 @@ # libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF} -libs=../hbmzip/hbmzip.hbc +libs=hbmzip.hbc diff --git a/harbour/contrib/hbziparc/hbziparc.hbp b/harbour/contrib/hbziparc/hbziparc.hbp index bb6b24d63b..a479ad1ebb 100644 --- a/harbour/contrib/hbziparc/hbziparc.hbp +++ b/harbour/contrib/hbziparc/hbziparc.hbp @@ -15,4 +15,4 @@ hbziparc.hbx ziparc.prg -../hbmzip/hbmzip.hbc +hbmzip.hbc diff --git a/harbour/contrib/sddfb/sddfb.hbc b/harbour/contrib/sddfb/sddfb.hbc index fa7fc93a8e..bd861cd45a 100644 --- a/harbour/contrib/sddfb/sddfb.hbc +++ b/harbour/contrib/sddfb/sddfb.hbc @@ -7,4 +7,4 @@ libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF} {!darwin}libs=fbclient {darwin}frameworks=Firebird -libs=../rddsql/rddsql.hbc +libs=rddsql.hbc diff --git a/harbour/contrib/sddfb/sddfb.hbp b/harbour/contrib/sddfb/sddfb.hbp index c40111bc2a..30101d6fa8 100644 --- a/harbour/contrib/sddfb/sddfb.hbp +++ b/harbour/contrib/sddfb/sddfb.hbp @@ -9,7 +9,7 @@ -w3 -es2 -../rddsql/rddsql.hbc +rddsql.hbc -stop{pocc64|poccarm} diff --git a/harbour/contrib/sddmy/sddmy.hbc b/harbour/contrib/sddmy/sddmy.hbc index 9be8b9a8df..f7b9e3b797 100644 --- a/harbour/contrib/sddmy/sddmy.hbc +++ b/harbour/contrib/sddmy/sddmy.hbc @@ -9,4 +9,4 @@ libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF} {win|dos}libs=libmysql {os2}libs=mysqlclient -libs=../rddsql/rddsql.hbc +libs=rddsql.hbc diff --git a/harbour/contrib/sddmy/sddmy.hbp b/harbour/contrib/sddmy/sddmy.hbp index 317ff89222..c8fd547495 100644 --- a/harbour/contrib/sddmy/sddmy.hbp +++ b/harbour/contrib/sddmy/sddmy.hbp @@ -9,7 +9,7 @@ -w3 -es2 -../rddsql/rddsql.hbc +rddsql.hbc -depkeyhead=mysql:mysql.h -depcontrol=mysql:no{HB_BUILD_3RDEXT='no'} diff --git a/harbour/contrib/sddoci/sddoci.hbc b/harbour/contrib/sddoci/sddoci.hbc index 77b494463f..1a2ad7c934 100644 --- a/harbour/contrib/sddoci/sddoci.hbc +++ b/harbour/contrib/sddoci/sddoci.hbc @@ -7,4 +7,4 @@ libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF} {HB_WITH_OCILIB_MIXED}libs=ocilibm {!HB_WITH_OCILIB_WIDE&!HB_WITH_OCILIB_MIXED}libs=ociliba -libs=../rddsql/rddsql.hbc +libs=rddsql.hbc diff --git a/harbour/contrib/sddoci/sddoci.hbp b/harbour/contrib/sddoci/sddoci.hbp index 1f3de52139..cb6ce83b46 100644 --- a/harbour/contrib/sddoci/sddoci.hbp +++ b/harbour/contrib/sddoci/sddoci.hbp @@ -9,7 +9,7 @@ -w3 -es2 -../rddsql/rddsql.hbc +rddsql.hbc -stop{dos|os2|wce} diff --git a/harbour/contrib/sddodbc/sddodbc.hbc b/harbour/contrib/sddodbc/sddodbc.hbc index db06b56476..f7139817d5 100644 --- a/harbour/contrib/sddodbc/sddodbc.hbc +++ b/harbour/contrib/sddodbc/sddodbc.hbc @@ -8,4 +8,4 @@ libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF} {unix&!darwin}libs=odbc {unix&darwin}libs=iodbc -libs=../rddsql/rddsql.hbc +libs=rddsql.hbc diff --git a/harbour/contrib/sddodbc/sddodbc.hbp b/harbour/contrib/sddodbc/sddodbc.hbp index 26fcdc1d3c..eb7420a261 100644 --- a/harbour/contrib/sddodbc/sddodbc.hbp +++ b/harbour/contrib/sddodbc/sddodbc.hbp @@ -9,7 +9,7 @@ -w3 -es2 -../rddsql/rddsql.hbc +rddsql.hbc -stop{dos|os2|rsxnt} diff --git a/harbour/contrib/sddpg/sddpg.hbc b/harbour/contrib/sddpg/sddpg.hbc index 5d28d6bef5..ca6588e15c 100644 --- a/harbour/contrib/sddpg/sddpg.hbc +++ b/harbour/contrib/sddpg/sddpg.hbc @@ -9,4 +9,4 @@ libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF} {darwin}libpaths=/opt/local/lib/postgresql84 {darwin}libpaths=/opt/local/lib/postgresql83 -libs=../rddsql/rddsql.hbc +libs=rddsql.hbc diff --git a/harbour/contrib/sddpg/sddpg.hbp b/harbour/contrib/sddpg/sddpg.hbp index 272d7d73c5..cabf0f9695 100644 --- a/harbour/contrib/sddpg/sddpg.hbp +++ b/harbour/contrib/sddpg/sddpg.hbp @@ -9,7 +9,7 @@ -w3 -es2 -../rddsql/rddsql.hbc +rddsql.hbc -depkeyhead=pgsql:libpq-fe.h -depcontrol=pgsql:no{HB_BUILD_3RDEXT='no'} diff --git a/harbour/contrib/sddsqlt3/sddsqlt3.hbc b/harbour/contrib/sddsqlt3/sddsqlt3.hbc index 2ca2b1b6fb..898b7232f0 100644 --- a/harbour/contrib/sddsqlt3/sddsqlt3.hbc +++ b/harbour/contrib/sddsqlt3/sddsqlt3.hbc @@ -5,4 +5,4 @@ libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF} libs=../3rd/sqlite3/sqlite3.hbc -libs=../rddsql/rddsql.hbc +libs=rddsql.hbc diff --git a/harbour/contrib/sddsqlt3/sddsqlt3.hbp b/harbour/contrib/sddsqlt3/sddsqlt3.hbp index feb998c61f..ea72d4019c 100644 --- a/harbour/contrib/sddsqlt3/sddsqlt3.hbp +++ b/harbour/contrib/sddsqlt3/sddsqlt3.hbp @@ -9,7 +9,7 @@ -w3 -es2 -../rddsql/rddsql.hbc +rddsql.hbc -depkeyhead=sqlite3:sqlite3.h -depcontrol=sqlite3:local{HB_BUILD_3RDEXT='no'} diff --git a/harbour/contrib/xhb/xhb.hbc b/harbour/contrib/xhb/xhb.hbc index 16be296f16..9683ff9cbd 100644 --- a/harbour/contrib/xhb/xhb.hbc +++ b/harbour/contrib/xhb/xhb.hbc @@ -8,8 +8,8 @@ libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF} # xhb has these as part of core, so we're adding them to emulate it. # They are not needed to use xhb lib itself. -libs=../hbct/hbct.hbc -libs=../hbtip/hbtip.hbc -libs=../hbwin/hbwin.hbc -libs=../hbfship/hbfship.hbc -libs=../hbxpp/hbxpp.hbc +libs=hbct.hbc +libs=hbtip.hbc +libs=hbwin.hbc +libs=hbfship.hbc +libs=hbxpp.hbc diff --git a/harbour/contrib/xhb/xhb.hbp b/harbour/contrib/xhb/xhb.hbp index 7fafa19c64..247063bb59 100644 --- a/harbour/contrib/xhb/xhb.hbp +++ b/harbour/contrib/xhb/xhb.hbp @@ -23,11 +23,11 @@ # For hbserv.c, maybe more -c=gnu90 -../hbct/hbct.hbc -../hbtip/hbtip.hbc -../hbwin/hbwin.hbc -../hbfship/hbfship.hbc -../hbxpp/hbxpp.hbc +hbct.hbc +hbtip.hbc +hbwin.hbc +hbfship.hbc +hbxpp.hbc xhb.hbx