From 67f4a4070c301e81ff62968cc51e20b1dc6f12d7 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sat, 1 Dec 2007 02:08:48 +0000 Subject: [PATCH] 2007-12-01 03:08 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) - contrib/hgf + contrib/hbgf * contrib/hbwhat32/Makefile * contrib/hbwhat32/common.mak * contrib/hbfbird/test/bld_b32.bat * contrib/hbapollo/test/bld.bat * contrib/hbpgsql/tests/bld_b32.bat * contrib/hbfimage/test/bld_b32.bat * contrib/hbgd/tests/bldtest.bat * contrib/hbgf/os2pm/Makefile * contrib/hbgf/tests/bld_b32.bat * contrib/hbgf/win32/common.mak * contrib/hbgf/gtk/Makefile * contrib/hbrddado/common.mak * contrib/hbrddado/Makefile * contrib/hbbmcdx/common.mak * contrib/hbbmcdx/Makefile * contrib/hbgtwvg/common.mak * contrib/hbgtwvg/Makefile * contrib/hbrddads/common.mak * contrib/hbrddads/Makefile ! Some fixes to previous changes. ; Here is the final summary of contrib lib renames: ----------- ------------- ------------- Old Old New DIR LIBNAME DIR & LIBNAME ----------- ------------- ------------- adordd adordd hbrddado apollo apollo hbapollo bmdbfcdx bmdbfcdx hbbmcdx btree hbbtree hbbtree directx hbwin32ddrw hbw32ddr firebird firebird hbfbird freeimage hbfreeimage hbfimage gd hbgd hbgd gtwvg gtwvg hbgtwvg hbzlib hbziparch hbziparch htmllib html (DELETED) libct ct hbct libgt gt hbgt libmisc hbmisc hbmisc libnf nf hbnf msql msql hbmsql mysql hbmysql hbmysql odbc hbodbc hbodbc ole hbole hbole pdflib hbpdflib (DELETED) pgsql hbpg hbpgsql rdd_ads rddads hbrddads samples samples hbclipsm telepath telepath hbtpathy tip tip hbtip what32 what32 hbwhat32 win32 hbwin32 hbw32 xhb xhb xhb hgf hgf* hbgf* --- harbour/ChangeLog | 59 +++++++++++++++++++ harbour/contrib/hbapollo/test/bld.bat | 2 +- harbour/contrib/hbbmcdx/Makefile | 2 +- harbour/contrib/hbbmcdx/common.mak | 2 +- harbour/contrib/hbfbird/test/bld_b32.bat | 4 +- harbour/contrib/hbfimage/test/bld_b32.bat | 4 +- harbour/contrib/hbgd/tests/bldtest.bat | 2 +- harbour/contrib/{hgf => hbgf}/gtk/Makefile | 2 +- harbour/contrib/{hgf => hbgf}/gtk/button.prg | 0 harbour/contrib/{hgf => hbgf}/gtk/creabutt.c | 0 harbour/contrib/{hgf => hbgf}/gtk/creamenu.c | 0 harbour/contrib/{hgf => hbgf}/gtk/creawin.c | 0 harbour/contrib/{hgf => hbgf}/gtk/dispatch.c | 0 harbour/contrib/{hgf => hbgf}/gtk/form.prg | 0 harbour/contrib/{hgf => hbgf}/gtk/general.c | 0 harbour/contrib/{hgf => hbgf}/gtk/harbgtk.ch | 0 harbour/contrib/{hgf => hbgf}/gtk/harbgtk.h | 0 harbour/contrib/{hgf => hbgf}/gtk/mainlgtk.c | 0 harbour/contrib/{hgf => hbgf}/gtk/menu.prg | 0 .../contrib/{hgf => hbgf}/gtk/menuitem.prg | 0 harbour/contrib/{hgf => hbgf}/gtk/msginfo.c | 0 harbour/contrib/{hgf => hbgf}/gtk/shared.ch | 0 harbour/contrib/{hgf => hbgf}/gtk/winctrl.prg | 0 harbour/contrib/{hgf => hbgf}/os2pm/Makefile | 2 +- .../contrib/{hgf => hbgf}/os2pm/button.prg | 0 harbour/contrib/{hgf => hbgf}/os2pm/edit.prg | 0 harbour/contrib/{hgf => hbgf}/os2pm/os2pm.c | 0 harbour/contrib/{hgf => hbgf}/os2pm/os2pm.ch | 0 harbour/contrib/{hgf => hbgf}/os2pm/tform.prg | 0 harbour/contrib/{hgf => hbgf}/os2pm/tmenu.prg | 0 .../contrib/{hgf => hbgf}/os2pm/tmenuitm.prg | 0 .../contrib/{hgf => hbgf}/os2pm/winctrl.prg | 0 .../contrib/{hgf => hbgf}/tests/bld_b32.bat | 4 +- harbour/contrib/{hgf => hbgf}/tests/form2.prg | 0 harbour/contrib/{hgf => hbgf}/tests/form3.hbf | 0 harbour/contrib/{hgf => hbgf}/tests/form3.prg | 0 .../contrib/{hgf => hbgf}/tests/form3res.prg | 0 .../contrib/{hgf => hbgf}/tests/formtext.prg | 0 .../contrib/{hgf => hbgf}/tests/testctrl.prg | 0 .../contrib/{hgf => hbgf}/tests/testform.prg | 0 .../contrib/{hgf => hbgf}/win32/button.prg | 0 .../contrib/{hgf => hbgf}/win32/common.mak | 2 +- harbour/contrib/{hgf => hbgf}/win32/edit.prg | 0 harbour/contrib/{hgf => hbgf}/win32/form.prg | 0 .../contrib/{hgf => hbgf}/win32/make_b32.bat | 0 .../contrib/{hgf => hbgf}/win32/make_vc.bat | 0 harbour/contrib/{hgf => hbgf}/win32/menu.prg | 0 .../contrib/{hgf => hbgf}/win32/menuitem.prg | 0 harbour/contrib/{hgf => hbgf}/win32/win32.c | 0 harbour/contrib/{hgf => hbgf}/win32/win32.ch | 0 .../contrib/{hgf => hbgf}/win32/winctrl.prg | 0 harbour/contrib/hbgtwvg/Makefile | 2 +- harbour/contrib/hbgtwvg/common.mak | 2 +- harbour/contrib/hbpgsql/tests/bld_b32.bat | 4 +- harbour/contrib/hbrddado/Makefile | 2 +- harbour/contrib/hbrddado/common.mak | 2 +- harbour/contrib/hbrddads/Makefile | 2 +- harbour/contrib/hbrddads/common.mak | 2 +- harbour/contrib/hbwhat32/Makefile | 2 +- harbour/contrib/hbwhat32/common.mak | 2 +- 60 files changed, 82 insertions(+), 23 deletions(-) rename harbour/contrib/{hgf => hbgf}/gtk/Makefile (94%) rename harbour/contrib/{hgf => hbgf}/gtk/button.prg (100%) rename harbour/contrib/{hgf => hbgf}/gtk/creabutt.c (100%) rename harbour/contrib/{hgf => hbgf}/gtk/creamenu.c (100%) rename harbour/contrib/{hgf => hbgf}/gtk/creawin.c (100%) rename harbour/contrib/{hgf => hbgf}/gtk/dispatch.c (100%) rename harbour/contrib/{hgf => hbgf}/gtk/form.prg (100%) rename harbour/contrib/{hgf => hbgf}/gtk/general.c (100%) rename harbour/contrib/{hgf => hbgf}/gtk/harbgtk.ch (100%) rename harbour/contrib/{hgf => hbgf}/gtk/harbgtk.h (100%) rename harbour/contrib/{hgf => hbgf}/gtk/mainlgtk.c (100%) rename harbour/contrib/{hgf => hbgf}/gtk/menu.prg (100%) rename harbour/contrib/{hgf => hbgf}/gtk/menuitem.prg (100%) rename harbour/contrib/{hgf => hbgf}/gtk/msginfo.c (100%) rename harbour/contrib/{hgf => hbgf}/gtk/shared.ch (100%) rename harbour/contrib/{hgf => hbgf}/gtk/winctrl.prg (100%) rename harbour/contrib/{hgf => hbgf}/os2pm/Makefile (91%) rename harbour/contrib/{hgf => hbgf}/os2pm/button.prg (100%) rename harbour/contrib/{hgf => hbgf}/os2pm/edit.prg (100%) rename harbour/contrib/{hgf => hbgf}/os2pm/os2pm.c (100%) rename harbour/contrib/{hgf => hbgf}/os2pm/os2pm.ch (100%) rename harbour/contrib/{hgf => hbgf}/os2pm/tform.prg (100%) rename harbour/contrib/{hgf => hbgf}/os2pm/tmenu.prg (100%) rename harbour/contrib/{hgf => hbgf}/os2pm/tmenuitm.prg (100%) rename harbour/contrib/{hgf => hbgf}/os2pm/winctrl.prg (100%) rename harbour/contrib/{hgf => hbgf}/tests/bld_b32.bat (91%) rename harbour/contrib/{hgf => hbgf}/tests/form2.prg (100%) rename harbour/contrib/{hgf => hbgf}/tests/form3.hbf (100%) rename harbour/contrib/{hgf => hbgf}/tests/form3.prg (100%) rename harbour/contrib/{hgf => hbgf}/tests/form3res.prg (100%) rename harbour/contrib/{hgf => hbgf}/tests/formtext.prg (100%) rename harbour/contrib/{hgf => hbgf}/tests/testctrl.prg (100%) rename harbour/contrib/{hgf => hbgf}/tests/testform.prg (100%) rename harbour/contrib/{hgf => hbgf}/win32/button.prg (100%) rename harbour/contrib/{hgf => hbgf}/win32/common.mak (94%) rename harbour/contrib/{hgf => hbgf}/win32/edit.prg (100%) rename harbour/contrib/{hgf => hbgf}/win32/form.prg (100%) rename harbour/contrib/{hgf => hbgf}/win32/make_b32.bat (100%) rename harbour/contrib/{hgf => hbgf}/win32/make_vc.bat (100%) rename harbour/contrib/{hgf => hbgf}/win32/menu.prg (100%) rename harbour/contrib/{hgf => hbgf}/win32/menuitem.prg (100%) rename harbour/contrib/{hgf => hbgf}/win32/win32.c (100%) rename harbour/contrib/{hgf => hbgf}/win32/win32.ch (100%) rename harbour/contrib/{hgf => hbgf}/win32/winctrl.prg (100%) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index d5ce39c9e9..1c25da0125 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,65 @@ 2002-12-01 13:30 UTC+0100 Foo Bar */ +2007-12-01 03:08 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) + - contrib/hgf + + contrib/hbgf + * contrib/hbwhat32/Makefile + * contrib/hbwhat32/common.mak + * contrib/hbfbird/test/bld_b32.bat + * contrib/hbapollo/test/bld.bat + * contrib/hbpgsql/tests/bld_b32.bat + * contrib/hbfimage/test/bld_b32.bat + * contrib/hbgd/tests/bldtest.bat + * contrib/hbgf/os2pm/Makefile + * contrib/hbgf/tests/bld_b32.bat + * contrib/hbgf/win32/common.mak + * contrib/hbgf/gtk/Makefile + * contrib/hbrddado/common.mak + * contrib/hbrddado/Makefile + * contrib/hbbmcdx/common.mak + * contrib/hbbmcdx/Makefile + * contrib/hbgtwvg/common.mak + * contrib/hbgtwvg/Makefile + * contrib/hbrddads/common.mak + * contrib/hbrddads/Makefile + ! Some fixes to previous changes. + + ; Here is the final summary of contrib lib renames: + ----------- ------------- ------------- + Old Old New + DIR LIBNAME DIR & LIBNAME + ----------- ------------- ------------- + adordd adordd hbrddado + apollo apollo hbapollo + bmdbfcdx bmdbfcdx hbbmcdx + btree hbbtree hbbtree + directx hbwin32ddrw hbw32ddr + firebird firebird hbfbird + freeimage hbfreeimage hbfimage + gd hbgd hbgd + gtwvg gtwvg hbgtwvg + hbzlib hbziparch hbziparch + htmllib html (DELETED) + libct ct hbct + libgt gt hbgt + libmisc hbmisc hbmisc + libnf nf hbnf + msql msql hbmsql + mysql hbmysql hbmysql + odbc hbodbc hbodbc + ole hbole hbole + pdflib hbpdflib (DELETED) + pgsql hbpg hbpgsql + rdd_ads rddads hbrddads + samples samples hbclipsm + telepath telepath hbtpathy + tip tip hbtip + what32 what32 hbwhat32 + win32 hbwin32 hbw32 + xhb xhb xhb + hgf hgf* hbgf* + 2007-12-01 02:55 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * contrib/make_b32_all.bat * contrib/make_vc_all.bat diff --git a/harbour/contrib/hbapollo/test/bld.bat b/harbour/contrib/hbapollo/test/bld.bat index c0174be86b..d56845001e 100644 --- a/harbour/contrib/hbapollo/test/bld.bat +++ b/harbour/contrib/hbapollo/test/bld.bat @@ -173,7 +173,7 @@ if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=..\..\..\include\ if "%HB_GT_LIB%" == "" set _HB_GT_LIB=gtwin - if "%HB_COMPILER%" == "bcc32" bcc32 -O2 -d %CFLAGS% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% %1.c debug.lib vm.lib rtl.lib %_HB_GT_LIB%.lib lang.lib rdd.lib macro.lib pp.lib dbfntx.lib dbfcdx.lib common.lib apollo.lib sde60.lib + if "%HB_COMPILER%" == "bcc32" bcc32 -O2 -d %CFLAGS% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% %1.c debug.lib vm.lib rtl.lib %_HB_GT_LIB%.lib lang.lib rdd.lib macro.lib pp.lib dbfntx.lib dbfcdx.lib common.lib hbapollo.lib sde60.lib if "%HB_COMPILER%" == "gcc" gcc %1.c -o%1.exe %CFLAGS% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% -ldebug -lvm -lrtl -l%_HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon if "%HB_COMPILER%" == "mingw32" gcc %1.c -o%1.exe %CFLAGS% -mno-cygwin -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% -ldebug -lvm -lrtl -l%_HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon if "%HB_COMPILER%" == "rsxnt" gcc %1.c -Zwin32 %CFLAGS% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% -ldebug -lvm -lrtl -l%_HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon diff --git a/harbour/contrib/hbbmcdx/Makefile b/harbour/contrib/hbbmcdx/Makefile index 8d8f8067cc..3fea8982b1 100644 --- a/harbour/contrib/hbbmcdx/Makefile +++ b/harbour/contrib/hbbmcdx/Makefile @@ -8,6 +8,6 @@ C_SOURCES=\ bmdbfcdx1.c \ bmsixcdx1.c -LIBNAME=bmdbfcdx +LIBNAME=hbbmcdx include $(TOP)$(ROOT)config/lib.cf diff --git a/harbour/contrib/hbbmcdx/common.mak b/harbour/contrib/hbbmcdx/common.mak index 7ca1fd4b53..f8407dfda0 100644 --- a/harbour/contrib/hbbmcdx/common.mak +++ b/harbour/contrib/hbbmcdx/common.mak @@ -2,7 +2,7 @@ # $Id$ # -LIBNAME = bmdbfcdx +LIBNAME = hbbmcdx LIB_PATH = $(LIB_DIR)\$(LIBNAME)$(LIBEXT) diff --git a/harbour/contrib/hbfbird/test/bld_b32.bat b/harbour/contrib/hbfbird/test/bld_b32.bat index bcf79eccc4..bc9eb6ca94 100644 --- a/harbour/contrib/hbfbird/test/bld_b32.bat +++ b/harbour/contrib/hbfbird/test/bld_b32.bat @@ -37,10 +37,10 @@ echo %hdir%\lib\pp.lib + >> bld_b32.mak echo %hdir%\lib\hbsix.lib + >> bld_b32.mak echo %hdir%\lib\dbffpt.lib + >> bld_b32.mak echo %hdir%\lib\fbclient.lib + >> bld_b32.mak -echo %hdir%\lib\firebird.lib + >> bld_b32.mak +echo %hdir%\lib\hbfbird.lib + >> bld_b32.mak rem Uncomment these two lines to use Advantage RDD -rem echo %hdir%\lib\rddads.lib + >> bld_b32.mak +rem echo %hdir%\lib\hbrddads.lib + >> bld_b32.mak rem echo %hdir%\lib\ace32.lib + >> bld_b32.mak echo cw32.lib + >> bld_b32.mak diff --git a/harbour/contrib/hbfimage/test/bld_b32.bat b/harbour/contrib/hbfimage/test/bld_b32.bat index 830467e7d1..d3f49cf88e 100644 --- a/harbour/contrib/hbfimage/test/bld_b32.bat +++ b/harbour/contrib/hbfimage/test/bld_b32.bat @@ -36,11 +36,11 @@ echo %hdir%\lib\common.lib + >> bld_b32.mak echo %hdir%\lib\pp.lib + >> bld_b32.mak echo %hdir%\lib\hbsix.lib + >> bld_b32.mak echo %hdir%\lib\dbffpt.lib + >> bld_b32.mak -echo %hdir%\lib\fi_lib.lib + >> bld_b32.mak +echo %hdir%\lib\hbfimage.lib + >> bld_b32.mak echo %hdir%\lib\freeimage.lib + >> bld_b32.mak rem Uncomment these two lines to use Advantage RDD -rem echo %hdir%\lib\rddads.lib + >> bld_b32.mak +rem echo %hdir%\lib\hbrddads.lib + >> bld_b32.mak rem echo %hdir%\lib\ace32.lib + >> bld_b32.mak echo cw32.lib + >> bld_b32.mak diff --git a/harbour/contrib/hbgd/tests/bldtest.bat b/harbour/contrib/hbgd/tests/bldtest.bat index b9ef3b1116..7489e52e35 100644 --- a/harbour/contrib/hbgd/tests/bldtest.bat +++ b/harbour/contrib/hbgd/tests/bldtest.bat @@ -32,7 +32,7 @@ if %HB_COMPILER%.==. set HB_COMPILER=bcc32 SET HB_BIN_INSTALL=%HB_INSTALL%\bin set HB_INC_INSTALL=..;%HB_INSTALL%\include set HB_LIB_INSTALL=%HB_INSTALL%\lib -set HB_USER_LIBS=%HB_LIB_INSTALL%\hbgd.lib %HB_LIB_INSTALL%\libbgd.lib %HB_LIB_INSTALL%\libct.lib +set HB_USER_LIBS=%HB_LIB_INSTALL%\hbgd.lib %HB_LIB_INSTALL%\libbgd.lib %HB_LIB_INSTALL%\hbct.lib echo. echo.BldTest.bat - /? or /h to display options diff --git a/harbour/contrib/hgf/gtk/Makefile b/harbour/contrib/hbgf/gtk/Makefile similarity index 94% rename from harbour/contrib/hgf/gtk/Makefile rename to harbour/contrib/hbgf/gtk/Makefile index d326f8edb7..6a7cb82f66 100644 --- a/harbour/contrib/hgf/gtk/Makefile +++ b/harbour/contrib/hbgf/gtk/Makefile @@ -21,7 +21,7 @@ PRG_SOURCES=\ winctrl.prg \ -LIBNAME=hbgtk +LIBNAME=hbgfgtk include $(TOP)$(ROOT)config/lib.cf diff --git a/harbour/contrib/hgf/gtk/button.prg b/harbour/contrib/hbgf/gtk/button.prg similarity index 100% rename from harbour/contrib/hgf/gtk/button.prg rename to harbour/contrib/hbgf/gtk/button.prg diff --git a/harbour/contrib/hgf/gtk/creabutt.c b/harbour/contrib/hbgf/gtk/creabutt.c similarity index 100% rename from harbour/contrib/hgf/gtk/creabutt.c rename to harbour/contrib/hbgf/gtk/creabutt.c diff --git a/harbour/contrib/hgf/gtk/creamenu.c b/harbour/contrib/hbgf/gtk/creamenu.c similarity index 100% rename from harbour/contrib/hgf/gtk/creamenu.c rename to harbour/contrib/hbgf/gtk/creamenu.c diff --git a/harbour/contrib/hgf/gtk/creawin.c b/harbour/contrib/hbgf/gtk/creawin.c similarity index 100% rename from harbour/contrib/hgf/gtk/creawin.c rename to harbour/contrib/hbgf/gtk/creawin.c diff --git a/harbour/contrib/hgf/gtk/dispatch.c b/harbour/contrib/hbgf/gtk/dispatch.c similarity index 100% rename from harbour/contrib/hgf/gtk/dispatch.c rename to harbour/contrib/hbgf/gtk/dispatch.c diff --git a/harbour/contrib/hgf/gtk/form.prg b/harbour/contrib/hbgf/gtk/form.prg similarity index 100% rename from harbour/contrib/hgf/gtk/form.prg rename to harbour/contrib/hbgf/gtk/form.prg diff --git a/harbour/contrib/hgf/gtk/general.c b/harbour/contrib/hbgf/gtk/general.c similarity index 100% rename from harbour/contrib/hgf/gtk/general.c rename to harbour/contrib/hbgf/gtk/general.c diff --git a/harbour/contrib/hgf/gtk/harbgtk.ch b/harbour/contrib/hbgf/gtk/harbgtk.ch similarity index 100% rename from harbour/contrib/hgf/gtk/harbgtk.ch rename to harbour/contrib/hbgf/gtk/harbgtk.ch diff --git a/harbour/contrib/hgf/gtk/harbgtk.h b/harbour/contrib/hbgf/gtk/harbgtk.h similarity index 100% rename from harbour/contrib/hgf/gtk/harbgtk.h rename to harbour/contrib/hbgf/gtk/harbgtk.h diff --git a/harbour/contrib/hgf/gtk/mainlgtk.c b/harbour/contrib/hbgf/gtk/mainlgtk.c similarity index 100% rename from harbour/contrib/hgf/gtk/mainlgtk.c rename to harbour/contrib/hbgf/gtk/mainlgtk.c diff --git a/harbour/contrib/hgf/gtk/menu.prg b/harbour/contrib/hbgf/gtk/menu.prg similarity index 100% rename from harbour/contrib/hgf/gtk/menu.prg rename to harbour/contrib/hbgf/gtk/menu.prg diff --git a/harbour/contrib/hgf/gtk/menuitem.prg b/harbour/contrib/hbgf/gtk/menuitem.prg similarity index 100% rename from harbour/contrib/hgf/gtk/menuitem.prg rename to harbour/contrib/hbgf/gtk/menuitem.prg diff --git a/harbour/contrib/hgf/gtk/msginfo.c b/harbour/contrib/hbgf/gtk/msginfo.c similarity index 100% rename from harbour/contrib/hgf/gtk/msginfo.c rename to harbour/contrib/hbgf/gtk/msginfo.c diff --git a/harbour/contrib/hgf/gtk/shared.ch b/harbour/contrib/hbgf/gtk/shared.ch similarity index 100% rename from harbour/contrib/hgf/gtk/shared.ch rename to harbour/contrib/hbgf/gtk/shared.ch diff --git a/harbour/contrib/hgf/gtk/winctrl.prg b/harbour/contrib/hbgf/gtk/winctrl.prg similarity index 100% rename from harbour/contrib/hgf/gtk/winctrl.prg rename to harbour/contrib/hbgf/gtk/winctrl.prg diff --git a/harbour/contrib/hgf/os2pm/Makefile b/harbour/contrib/hbgf/os2pm/Makefile similarity index 91% rename from harbour/contrib/hgf/os2pm/Makefile rename to harbour/contrib/hbgf/os2pm/Makefile index 8100ee271c..f7644df190 100644 --- a/harbour/contrib/hgf/os2pm/Makefile +++ b/harbour/contrib/hbgf/os2pm/Makefile @@ -16,7 +16,7 @@ PRG_SOURCES=\ edit.prg \ -LIBNAME=os2pm +LIBNAME=hbgfos2pm include $(TOP)$(ROOT)config/lib.cf diff --git a/harbour/contrib/hgf/os2pm/button.prg b/harbour/contrib/hbgf/os2pm/button.prg similarity index 100% rename from harbour/contrib/hgf/os2pm/button.prg rename to harbour/contrib/hbgf/os2pm/button.prg diff --git a/harbour/contrib/hgf/os2pm/edit.prg b/harbour/contrib/hbgf/os2pm/edit.prg similarity index 100% rename from harbour/contrib/hgf/os2pm/edit.prg rename to harbour/contrib/hbgf/os2pm/edit.prg diff --git a/harbour/contrib/hgf/os2pm/os2pm.c b/harbour/contrib/hbgf/os2pm/os2pm.c similarity index 100% rename from harbour/contrib/hgf/os2pm/os2pm.c rename to harbour/contrib/hbgf/os2pm/os2pm.c diff --git a/harbour/contrib/hgf/os2pm/os2pm.ch b/harbour/contrib/hbgf/os2pm/os2pm.ch similarity index 100% rename from harbour/contrib/hgf/os2pm/os2pm.ch rename to harbour/contrib/hbgf/os2pm/os2pm.ch diff --git a/harbour/contrib/hgf/os2pm/tform.prg b/harbour/contrib/hbgf/os2pm/tform.prg similarity index 100% rename from harbour/contrib/hgf/os2pm/tform.prg rename to harbour/contrib/hbgf/os2pm/tform.prg diff --git a/harbour/contrib/hgf/os2pm/tmenu.prg b/harbour/contrib/hbgf/os2pm/tmenu.prg similarity index 100% rename from harbour/contrib/hgf/os2pm/tmenu.prg rename to harbour/contrib/hbgf/os2pm/tmenu.prg diff --git a/harbour/contrib/hgf/os2pm/tmenuitm.prg b/harbour/contrib/hbgf/os2pm/tmenuitm.prg similarity index 100% rename from harbour/contrib/hgf/os2pm/tmenuitm.prg rename to harbour/contrib/hbgf/os2pm/tmenuitm.prg diff --git a/harbour/contrib/hgf/os2pm/winctrl.prg b/harbour/contrib/hbgf/os2pm/winctrl.prg similarity index 100% rename from harbour/contrib/hgf/os2pm/winctrl.prg rename to harbour/contrib/hbgf/os2pm/winctrl.prg diff --git a/harbour/contrib/hgf/tests/bld_b32.bat b/harbour/contrib/hbgf/tests/bld_b32.bat similarity index 91% rename from harbour/contrib/hgf/tests/bld_b32.bat rename to harbour/contrib/hbgf/tests/bld_b32.bat index e29c3baee6..8667e53b95 100644 --- a/harbour/contrib/hgf/tests/bld_b32.bat +++ b/harbour/contrib/hbgf/tests/bld_b32.bat @@ -36,10 +36,10 @@ echo %hdir%\lib\common.lib + >> bld_b32.mak echo %hdir%\lib\pp.lib + >> bld_b32.mak echo %hdir%\lib\hbsix.lib + >> bld_b32.mak echo %hdir%\lib\dbffpt.lib + >> bld_b32.mak -echo %hdir%\lib\hgfwin32.lib + >> bld_b32.mak +echo %hdir%\lib\hbgfw32.lib + >> bld_b32.mak rem Uncomment these two lines to use Advantage RDD -rem echo %hdir%\lib\rddads.lib + >> bld_b32.mak +rem echo %hdir%\lib\hbrddads.lib + >> bld_b32.mak rem echo %hdir%\lib\ace32.lib + >> bld_b32.mak echo cw32.lib + >> bld_b32.mak diff --git a/harbour/contrib/hgf/tests/form2.prg b/harbour/contrib/hbgf/tests/form2.prg similarity index 100% rename from harbour/contrib/hgf/tests/form2.prg rename to harbour/contrib/hbgf/tests/form2.prg diff --git a/harbour/contrib/hgf/tests/form3.hbf b/harbour/contrib/hbgf/tests/form3.hbf similarity index 100% rename from harbour/contrib/hgf/tests/form3.hbf rename to harbour/contrib/hbgf/tests/form3.hbf diff --git a/harbour/contrib/hgf/tests/form3.prg b/harbour/contrib/hbgf/tests/form3.prg similarity index 100% rename from harbour/contrib/hgf/tests/form3.prg rename to harbour/contrib/hbgf/tests/form3.prg diff --git a/harbour/contrib/hgf/tests/form3res.prg b/harbour/contrib/hbgf/tests/form3res.prg similarity index 100% rename from harbour/contrib/hgf/tests/form3res.prg rename to harbour/contrib/hbgf/tests/form3res.prg diff --git a/harbour/contrib/hgf/tests/formtext.prg b/harbour/contrib/hbgf/tests/formtext.prg similarity index 100% rename from harbour/contrib/hgf/tests/formtext.prg rename to harbour/contrib/hbgf/tests/formtext.prg diff --git a/harbour/contrib/hgf/tests/testctrl.prg b/harbour/contrib/hbgf/tests/testctrl.prg similarity index 100% rename from harbour/contrib/hgf/tests/testctrl.prg rename to harbour/contrib/hbgf/tests/testctrl.prg diff --git a/harbour/contrib/hgf/tests/testform.prg b/harbour/contrib/hbgf/tests/testform.prg similarity index 100% rename from harbour/contrib/hgf/tests/testform.prg rename to harbour/contrib/hbgf/tests/testform.prg diff --git a/harbour/contrib/hgf/win32/button.prg b/harbour/contrib/hbgf/win32/button.prg similarity index 100% rename from harbour/contrib/hgf/win32/button.prg rename to harbour/contrib/hbgf/win32/button.prg diff --git a/harbour/contrib/hgf/win32/common.mak b/harbour/contrib/hbgf/win32/common.mak similarity index 94% rename from harbour/contrib/hgf/win32/common.mak rename to harbour/contrib/hbgf/win32/common.mak index 827a975789..7cab8ed68d 100644 --- a/harbour/contrib/hgf/win32/common.mak +++ b/harbour/contrib/hbgf/win32/common.mak @@ -2,7 +2,7 @@ # $Id$ # -LIBNAME = hgfwin32 +LIBNAME = hbgfw32 LIB_PATH = $(LIB_DIR)\$(LIBNAME)$(LIBEXT) diff --git a/harbour/contrib/hgf/win32/edit.prg b/harbour/contrib/hbgf/win32/edit.prg similarity index 100% rename from harbour/contrib/hgf/win32/edit.prg rename to harbour/contrib/hbgf/win32/edit.prg diff --git a/harbour/contrib/hgf/win32/form.prg b/harbour/contrib/hbgf/win32/form.prg similarity index 100% rename from harbour/contrib/hgf/win32/form.prg rename to harbour/contrib/hbgf/win32/form.prg diff --git a/harbour/contrib/hgf/win32/make_b32.bat b/harbour/contrib/hbgf/win32/make_b32.bat similarity index 100% rename from harbour/contrib/hgf/win32/make_b32.bat rename to harbour/contrib/hbgf/win32/make_b32.bat diff --git a/harbour/contrib/hgf/win32/make_vc.bat b/harbour/contrib/hbgf/win32/make_vc.bat similarity index 100% rename from harbour/contrib/hgf/win32/make_vc.bat rename to harbour/contrib/hbgf/win32/make_vc.bat diff --git a/harbour/contrib/hgf/win32/menu.prg b/harbour/contrib/hbgf/win32/menu.prg similarity index 100% rename from harbour/contrib/hgf/win32/menu.prg rename to harbour/contrib/hbgf/win32/menu.prg diff --git a/harbour/contrib/hgf/win32/menuitem.prg b/harbour/contrib/hbgf/win32/menuitem.prg similarity index 100% rename from harbour/contrib/hgf/win32/menuitem.prg rename to harbour/contrib/hbgf/win32/menuitem.prg diff --git a/harbour/contrib/hgf/win32/win32.c b/harbour/contrib/hbgf/win32/win32.c similarity index 100% rename from harbour/contrib/hgf/win32/win32.c rename to harbour/contrib/hbgf/win32/win32.c diff --git a/harbour/contrib/hgf/win32/win32.ch b/harbour/contrib/hbgf/win32/win32.ch similarity index 100% rename from harbour/contrib/hgf/win32/win32.ch rename to harbour/contrib/hbgf/win32/win32.ch diff --git a/harbour/contrib/hgf/win32/winctrl.prg b/harbour/contrib/hbgf/win32/winctrl.prg similarity index 100% rename from harbour/contrib/hgf/win32/winctrl.prg rename to harbour/contrib/hbgf/win32/winctrl.prg diff --git a/harbour/contrib/hbgtwvg/Makefile b/harbour/contrib/hbgtwvg/Makefile index 78b2fafda7..a8754dce6a 100644 --- a/harbour/contrib/hbgtwvg/Makefile +++ b/harbour/contrib/hbgtwvg/Makefile @@ -19,6 +19,6 @@ PRG_SOURCES=\ PRG_HEADERS=\ wvtwin.ch \ -LIBNAME=gtwvg +LIBNAME=hbgtwvg include $(TOP)$(ROOT)config/lib.cf diff --git a/harbour/contrib/hbgtwvg/common.mak b/harbour/contrib/hbgtwvg/common.mak index 03645fd34e..03edd51258 100644 --- a/harbour/contrib/hbgtwvg/common.mak +++ b/harbour/contrib/hbgtwvg/common.mak @@ -2,7 +2,7 @@ # $Id$ # -LIBNAME = gtwvg +LIBNAME = hbgtwvg LIB_PATH = $(LIB_DIR)\$(LIBNAME)$(LIBEXT) diff --git a/harbour/contrib/hbpgsql/tests/bld_b32.bat b/harbour/contrib/hbpgsql/tests/bld_b32.bat index b6ea82984e..4b6164a391 100644 --- a/harbour/contrib/hbpgsql/tests/bld_b32.bat +++ b/harbour/contrib/hbpgsql/tests/bld_b32.bat @@ -37,10 +37,10 @@ echo %hdir%\lib\pp.lib + >> bld_b32.mak echo %hdir%\lib\hbsix.lib + >> bld_b32.mak echo %hdir%\lib\dbffpt.lib + >> bld_b32.mak echo %hdir%\lib\postgres.lib + >> bld_b32.mak -echo %hdir%\lib\hbpg.lib + >> bld_b32.mak +echo %hdir%\lib\hbpgsql.lib + >> bld_b32.mak rem Uncomment these two lines to use Advantage RDD -rem echo %hdir%\lib\rddads.lib + >> bld_b32.mak +rem echo %hdir%\lib\hbrddads.lib + >> bld_b32.mak rem echo %hdir%\lib\ace32.lib + >> bld_b32.mak echo cw32.lib + >> bld_b32.mak diff --git a/harbour/contrib/hbrddado/Makefile b/harbour/contrib/hbrddado/Makefile index 71274bd54a..a1d252c682 100644 --- a/harbour/contrib/hbrddado/Makefile +++ b/harbour/contrib/hbrddado/Makefile @@ -10,6 +10,6 @@ PRG_SOURCES= \ PRG_HEADERS=\ adordd.ch \ -LIBNAME=adordd +LIBNAME=hbrddado include $(TOP)$(ROOT)config/lib.cf diff --git a/harbour/contrib/hbrddado/common.mak b/harbour/contrib/hbrddado/common.mak index d41da19f2e..9774982874 100644 --- a/harbour/contrib/hbrddado/common.mak +++ b/harbour/contrib/hbrddado/common.mak @@ -2,7 +2,7 @@ # $Id$ # -LIBNAME = adordd +LIBNAME = hbrddado LIB_PATH = $(LIB_DIR)\$(LIBNAME)$(LIBEXT) diff --git a/harbour/contrib/hbrddads/Makefile b/harbour/contrib/hbrddads/Makefile index e88879b901..29edde86a0 100644 --- a/harbour/contrib/hbrddads/Makefile +++ b/harbour/contrib/hbrddads/Makefile @@ -12,7 +12,7 @@ C_SOURCES=\ PRG_HEADERS=\ ads.ch \ -LIBNAME=rddads +LIBNAME=hbrddads ifeq ($(HB_ARCHITECTURE),w32) C_USR += -DWIN32 diff --git a/harbour/contrib/hbrddads/common.mak b/harbour/contrib/hbrddads/common.mak index b566a357a8..b4f59bd61d 100644 --- a/harbour/contrib/hbrddads/common.mak +++ b/harbour/contrib/hbrddads/common.mak @@ -2,7 +2,7 @@ # $Id$ # -LIBNAME = rddads +LIBNAME = hbrddads LIB_PATH = $(LIB_DIR)\$(LIBNAME)$(LIBEXT) diff --git a/harbour/contrib/hbwhat32/Makefile b/harbour/contrib/hbwhat32/Makefile index da298cc1d5..f7f4a0b92d 100644 --- a/harbour/contrib/hbwhat32/Makefile +++ b/harbour/contrib/hbwhat32/Makefile @@ -78,6 +78,6 @@ PRG_HEADERS= \ wintypes.ch \ winuser.ch \ -LIBNAME=what32 +LIBNAME=hbwhat32 include $(TOP)$(ROOT)config/lib.cf diff --git a/harbour/contrib/hbwhat32/common.mak b/harbour/contrib/hbwhat32/common.mak index cf9fd33c6d..5120623822 100644 --- a/harbour/contrib/hbwhat32/common.mak +++ b/harbour/contrib/hbwhat32/common.mak @@ -2,7 +2,7 @@ # $Id$ # -LIBNAME = what32 +LIBNAME = hbwhat32 LIB_PATH = $(LIB_DIR)\$(LIBNAME)$(LIBEXT)