From 67c8fbb275eb0dde2fe2f1f91b4b3732101be78f Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sat, 21 Jun 2008 16:00:23 +0000 Subject: [PATCH] 2008-06-21 17:58 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * contrib/Makefile - contrib/hbgf/gtk - contrib/hbgf/os2pm - contrib/hbgf/win32 + contrib/hbgf/hbgfw32 + contrib/hbgf/hbgfos2 + contrib/hbgf/hbgfgtk + contrib/hbgf/Makefile * contrib/hbgf/hbgfos2/Makefile + Decentralized GNU make for these contribs. * Renamed according to stds. ! Fix to be built under Linux/Win32. (if they don't work they should be fixed/disabled locally) * contrib/Makefile * contrib/hbodbc/Makefile * contrib/hbw32/Makefile * contrib/rddado/Makefile * Further decentralization of contrib building decisions. + Added all existing contribs to the list. Separated into two sections: standalone contribs, and ones with external dependencies. ; TODO: Refine this by some clever commenting. This is a multiplatform issue, so we need to work together. * contrib/examples/Makefile ! Fixed to include newly added examples. * contrib/hbapollo/make_b32.bat * contrib/hbapollo/make_vc.bat * contrib/hbcurl/make_b32.bat * contrib/hbcurl/make_vc.bat * contrib/hbfbird/make_b32.bat * contrib/hbfbird/make_vc.bat * contrib/hbfimage/make_b32.bat * contrib/hbfimage/make_vc.bat * contrib/hbgd/make_b32.bat * contrib/hbgd/make_vc.bat * contrib/hbhpdf/make_b32.bat * contrib/hbhpdf/make_vc.bat * contrib/hbmysql/make_b32.bat * contrib/hbmysql/make_vc.bat * contrib/hbpgsql/make_b32.bat * contrib/hbpgsql/make_vc.bat * contrib/rddads/make_b32.bat * contrib/rddads/make_vc.bat + Some steps made to make it possible to disable any messings with .dlls. This is not yet complete, and the goal is to be able to use HB_INC_* to specify include dirs for external packages on all make systems (GNU, non-GNU .bat, non-GNU .sh) [TOMERGE 1.0.0RC1] --- harbour/ChangeLog | 69 +++++++++++++++++++ harbour/contrib/Makefile | 47 ++++++++----- harbour/contrib/examples/Makefile | 2 + harbour/contrib/hbapollo/make_b32.bat | 2 + harbour/contrib/hbapollo/make_vc.bat | 2 + harbour/contrib/hbcurl/make_b32.bat | 2 + harbour/contrib/hbcurl/make_vc.bat | 2 + harbour/contrib/hbfbird/make_b32.bat | 2 + harbour/contrib/hbfbird/make_vc.bat | 2 + harbour/contrib/hbfimage/make_b32.bat | 2 + harbour/contrib/hbfimage/make_vc.bat | 2 + harbour/contrib/hbgd/make_b32.bat | 2 + harbour/contrib/hbgd/make_vc.bat | 2 + harbour/contrib/hbgf/Makefile | 19 +++++ .../contrib/hbgf/{gtk => hbgfgtk}/Makefile | 0 .../contrib/hbgf/{gtk => hbgfgtk}/button.prg | 0 .../contrib/hbgf/{gtk => hbgfgtk}/creabutt.c | 0 .../contrib/hbgf/{gtk => hbgfgtk}/creamenu.c | 0 .../contrib/hbgf/{gtk => hbgfgtk}/creawin.c | 0 .../contrib/hbgf/{gtk => hbgfgtk}/dispatch.c | 0 .../contrib/hbgf/{gtk => hbgfgtk}/form.prg | 0 .../contrib/hbgf/{gtk => hbgfgtk}/general.c | 0 .../contrib/hbgf/{gtk => hbgfgtk}/harbgtk.ch | 0 .../contrib/hbgf/{gtk => hbgfgtk}/harbgtk.h | 0 .../contrib/hbgf/{gtk => hbgfgtk}/mainlgtk.c | 0 .../contrib/hbgf/{gtk => hbgfgtk}/menu.prg | 0 .../hbgf/{gtk => hbgfgtk}/menuitem.prg | 0 .../contrib/hbgf/{gtk => hbgfgtk}/msginfo.c | 0 .../contrib/hbgf/{gtk => hbgfgtk}/shared.ch | 0 .../contrib/hbgf/{gtk => hbgfgtk}/winctrl.prg | 0 .../contrib/hbgf/{os2pm => hbgfos2}/Makefile | 2 +- .../hbgf/{os2pm => hbgfos2}/button.prg | 0 .../contrib/hbgf/{os2pm => hbgfos2}/edit.prg | 0 .../contrib/hbgf/{os2pm => hbgfos2}/os2pm.c | 0 .../contrib/hbgf/{os2pm => hbgfos2}/os2pm.ch | 0 .../contrib/hbgf/{os2pm => hbgfos2}/tform.prg | 0 .../contrib/hbgf/{os2pm => hbgfos2}/tmenu.prg | 0 .../hbgf/{os2pm => hbgfos2}/tmenuitm.prg | 0 .../hbgf/{os2pm => hbgfos2}/winctrl.prg | 0 .../hbgf/{win32 => hbgfw32}/button.prg | 0 .../hbgf/{win32 => hbgfw32}/common.mak | 0 .../contrib/hbgf/{win32 => hbgfw32}/edit.prg | 0 .../contrib/hbgf/{win32 => hbgfw32}/form.prg | 0 .../hbgf/{win32 => hbgfw32}/make_b32.bat | 0 .../hbgf/{win32 => hbgfw32}/make_vc.bat | 0 .../contrib/hbgf/{win32 => hbgfw32}/menu.prg | 0 .../hbgf/{win32 => hbgfw32}/menuitem.prg | 0 .../contrib/hbgf/{win32 => hbgfw32}/win32.c | 0 .../contrib/hbgf/{win32 => hbgfw32}/win32.ch | 0 .../hbgf/{win32 => hbgfw32}/winctrl.prg | 0 harbour/contrib/hbhpdf/make_b32.bat | 2 + harbour/contrib/hbhpdf/make_vc.bat | 2 + harbour/contrib/hbmysql/make_b32.bat | 2 + harbour/contrib/hbmysql/make_vc.bat | 2 + harbour/contrib/hbodbc/Makefile | 2 + harbour/contrib/hbpgsql/make_b32.bat | 2 + harbour/contrib/hbpgsql/make_vc.bat | 2 + harbour/contrib/hbw32/Makefile | 2 + harbour/contrib/rddado/Makefile | 5 ++ harbour/contrib/rddads/make_b32.bat | 2 + harbour/contrib/rddads/make_vc.bat | 2 + 61 files changed, 165 insertions(+), 19 deletions(-) create mode 100644 harbour/contrib/hbgf/Makefile rename harbour/contrib/hbgf/{gtk => hbgfgtk}/Makefile (100%) rename harbour/contrib/hbgf/{gtk => hbgfgtk}/button.prg (100%) rename harbour/contrib/hbgf/{gtk => hbgfgtk}/creabutt.c (100%) rename harbour/contrib/hbgf/{gtk => hbgfgtk}/creamenu.c (100%) rename harbour/contrib/hbgf/{gtk => hbgfgtk}/creawin.c (100%) rename harbour/contrib/hbgf/{gtk => hbgfgtk}/dispatch.c (100%) rename harbour/contrib/hbgf/{gtk => hbgfgtk}/form.prg (100%) rename harbour/contrib/hbgf/{gtk => hbgfgtk}/general.c (100%) rename harbour/contrib/hbgf/{gtk => hbgfgtk}/harbgtk.ch (100%) rename harbour/contrib/hbgf/{gtk => hbgfgtk}/harbgtk.h (100%) rename harbour/contrib/hbgf/{gtk => hbgfgtk}/mainlgtk.c (100%) rename harbour/contrib/hbgf/{gtk => hbgfgtk}/menu.prg (100%) rename harbour/contrib/hbgf/{gtk => hbgfgtk}/menuitem.prg (100%) rename harbour/contrib/hbgf/{gtk => hbgfgtk}/msginfo.c (100%) rename harbour/contrib/hbgf/{gtk => hbgfgtk}/shared.ch (100%) rename harbour/contrib/hbgf/{gtk => hbgfgtk}/winctrl.prg (100%) rename harbour/contrib/hbgf/{os2pm => hbgfos2}/Makefile (91%) rename harbour/contrib/hbgf/{os2pm => hbgfos2}/button.prg (100%) rename harbour/contrib/hbgf/{os2pm => hbgfos2}/edit.prg (100%) rename harbour/contrib/hbgf/{os2pm => hbgfos2}/os2pm.c (100%) rename harbour/contrib/hbgf/{os2pm => hbgfos2}/os2pm.ch (100%) rename harbour/contrib/hbgf/{os2pm => hbgfos2}/tform.prg (100%) rename harbour/contrib/hbgf/{os2pm => hbgfos2}/tmenu.prg (100%) rename harbour/contrib/hbgf/{os2pm => hbgfos2}/tmenuitm.prg (100%) rename harbour/contrib/hbgf/{os2pm => hbgfos2}/winctrl.prg (100%) rename harbour/contrib/hbgf/{win32 => hbgfw32}/button.prg (100%) rename harbour/contrib/hbgf/{win32 => hbgfw32}/common.mak (100%) rename harbour/contrib/hbgf/{win32 => hbgfw32}/edit.prg (100%) rename harbour/contrib/hbgf/{win32 => hbgfw32}/form.prg (100%) rename harbour/contrib/hbgf/{win32 => hbgfw32}/make_b32.bat (100%) rename harbour/contrib/hbgf/{win32 => hbgfw32}/make_vc.bat (100%) rename harbour/contrib/hbgf/{win32 => hbgfw32}/menu.prg (100%) rename harbour/contrib/hbgf/{win32 => hbgfw32}/menuitem.prg (100%) rename harbour/contrib/hbgf/{win32 => hbgfw32}/win32.c (100%) rename harbour/contrib/hbgf/{win32 => hbgfw32}/win32.ch (100%) rename harbour/contrib/hbgf/{win32 => hbgfw32}/winctrl.prg (100%) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 62ab42b2d1..14ebfac2d9 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,75 @@ 2008-12-31 13:59 UTC+0100 Foo Bar */ +2008-06-21 17:58 UTC+0200 Viktor Szakats (harbour.01 syenar hu) + * contrib/Makefile + - contrib/hbgf/gtk + - contrib/hbgf/os2pm + - contrib/hbgf/win32 + + contrib/hbgf/hbgfw32 + + contrib/hbgf/hbgfos2 + + contrib/hbgf/hbgfgtk + + contrib/hbgf/Makefile + * contrib/hbgf/hbgfos2/Makefile + + Decentralized GNU make for these contribs. + * Renamed according to stds. + ! Fix to be built under Linux/Win32. + (if they don't work they should be fixed/disabled locally) + + * contrib/Makefile + * contrib/hbodbc/Makefile + * contrib/hbw32/Makefile + * contrib/rddado/Makefile + * Further decentralization of contrib building decisions. + + Added all existing contribs to the list. Separated into + two sections: standalone contribs, and ones with external + dependencies. + ; TODO: Refine this by some clever commenting. + This is a multiplatform issue, so we need to + work together. + + * contrib/examples/Makefile + ! Fixed to include newly added examples. + + * contrib/hbapollo/make_b32.bat + * contrib/hbapollo/make_vc.bat + * contrib/hbcurl/make_b32.bat + * contrib/hbcurl/make_vc.bat + * contrib/hbfbird/make_b32.bat + * contrib/hbfbird/make_vc.bat + * contrib/hbfimage/make_b32.bat + * contrib/hbfimage/make_vc.bat + * contrib/hbgd/make_b32.bat + * contrib/hbgd/make_vc.bat + * contrib/hbhpdf/make_b32.bat + * contrib/hbhpdf/make_vc.bat + * contrib/hbmysql/make_b32.bat + * contrib/hbmysql/make_vc.bat + * contrib/hbpgsql/make_b32.bat + * contrib/hbpgsql/make_vc.bat + * contrib/rddads/make_b32.bat + * contrib/rddads/make_vc.bat + + Some steps made to make it possible to disable + any messings with .dlls. This is not yet complete, + and the goal is to be able to use HB_INC_* to + specify include dirs for external packages on + all make systems (GNU, non-GNU .bat, non-GNU .sh) + [TOMERGE 1.0.0RC1] + +2008-06-21 17:33 UTC+0200 Viktor Szakats (harbour.01 syenar hu) + - contrib/hbgf/gtk + - contrib/hbgf/os2pm + - contrib/hbgf/win32 + + contrib/hbgf/hbgfw32 + + contrib/hbgf/hbgfos2 + + contrib/hbgf/hbgfgtk + + contrib/hbgf/Makefile + * contrib/hbgf/hbgfos2/Makefile + + Decentralized GNU make for these contribs. + * Renamed according to stds. + ! Fix to be built under Linux/Win32. + (if they don't work they should be fixed/disabled locally) + 2008-06-21 17:23 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * contrib/hbw32ddr/Makefile ! Fixed to compile with GNU make. diff --git a/harbour/contrib/Makefile b/harbour/contrib/Makefile index 507d4483e8..2b9347cdec 100644 --- a/harbour/contrib/Makefile +++ b/harbour/contrib/Makefile @@ -4,38 +4,49 @@ ROOT = ../ +# standalone contribs DIRS=\ gtwvg \ hbbmcdx \ hbbtree \ + hbclipsm \ hbct \ + hbgf \ hbgt \ hbmisc \ - hbnf \ - hbclipsm \ - hbvpdf \ hbmzip \ + hbnf \ + hbodbc \ + hbole \ + hbsqlit2 \ + hbsqlit3 \ hbtip \ + hbtpathy \ + hbvpdf \ + hbw32 \ + hbw32ddr \ + hbwhat32 \ + hbziparch \ + rddado \ xhb \ -# examples \ -ifeq ($(HB_ARCHITECTURE),w32) -DIRS += rddads -ifneq ($(HB_COMPILER),rsxnt) -DIRS += hbw32 hbodbc rddado -endif -endif - -ifeq ($(HB_ARCHITECTURE),os2) -DIRS += hbgf/os2pm -endif - -ifeq ($(HB_ARCHITECTURE),linux) -DIRS += rddads hbodbc -endif +# contribs with external dependencies +DIRS += + hbapollo \ + hbcurl \ + hbfbird \ + hbfimage \ + hbgd \ + hbhpdf \ + hbmsql \ + hbmysql \ + hbpgsql \ + rddads \ ifneq ($(HB_CONTRIBLIBS),) DIRS += $(HB_CONTRIBLIBS) endif +#DIRS += examples + include $(ROOT)config/dir.cf diff --git a/harbour/contrib/examples/Makefile b/harbour/contrib/examples/Makefile index 40bf5f9969..32ca994773 100644 --- a/harbour/contrib/examples/Makefile +++ b/harbour/contrib/examples/Makefile @@ -9,5 +9,7 @@ DIRS=\ hscript \ misc \ pe \ + pp \ + rdddbt \ include $(ROOT)config/dir.cf diff --git a/harbour/contrib/hbapollo/make_b32.bat b/harbour/contrib/hbapollo/make_b32.bat index 5470a90645..856b828f9b 100644 --- a/harbour/contrib/hbapollo/make_b32.bat +++ b/harbour/contrib/hbapollo/make_b32.bat @@ -25,6 +25,8 @@ call ..\mtpl_b32.bat %1 %2 %3 %4 %5 %6 %7 %8 %9 rem --------------------------------------------------------------- +if "_HB_DLL_DIR" == "" goto POST_EXIT + set _HB_INSTALL_PREFIX=%HB_INSTALL_PREFIX% if "%_HB_INSTALL_PREFIX%" == "" set _HB_INSTALL_PREFIX=..\.. set _HB_LIB_INSTALL=%HB_LIB_INSTALL% diff --git a/harbour/contrib/hbapollo/make_vc.bat b/harbour/contrib/hbapollo/make_vc.bat index 6858efd2cf..85f9bf6763 100644 --- a/harbour/contrib/hbapollo/make_vc.bat +++ b/harbour/contrib/hbapollo/make_vc.bat @@ -25,6 +25,8 @@ call ..\mtpl_vc.bat %1 %2 %3 %4 %5 %6 %7 %8 %9 rem --------------------------------------------------------------- +if "_HB_DLL_DIR" == "" goto POST_EXIT + set _HB_INSTALL_PREFIX=%HB_INSTALL_PREFIX% if "%_HB_INSTALL_PREFIX%" == "" set _HB_INSTALL_PREFIX=..\.. set _HB_LIB_INSTALL=%HB_LIB_INSTALL% diff --git a/harbour/contrib/hbcurl/make_b32.bat b/harbour/contrib/hbcurl/make_b32.bat index 77ec1d2339..4413943fc5 100644 --- a/harbour/contrib/hbcurl/make_b32.bat +++ b/harbour/contrib/hbcurl/make_b32.bat @@ -28,6 +28,8 @@ call ..\mtpl_b32.bat %1 %2 %3 %4 %5 %6 %7 %8 %9 rem --------------------------------------------------------------- +if "_HB_DLL_DIR" == "" goto POST_EXIT + set _HB_INSTALL_PREFIX=%HB_INSTALL_PREFIX% if "%_HB_INSTALL_PREFIX%" == "" set _HB_INSTALL_PREFIX=..\.. set _HB_LIB_INSTALL=%HB_LIB_INSTALL% diff --git a/harbour/contrib/hbcurl/make_vc.bat b/harbour/contrib/hbcurl/make_vc.bat index 1fc9c41afa..c4ebde6b33 100644 --- a/harbour/contrib/hbcurl/make_vc.bat +++ b/harbour/contrib/hbcurl/make_vc.bat @@ -28,6 +28,8 @@ call ..\mtpl_vc.bat %1 %2 %3 %4 %5 %6 %7 %8 %9 rem --------------------------------------------------------------- +if "_HB_DLL_DIR" == "" goto POST_EXIT + set _HB_INSTALL_PREFIX=%HB_INSTALL_PREFIX% if "%_HB_INSTALL_PREFIX%" == "" set _HB_INSTALL_PREFIX=..\.. set _HB_LIB_INSTALL=%HB_LIB_INSTALL% diff --git a/harbour/contrib/hbfbird/make_b32.bat b/harbour/contrib/hbfbird/make_b32.bat index 5ba5fee5da..bda3d4cbf9 100644 --- a/harbour/contrib/hbfbird/make_b32.bat +++ b/harbour/contrib/hbfbird/make_b32.bat @@ -25,6 +25,8 @@ call ..\mtpl_b32.bat %1 %2 %3 %4 %5 %6 %7 %8 %9 rem --------------------------------------------------------------- +if "_HB_DLL_DIR" == "" goto POST_EXIT + set _HB_INSTALL_PREFIX=%HB_INSTALL_PREFIX% if "%_HB_INSTALL_PREFIX%" == "" set _HB_INSTALL_PREFIX=..\.. set _HB_LIB_INSTALL=%HB_LIB_INSTALL% diff --git a/harbour/contrib/hbfbird/make_vc.bat b/harbour/contrib/hbfbird/make_vc.bat index 3c3c5ec733..41cb2662e7 100644 --- a/harbour/contrib/hbfbird/make_vc.bat +++ b/harbour/contrib/hbfbird/make_vc.bat @@ -25,6 +25,8 @@ call ..\mtpl_vc.bat %1 %2 %3 %4 %5 %6 %7 %8 %9 rem --------------------------------------------------------------- +if "_HB_DLL_DIR" == "" goto POST_EXIT + set _HB_INSTALL_PREFIX=%HB_INSTALL_PREFIX% if "%_HB_INSTALL_PREFIX%" == "" set _HB_INSTALL_PREFIX=..\.. set _HB_LIB_INSTALL=%HB_LIB_INSTALL% diff --git a/harbour/contrib/hbfimage/make_b32.bat b/harbour/contrib/hbfimage/make_b32.bat index b8d0f68b18..8ad95cbf11 100644 --- a/harbour/contrib/hbfimage/make_b32.bat +++ b/harbour/contrib/hbfimage/make_b32.bat @@ -26,6 +26,8 @@ call ..\mtpl_b32.bat %1 %2 %3 %4 %5 %6 %7 %8 %9 rem --------------------------------------------------------------- +if "_HB_DLL_DIR" == "" goto POST_EXIT + set _HB_INSTALL_PREFIX=%HB_INSTALL_PREFIX% if "%_HB_INSTALL_PREFIX%" == "" set _HB_INSTALL_PREFIX=..\.. set _HB_LIB_INSTALL=%HB_LIB_INSTALL% diff --git a/harbour/contrib/hbfimage/make_vc.bat b/harbour/contrib/hbfimage/make_vc.bat index 5a96b222f5..4db97e1398 100644 --- a/harbour/contrib/hbfimage/make_vc.bat +++ b/harbour/contrib/hbfimage/make_vc.bat @@ -26,6 +26,8 @@ call ..\mtpl_vc.bat %1 %2 %3 %4 %5 %6 %7 %8 %9 rem --------------------------------------------------------------- +if "_HB_DLL_DIR" == "" goto POST_EXIT + set _HB_INSTALL_PREFIX=%HB_INSTALL_PREFIX% if "%_HB_INSTALL_PREFIX%" == "" set _HB_INSTALL_PREFIX=..\.. set _HB_LIB_INSTALL=%HB_LIB_INSTALL% diff --git a/harbour/contrib/hbgd/make_b32.bat b/harbour/contrib/hbgd/make_b32.bat index 65149a5a3b..df898a7304 100644 --- a/harbour/contrib/hbgd/make_b32.bat +++ b/harbour/contrib/hbgd/make_b32.bat @@ -25,6 +25,8 @@ call ..\mtpl_b32.bat %1 %2 %3 %4 %5 %6 %7 %8 %9 rem --------------------------------------------------------------- +if "_HB_DLL_DIR" == "" goto POST_EXIT + set _HB_INSTALL_PREFIX=%HB_INSTALL_PREFIX% if "%_HB_INSTALL_PREFIX%" == "" set _HB_INSTALL_PREFIX=..\.. set _HB_LIB_INSTALL=%HB_LIB_INSTALL% diff --git a/harbour/contrib/hbgd/make_vc.bat b/harbour/contrib/hbgd/make_vc.bat index eb502cb72c..5ca84d91d3 100644 --- a/harbour/contrib/hbgd/make_vc.bat +++ b/harbour/contrib/hbgd/make_vc.bat @@ -25,6 +25,8 @@ call ..\mtpl_vc.bat %1 %2 %3 %4 %5 %6 %7 %8 %9 rem --------------------------------------------------------------- +if "_HB_DLL_DIR" == "" goto POST_EXIT + set _HB_INSTALL_PREFIX=%HB_INSTALL_PREFIX% if "%_HB_INSTALL_PREFIX%" == "" set _HB_INSTALL_PREFIX=..\.. set _HB_LIB_INSTALL=%HB_LIB_INSTALL% diff --git a/harbour/contrib/hbgf/Makefile b/harbour/contrib/hbgf/Makefile new file mode 100644 index 0000000000..abbda3ecea --- /dev/null +++ b/harbour/contrib/hbgf/Makefile @@ -0,0 +1,19 @@ +# +# $Id$ +# + +ROOT = ../../ + +ifeq ($(HB_ARCHITECTURE),w32) +DIRS = hbgfw32 +endif + +ifeq ($(HB_ARCHITECTURE),linux) +DIRS = hbgfgtk +endif + +ifeq ($(HB_ARCHITECTURE),os2) +DIRS = hbgfos2 +endif + +include $(ROOT)config/dir.cf diff --git a/harbour/contrib/hbgf/gtk/Makefile b/harbour/contrib/hbgf/hbgfgtk/Makefile similarity index 100% rename from harbour/contrib/hbgf/gtk/Makefile rename to harbour/contrib/hbgf/hbgfgtk/Makefile diff --git a/harbour/contrib/hbgf/gtk/button.prg b/harbour/contrib/hbgf/hbgfgtk/button.prg similarity index 100% rename from harbour/contrib/hbgf/gtk/button.prg rename to harbour/contrib/hbgf/hbgfgtk/button.prg diff --git a/harbour/contrib/hbgf/gtk/creabutt.c b/harbour/contrib/hbgf/hbgfgtk/creabutt.c similarity index 100% rename from harbour/contrib/hbgf/gtk/creabutt.c rename to harbour/contrib/hbgf/hbgfgtk/creabutt.c diff --git a/harbour/contrib/hbgf/gtk/creamenu.c b/harbour/contrib/hbgf/hbgfgtk/creamenu.c similarity index 100% rename from harbour/contrib/hbgf/gtk/creamenu.c rename to harbour/contrib/hbgf/hbgfgtk/creamenu.c diff --git a/harbour/contrib/hbgf/gtk/creawin.c b/harbour/contrib/hbgf/hbgfgtk/creawin.c similarity index 100% rename from harbour/contrib/hbgf/gtk/creawin.c rename to harbour/contrib/hbgf/hbgfgtk/creawin.c diff --git a/harbour/contrib/hbgf/gtk/dispatch.c b/harbour/contrib/hbgf/hbgfgtk/dispatch.c similarity index 100% rename from harbour/contrib/hbgf/gtk/dispatch.c rename to harbour/contrib/hbgf/hbgfgtk/dispatch.c diff --git a/harbour/contrib/hbgf/gtk/form.prg b/harbour/contrib/hbgf/hbgfgtk/form.prg similarity index 100% rename from harbour/contrib/hbgf/gtk/form.prg rename to harbour/contrib/hbgf/hbgfgtk/form.prg diff --git a/harbour/contrib/hbgf/gtk/general.c b/harbour/contrib/hbgf/hbgfgtk/general.c similarity index 100% rename from harbour/contrib/hbgf/gtk/general.c rename to harbour/contrib/hbgf/hbgfgtk/general.c diff --git a/harbour/contrib/hbgf/gtk/harbgtk.ch b/harbour/contrib/hbgf/hbgfgtk/harbgtk.ch similarity index 100% rename from harbour/contrib/hbgf/gtk/harbgtk.ch rename to harbour/contrib/hbgf/hbgfgtk/harbgtk.ch diff --git a/harbour/contrib/hbgf/gtk/harbgtk.h b/harbour/contrib/hbgf/hbgfgtk/harbgtk.h similarity index 100% rename from harbour/contrib/hbgf/gtk/harbgtk.h rename to harbour/contrib/hbgf/hbgfgtk/harbgtk.h diff --git a/harbour/contrib/hbgf/gtk/mainlgtk.c b/harbour/contrib/hbgf/hbgfgtk/mainlgtk.c similarity index 100% rename from harbour/contrib/hbgf/gtk/mainlgtk.c rename to harbour/contrib/hbgf/hbgfgtk/mainlgtk.c diff --git a/harbour/contrib/hbgf/gtk/menu.prg b/harbour/contrib/hbgf/hbgfgtk/menu.prg similarity index 100% rename from harbour/contrib/hbgf/gtk/menu.prg rename to harbour/contrib/hbgf/hbgfgtk/menu.prg diff --git a/harbour/contrib/hbgf/gtk/menuitem.prg b/harbour/contrib/hbgf/hbgfgtk/menuitem.prg similarity index 100% rename from harbour/contrib/hbgf/gtk/menuitem.prg rename to harbour/contrib/hbgf/hbgfgtk/menuitem.prg diff --git a/harbour/contrib/hbgf/gtk/msginfo.c b/harbour/contrib/hbgf/hbgfgtk/msginfo.c similarity index 100% rename from harbour/contrib/hbgf/gtk/msginfo.c rename to harbour/contrib/hbgf/hbgfgtk/msginfo.c diff --git a/harbour/contrib/hbgf/gtk/shared.ch b/harbour/contrib/hbgf/hbgfgtk/shared.ch similarity index 100% rename from harbour/contrib/hbgf/gtk/shared.ch rename to harbour/contrib/hbgf/hbgfgtk/shared.ch diff --git a/harbour/contrib/hbgf/gtk/winctrl.prg b/harbour/contrib/hbgf/hbgfgtk/winctrl.prg similarity index 100% rename from harbour/contrib/hbgf/gtk/winctrl.prg rename to harbour/contrib/hbgf/hbgfgtk/winctrl.prg diff --git a/harbour/contrib/hbgf/os2pm/Makefile b/harbour/contrib/hbgf/hbgfos2/Makefile similarity index 91% rename from harbour/contrib/hbgf/os2pm/Makefile rename to harbour/contrib/hbgf/hbgfos2/Makefile index dcccf25987..1670f386ce 100644 --- a/harbour/contrib/hbgf/os2pm/Makefile +++ b/harbour/contrib/hbgf/hbgfos2/Makefile @@ -15,6 +15,6 @@ PRG_SOURCES=\ button.prg \ edit.prg \ -LIBNAME=hbgfos2pm +LIBNAME=hbgfos2 include $(TOP)$(ROOT)config/lib.cf diff --git a/harbour/contrib/hbgf/os2pm/button.prg b/harbour/contrib/hbgf/hbgfos2/button.prg similarity index 100% rename from harbour/contrib/hbgf/os2pm/button.prg rename to harbour/contrib/hbgf/hbgfos2/button.prg diff --git a/harbour/contrib/hbgf/os2pm/edit.prg b/harbour/contrib/hbgf/hbgfos2/edit.prg similarity index 100% rename from harbour/contrib/hbgf/os2pm/edit.prg rename to harbour/contrib/hbgf/hbgfos2/edit.prg diff --git a/harbour/contrib/hbgf/os2pm/os2pm.c b/harbour/contrib/hbgf/hbgfos2/os2pm.c similarity index 100% rename from harbour/contrib/hbgf/os2pm/os2pm.c rename to harbour/contrib/hbgf/hbgfos2/os2pm.c diff --git a/harbour/contrib/hbgf/os2pm/os2pm.ch b/harbour/contrib/hbgf/hbgfos2/os2pm.ch similarity index 100% rename from harbour/contrib/hbgf/os2pm/os2pm.ch rename to harbour/contrib/hbgf/hbgfos2/os2pm.ch diff --git a/harbour/contrib/hbgf/os2pm/tform.prg b/harbour/contrib/hbgf/hbgfos2/tform.prg similarity index 100% rename from harbour/contrib/hbgf/os2pm/tform.prg rename to harbour/contrib/hbgf/hbgfos2/tform.prg diff --git a/harbour/contrib/hbgf/os2pm/tmenu.prg b/harbour/contrib/hbgf/hbgfos2/tmenu.prg similarity index 100% rename from harbour/contrib/hbgf/os2pm/tmenu.prg rename to harbour/contrib/hbgf/hbgfos2/tmenu.prg diff --git a/harbour/contrib/hbgf/os2pm/tmenuitm.prg b/harbour/contrib/hbgf/hbgfos2/tmenuitm.prg similarity index 100% rename from harbour/contrib/hbgf/os2pm/tmenuitm.prg rename to harbour/contrib/hbgf/hbgfos2/tmenuitm.prg diff --git a/harbour/contrib/hbgf/os2pm/winctrl.prg b/harbour/contrib/hbgf/hbgfos2/winctrl.prg similarity index 100% rename from harbour/contrib/hbgf/os2pm/winctrl.prg rename to harbour/contrib/hbgf/hbgfos2/winctrl.prg diff --git a/harbour/contrib/hbgf/win32/button.prg b/harbour/contrib/hbgf/hbgfw32/button.prg similarity index 100% rename from harbour/contrib/hbgf/win32/button.prg rename to harbour/contrib/hbgf/hbgfw32/button.prg diff --git a/harbour/contrib/hbgf/win32/common.mak b/harbour/contrib/hbgf/hbgfw32/common.mak similarity index 100% rename from harbour/contrib/hbgf/win32/common.mak rename to harbour/contrib/hbgf/hbgfw32/common.mak diff --git a/harbour/contrib/hbgf/win32/edit.prg b/harbour/contrib/hbgf/hbgfw32/edit.prg similarity index 100% rename from harbour/contrib/hbgf/win32/edit.prg rename to harbour/contrib/hbgf/hbgfw32/edit.prg diff --git a/harbour/contrib/hbgf/win32/form.prg b/harbour/contrib/hbgf/hbgfw32/form.prg similarity index 100% rename from harbour/contrib/hbgf/win32/form.prg rename to harbour/contrib/hbgf/hbgfw32/form.prg diff --git a/harbour/contrib/hbgf/win32/make_b32.bat b/harbour/contrib/hbgf/hbgfw32/make_b32.bat similarity index 100% rename from harbour/contrib/hbgf/win32/make_b32.bat rename to harbour/contrib/hbgf/hbgfw32/make_b32.bat diff --git a/harbour/contrib/hbgf/win32/make_vc.bat b/harbour/contrib/hbgf/hbgfw32/make_vc.bat similarity index 100% rename from harbour/contrib/hbgf/win32/make_vc.bat rename to harbour/contrib/hbgf/hbgfw32/make_vc.bat diff --git a/harbour/contrib/hbgf/win32/menu.prg b/harbour/contrib/hbgf/hbgfw32/menu.prg similarity index 100% rename from harbour/contrib/hbgf/win32/menu.prg rename to harbour/contrib/hbgf/hbgfw32/menu.prg diff --git a/harbour/contrib/hbgf/win32/menuitem.prg b/harbour/contrib/hbgf/hbgfw32/menuitem.prg similarity index 100% rename from harbour/contrib/hbgf/win32/menuitem.prg rename to harbour/contrib/hbgf/hbgfw32/menuitem.prg diff --git a/harbour/contrib/hbgf/win32/win32.c b/harbour/contrib/hbgf/hbgfw32/win32.c similarity index 100% rename from harbour/contrib/hbgf/win32/win32.c rename to harbour/contrib/hbgf/hbgfw32/win32.c diff --git a/harbour/contrib/hbgf/win32/win32.ch b/harbour/contrib/hbgf/hbgfw32/win32.ch similarity index 100% rename from harbour/contrib/hbgf/win32/win32.ch rename to harbour/contrib/hbgf/hbgfw32/win32.ch diff --git a/harbour/contrib/hbgf/win32/winctrl.prg b/harbour/contrib/hbgf/hbgfw32/winctrl.prg similarity index 100% rename from harbour/contrib/hbgf/win32/winctrl.prg rename to harbour/contrib/hbgf/hbgfw32/winctrl.prg diff --git a/harbour/contrib/hbhpdf/make_b32.bat b/harbour/contrib/hbhpdf/make_b32.bat index 074d904df2..cc81a1e33d 100644 --- a/harbour/contrib/hbhpdf/make_b32.bat +++ b/harbour/contrib/hbhpdf/make_b32.bat @@ -26,6 +26,8 @@ call ..\mtpl_b32.bat %1 %2 %3 %4 %5 %6 %7 %8 %9 rem --------------------------------------------------------------- +if "_HB_DLL_DIR" == "" goto POST_EXIT + set _HB_INSTALL_PREFIX=%HB_INSTALL_PREFIX% if "%_HB_INSTALL_PREFIX%" == "" set _HB_INSTALL_PREFIX=..\.. set _HB_LIB_INSTALL=%HB_LIB_INSTALL% diff --git a/harbour/contrib/hbhpdf/make_vc.bat b/harbour/contrib/hbhpdf/make_vc.bat index 54ece64403..eb5abc5b7e 100644 --- a/harbour/contrib/hbhpdf/make_vc.bat +++ b/harbour/contrib/hbhpdf/make_vc.bat @@ -26,6 +26,8 @@ call ..\mtpl_vc.bat %1 %2 %3 %4 %5 %6 %7 %8 %9 rem --------------------------------------------------------------- +if "_HB_DLL_DIR" == "" goto POST_EXIT + set _HB_INSTALL_PREFIX=%HB_INSTALL_PREFIX% if "%_HB_INSTALL_PREFIX%" == "" set _HB_INSTALL_PREFIX=..\.. set _HB_LIB_INSTALL=%HB_LIB_INSTALL% diff --git a/harbour/contrib/hbmysql/make_b32.bat b/harbour/contrib/hbmysql/make_b32.bat index 252364c751..cfe86da4b8 100644 --- a/harbour/contrib/hbmysql/make_b32.bat +++ b/harbour/contrib/hbmysql/make_b32.bat @@ -25,6 +25,8 @@ call ..\mtpl_b32.bat %1 %2 %3 %4 %5 %6 %7 %8 %9 rem --------------------------------------------------------------- +if "_HB_DLL_DIR" == "" goto POST_EXIT + set _HB_INSTALL_PREFIX=%HB_INSTALL_PREFIX% if "%_HB_INSTALL_PREFIX%" == "" set _HB_INSTALL_PREFIX=..\.. set _HB_LIB_INSTALL=%HB_LIB_INSTALL% diff --git a/harbour/contrib/hbmysql/make_vc.bat b/harbour/contrib/hbmysql/make_vc.bat index be3c58cb66..febeea89ae 100644 --- a/harbour/contrib/hbmysql/make_vc.bat +++ b/harbour/contrib/hbmysql/make_vc.bat @@ -25,6 +25,8 @@ call ..\mtpl_vc.bat %1 %2 %3 %4 %5 %6 %7 %8 %9 rem --------------------------------------------------------------- +if "_HB_DLL_DIR" == "" goto POST_EXIT + set _HB_INSTALL_PREFIX=%HB_INSTALL_PREFIX% if "%_HB_INSTALL_PREFIX%" == "" set _HB_INSTALL_PREFIX=..\.. set _HB_LIB_INSTALL=%HB_LIB_INSTALL% diff --git a/harbour/contrib/hbodbc/Makefile b/harbour/contrib/hbodbc/Makefile index 123405ea00..f0d0e3abb0 100644 --- a/harbour/contrib/hbodbc/Makefile +++ b/harbour/contrib/hbodbc/Makefile @@ -3,6 +3,7 @@ # ifneq ($(HB_WITHOUT_ODBC),yes) +ifneq ($(HB_COMPILER),rsxnt) ROOT = ../../ @@ -21,3 +22,4 @@ LIBNAME=hbodbc include $(TOP)$(ROOT)config/lib.cf endif +endif diff --git a/harbour/contrib/hbpgsql/make_b32.bat b/harbour/contrib/hbpgsql/make_b32.bat index d835bbc07e..7aa2252d1c 100644 --- a/harbour/contrib/hbpgsql/make_b32.bat +++ b/harbour/contrib/hbpgsql/make_b32.bat @@ -25,6 +25,8 @@ call ..\mtpl_b32.bat %1 %2 %3 %4 %5 %6 %7 %8 %9 rem --------------------------------------------------------------- +if "_HB_DLL_DIR" == "" goto POST_EXIT + set _HB_INSTALL_PREFIX=%HB_INSTALL_PREFIX% if "%_HB_INSTALL_PREFIX%" == "" set _HB_INSTALL_PREFIX=..\.. set _HB_LIB_INSTALL=%HB_LIB_INSTALL% diff --git a/harbour/contrib/hbpgsql/make_vc.bat b/harbour/contrib/hbpgsql/make_vc.bat index 949dcc081b..5bf61ed187 100644 --- a/harbour/contrib/hbpgsql/make_vc.bat +++ b/harbour/contrib/hbpgsql/make_vc.bat @@ -25,6 +25,8 @@ call ..\mtpl_vc.bat %1 %2 %3 %4 %5 %6 %7 %8 %9 rem --------------------------------------------------------------- +if "_HB_DLL_DIR" == "" goto POST_EXIT + set _HB_INSTALL_PREFIX=%HB_INSTALL_PREFIX% if "%_HB_INSTALL_PREFIX%" == "" set _HB_INSTALL_PREFIX=..\.. set _HB_LIB_INSTALL=%HB_LIB_INSTALL% diff --git a/harbour/contrib/hbw32/Makefile b/harbour/contrib/hbw32/Makefile index 798557c5a7..d59fa42a12 100644 --- a/harbour/contrib/hbw32/Makefile +++ b/harbour/contrib/hbw32/Makefile @@ -3,6 +3,7 @@ # ifeq ($(HB_ARCHITECTURE),w32) +ifneq ($(HB_COMPILER),rsxnt) ROOT = ../../ @@ -26,3 +27,4 @@ LIBNAME=hbw32 include $(TOP)$(ROOT)config/lib.cf endif +endif diff --git a/harbour/contrib/rddado/Makefile b/harbour/contrib/rddado/Makefile index 51a6447e02..8c9efcc589 100644 --- a/harbour/contrib/rddado/Makefile +++ b/harbour/contrib/rddado/Makefile @@ -2,6 +2,9 @@ # $Id$ # +# Needs hbw32 and hbodbc, but these won't build with rsxnt +ifneq ($(HB_COMPILER),rsxnt) + ROOT = ../../ PRG_SOURCES= \ @@ -13,3 +16,5 @@ PRG_HEADERS=\ LIBNAME=rddado include $(TOP)$(ROOT)config/lib.cf + +endif diff --git a/harbour/contrib/rddads/make_b32.bat b/harbour/contrib/rddads/make_b32.bat index 52f38b1023..98c013ea6d 100644 --- a/harbour/contrib/rddads/make_b32.bat +++ b/harbour/contrib/rddads/make_b32.bat @@ -29,6 +29,8 @@ call ..\mtpl_b32.bat %1 %2 %3 %4 %5 %6 %7 %8 %9 rem --------------------------------------------------------------- +if "_HB_DLL_DIR" == "" goto POST_EXIT + set _HB_INSTALL_PREFIX=%HB_INSTALL_PREFIX% if "%_HB_INSTALL_PREFIX%" == "" set _HB_INSTALL_PREFIX=..\.. set _HB_LIB_INSTALL=%HB_LIB_INSTALL% diff --git a/harbour/contrib/rddads/make_vc.bat b/harbour/contrib/rddads/make_vc.bat index 7fe8ae92e2..891426ebd1 100644 --- a/harbour/contrib/rddads/make_vc.bat +++ b/harbour/contrib/rddads/make_vc.bat @@ -29,6 +29,8 @@ call ..\mtpl_vc.bat %1 %2 %3 %4 %5 %6 %7 %8 %9 rem --------------------------------------------------------------- +if "_HB_DLL_DIR" == "" goto POST_EXIT + set _HB_INSTALL_PREFIX=%HB_INSTALL_PREFIX% if "%_HB_INSTALL_PREFIX%" == "" set _HB_INSTALL_PREFIX=..\.. set _HB_LIB_INSTALL=%HB_LIB_INSTALL%