2010-07-21 16:06 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

* INSTALL * Documented how to [re]build one specific contrib package. * INSTALL * contrib/make.hbs * Using 'contrib package' instead of 'contrib lib'. * package/winuni/mpkg_win_uni_extra_copy.bat * Do not install contrib utils sources anymore. If they are important, they can be built as part of regular build a shipped as binary. * package/winuni/mpkg_win_uni_extra_copy.bat * contrib/make.hbs * contrib/hbqt/generator/hbqtgen.prg - contrib/hbmysql/hbmysql.hbi - contrib/hbmysql/Makefile - contrib/gtalleg/gtalleg.hbi - contrib/gtalleg/gtallegs - contrib/gtalleg/Makefile - contrib/hbct/Makefile - contrib/sddmy/sddmy.hbi - contrib/sddmy/Makefile - contrib/hbodbc/Makefile - contrib/xhb/Makefile - contrib/sddfb/sddfb.hbi - contrib/sddfb/Makefile - contrib/hbtpathy/Makefile - contrib/hbgt/Makefile - contrib/hbsqlit3/Makefile - contrib/hbmzip/Makefile - contrib/hbblat/Makefile - contrib/hbblat/hbblat.hbi - contrib/hbqt/qtgui/qtguis - contrib/hbqt/qtgui/Makefile - contrib/hbqt/qtcore/qtcores - contrib/hbqt/qtcore/Makefile - contrib/hbqt/qtcore/filelist.mk - contrib/hbqt/Makefile - contrib/hbqt/detect.mk - contrib/hbqt/filelist.mk - contrib/hbqt/hbqts - contrib/hbqt/gtqtc/gtqtcs - contrib/hbqt/gtqtc/Makefile - contrib/hbqt/moc.mk - contrib/hbqt/qtnetwork/filelist.mk - contrib/hbqt/qtnetwork/qtnetworks - contrib/hbqt/qtnetwork/Makefile - contrib/hbfbird/hbfbird.hbi - contrib/hbfbird/Makefile - contrib/sddpg/sddpg.hbi - contrib/sddpg/Makefile - contrib/hbziparc/Makefile - contrib/hbxbp/Makefile - contrib/hbbz2/Makefile - contrib/hbblink/Makefile - contrib/hbnf/Makefile - contrib/hbcurl/hbcurl.hbi - contrib/hbcurl/hbcurls - contrib/hbcurl/Makefile - contrib/hbmemio/Makefile - contrib/hbxpp/Makefile - contrib/hbfship/Makefile - contrib/hbcups/Makefile - contrib/rddbmcdx/Makefile - contrib/hbfoxpro/Makefile - contrib/hbnetio/Makefile - contrib/rddsql/Makefile - contrib/hbhpdf/hbhpdf.hbi - contrib/hbhpdf/Makefile - contrib/gtwvg/Makefile - contrib/hbpgsql/hbpgsql.hbi - contrib/hbpgsql/Makefile - contrib/hbclipsm/Makefile - contrib/rddads/rddads.hbi - contrib/rddads/Makefile - contrib/sddsqlt3/Makefile - contrib/hbfimage/hbfimage.hbi - contrib/hbfimage/Makefile - contrib/sddodbc/Makefile - contrib/hbgd/hbgd.hbi - contrib/hbgd/Makefile - contrib/hbmisc/Makefile - contrib/sddoci/sddoci.hbi - contrib/sddoci/Makefile - contrib/hbcomm/Makefile - contrib/hbtip/hbtipssl - contrib/hbtip/Makefile - contrib/hbcairo/hbcairo.hbi - contrib/hbcairo/Makefile - contrib/hbwin/Makefile - contrib/hbssl/hbssls - contrib/hbssl/hbssl.hbi - contrib/hbssl/Makefile - contrib/hbsms/Makefile - Deleted references to .hbi and GNU Make files in contrib area. Now hbmk2 is used here to create the targets. This has a few consequences: - From now on *.hbp / *.hbc files need to be updated whenever files are added, deleted or renamed. Pls remember it. - hbmk2 will have to be updated in sync with the GNU Make system when adding new platforms and compilers. - in-place 'make' won't work, pls see new method in INSTALL. (it may still change)
2010-07-21 14:10:23 +00:00
parent 2090585ee1
commit 39368afe76
85 changed files with 137 additions and 2801 deletions
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,112 @@
   The license applies to all entries newer than 2009-04-28.
 */

+2010-07-21 16:06 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * INSTALL
+    * Documented how to [re]build one specific contrib package.
+
+  * INSTALL
+  * contrib/make.hbs
+    * Using 'contrib package' instead of 'contrib lib'.
+
+  * package/winuni/mpkg_win_uni_extra_copy.bat
+    * Do not install contrib utils sources anymore. If they
+      are important, they can be built as part of regular build
+      a shipped as binary.
+
+  * package/winuni/mpkg_win_uni_extra_copy.bat
+  * contrib/make.hbs
+  * contrib/hbqt/generator/hbqtgen.prg
+  - contrib/hbmysql/hbmysql.hbi
+  - contrib/hbmysql/Makefile
+  - contrib/gtalleg/gtalleg.hbi
+  - contrib/gtalleg/gtallegs
+  - contrib/gtalleg/Makefile
+  - contrib/hbct/Makefile
+  - contrib/sddmy/sddmy.hbi
+  - contrib/sddmy/Makefile
+  - contrib/hbodbc/Makefile
+  - contrib/xhb/Makefile
+  - contrib/sddfb/sddfb.hbi
+  - contrib/sddfb/Makefile
+  - contrib/hbtpathy/Makefile
+  - contrib/hbgt/Makefile
+  - contrib/hbsqlit3/Makefile
+  - contrib/hbmzip/Makefile
+  - contrib/hbblat/Makefile
+  - contrib/hbblat/hbblat.hbi
+  - contrib/hbqt/qtgui/qtguis
+  - contrib/hbqt/qtgui/Makefile
+  - contrib/hbqt/qtcore/qtcores
+  - contrib/hbqt/qtcore/Makefile
+  - contrib/hbqt/qtcore/filelist.mk
+  - contrib/hbqt/Makefile
+  - contrib/hbqt/detect.mk
+  - contrib/hbqt/filelist.mk
+  - contrib/hbqt/hbqts
+  - contrib/hbqt/gtqtc/gtqtcs
+  - contrib/hbqt/gtqtc/Makefile
+  - contrib/hbqt/moc.mk
+  - contrib/hbqt/qtnetwork/filelist.mk
+  - contrib/hbqt/qtnetwork/qtnetworks
+  - contrib/hbqt/qtnetwork/Makefile
+  - contrib/hbfbird/hbfbird.hbi
+  - contrib/hbfbird/Makefile
+  - contrib/sddpg/sddpg.hbi
+  - contrib/sddpg/Makefile
+  - contrib/hbziparc/Makefile
+  - contrib/hbxbp/Makefile
+  - contrib/hbbz2/Makefile
+  - contrib/hbblink/Makefile
+  - contrib/hbnf/Makefile
+  - contrib/hbcurl/hbcurl.hbi
+  - contrib/hbcurl/hbcurls
+  - contrib/hbcurl/Makefile
+  - contrib/hbmemio/Makefile
+  - contrib/hbxpp/Makefile
+  - contrib/hbfship/Makefile
+  - contrib/hbcups/Makefile
+  - contrib/rddbmcdx/Makefile
+  - contrib/hbfoxpro/Makefile
+  - contrib/hbnetio/Makefile
+  - contrib/rddsql/Makefile
+  - contrib/hbhpdf/hbhpdf.hbi
+  - contrib/hbhpdf/Makefile
+  - contrib/gtwvg/Makefile
+  - contrib/hbpgsql/hbpgsql.hbi
+  - contrib/hbpgsql/Makefile
+  - contrib/hbclipsm/Makefile
+  - contrib/rddads/rddads.hbi
+  - contrib/rddads/Makefile
+  - contrib/sddsqlt3/Makefile
+  - contrib/hbfimage/hbfimage.hbi
+  - contrib/hbfimage/Makefile
+  - contrib/sddodbc/Makefile
+  - contrib/hbgd/hbgd.hbi
+  - contrib/hbgd/Makefile
+  - contrib/hbmisc/Makefile
+  - contrib/sddoci/sddoci.hbi
+  - contrib/sddoci/Makefile
+  - contrib/hbcomm/Makefile
+  - contrib/hbtip/hbtipssl
+  - contrib/hbtip/Makefile
+  - contrib/hbcairo/hbcairo.hbi
+  - contrib/hbcairo/Makefile
+  - contrib/hbwin/Makefile
+  - contrib/hbssl/hbssls
+  - contrib/hbssl/hbssl.hbi
+  - contrib/hbssl/Makefile
+  - contrib/hbsms/Makefile
+    - Deleted references to .hbi and GNU Make files in contrib
+      area. Now hbmk2 is used here to create the targets.
+      This has a few consequences:
+         - From now on *.hbp / *.hbc files need to be updated
+           whenever files are added, deleted or renamed. Pls remember it.
+         - hbmk2 will have to be updated in sync with the GNU Make
+           system when adding new platforms and compilers.
+         - in-place 'make' won't work, pls see new method in
+           INSTALL. (it may still change)
+
 2010-07-21 14:46 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
  * contrib/hbqt/hbmk2_plugin_qt.hbs
    + Do not pollute output with meaningless error message, when
--- a/harbour/INSTALL
+++ b/harbour/INSTALL
@@ -191,15 +191,21 @@ HARBOUR
 ================================

   If you want to [re]build only a specific part of Harbour, like
-   one library, all contrib libs or core libs, you have to do
-   everything the same way as for a full build, the only difference
-   is that you first have to go into the specific source directory
-   you want to [re]build. When starting GNU Make, all components
-   under that dir will be built:
+   one core library or all core libraries, or all contrib packages,
+   you have to do everything the same way as for a full build, the
+   only difference is that you first have to go into the specific
+   source directory you want to [re]build. When starting GNU Make,
+   all components under that dir will be [re]built:

      cd src/rtl
      <make> [clean] [install]

+   If you want to rebuild one specific contrib packages, use this:
+
+      cd contrib/<name>
+      hbrun ..\make.hbs [clean] [install] [custom hbmk2 options]
+
+

 3. HOW TO CREATE DISTRIBUTABLE PACKAGES
 =======================================
@@ -283,7 +289,7 @@ HARBOUR
 4. HOW TO ENABLE OPTIONAL COMPONENTS BEFORE BUILD
 =================================================

-   Certain Harbour parts (typically contrib libraries) depend on 3rd
+   Certain Harbour parts (typically contrib packages) depend on 3rd
   party components. To make these Harbour parts built, you need
   to tell Harbour where to find the required 3rd party components
   (typically headers).
@@ -658,7 +664,7 @@ HARBOUR
   - HB_BUILD_EXTDEF=no          Enable autodetection of external components
                                 on default systems locations. Default: yes
   - HB_BUILD_CONTRIBS=no [<l>]  Don't build any (or space separated <l> list of)
-                                 contrib libraries.
+                                 contrib packages.
   - HB_BUILD_CONTRIBS=[<l>]     Build space separated <l> list of contrib
                                 libraries. Build all if left empty (default).
   - HB_BUILD_ADDONS=<l>         Build space separated <l> list of additional .hbp
--- a/harbour/contrib/gtalleg/Makefile
+++ b/harbour/contrib/gtalleg/Makefile
@@ -1,35 +0,0 @@
-#
-# $Id$
-#
-
-ROOT := ../../
-
-include $(TOP)$(ROOT)config/global.mk
-
-LIBNAME := gtalleg
-
-C_SOURCES := \
-   gtalleg.c \
-   ssf.c \
-
-_DET_DSP_NAME := allegro
-_DET_VAR_INC_ := HB_INC_ALLEGRO
-_DET_VAR_HAS_ := HB_HAS_ALLEGRO
-_DET_FLT_PLAT :=
-_DET_FLT_COMP := !pocc !pocc64 !poccarm !xcc !dmc !watcom !mingwarm !msvcarm
-_DET_INC_DEFP := /usr/include /opt/local/include
-_DET_INC_HEAD := /allegro.h
-include $(TOP)$(ROOT)config/detfun.mk
-
-ifneq ($(HB_HAS_ALLEGRO),)
-
-   HB_CFLAGS += $(foreach d,$(HB_HAS_ALLEGRO),-I$(d))
-
-   include $(TOP)$(ROOT)config/lib.mk
-
-   DIRS += gtallegs
-   include $(TOP)$(ROOT)config/dir.mk
-else
-   HB_SKIP_REASON := $(_DET_RES_TEXT)
-   include $(TOP)$(ROOT)config/none.mk
-endif
--- a/harbour/contrib/gtalleg/gtalleg.hbi
+++ b/harbour/contrib/gtalleg/gtalleg.hbi
@@ -1,9 +0,0 @@
-#
-# $Id$
-#
-
-hbimplib
-
-stop{!HB_WITH_ALLEGRO}
-
-${HB_WITH_ALLEGRO}/../bin/alleg42.dll
--- a/harbour/contrib/gtalleg/gtallegs/Makefile
+++ b/harbour/contrib/gtalleg/gtallegs/Makefile
@@ -1,35 +0,0 @@
-#
-# $Id$
-#
-
-ROOT := ../../../
-
-include $(TOP)$(ROOT)config/global.mk
-
-vpath %.c ../
-
-LIBNAME := gtallegs
-
-C_SOURCES := \
-   gtalleg.c \
-   ssf.c \
-
-_DET_DSP_NAME := allegro
-_DET_VAR_INC_ := HB_INC_ALLEGRO
-_DET_VAR_HAS_ := HB_HAS_ALLEGRO
-_DET_FLT_PLAT :=
-_DET_FLT_COMP := msvc
-_DET_INC_DEFP := /usr/include /opt/local/include
-_DET_INC_HEAD := /allegro.h
-include $(TOP)$(ROOT)config/detfun.mk
-
-ifneq ($(HB_HAS_ALLEGRO),)
-
-   HB_CFLAGS += $(foreach d,$(HB_HAS_ALLEGRO),-I$(d))
-   HB_CFLAGS += -DALLEGRO_STATICLINK
-
-   include $(TOP)$(ROOT)config/lib.mk
-else
-   HB_SKIP_REASON := $(_DET_RES_TEXT)
-   include $(TOP)$(ROOT)config/none.mk
-endif
--- a/harbour/contrib/gtwvg/Makefile
+++ b/harbour/contrib/gtwvg/Makefile
@@ -1,67 +0,0 @@
-#
-# $Id$
-#
-
-ROOT := ../../
-
-include $(TOP)$(ROOT)config/global.mk
-
-LIBNAME := gtwvg
-
-C_SOURCES := \
-   gtwvg.c \
-   wvgcore.c \
-   wvgutils.c \
-   wvgwin.c \
-   wvgwing.c \
-   wvgsink.c \
-   wvggui.c \
-   wvgcuig.c \
-
-PRG_SOURCES := \
-   wvgclass.prg \
-   wvgpaint.prg \
-   wvgphdlr.prg \
-   wvgwnd.prg \
-   wvgcrt.prg \
-   wvgax.prg \
-   wvgdlg.prg \
-   wvgmenub.prg \
-   wvgtoolb.prg \
-   wvgcombo.prg \
-   wvglistb.prg \
-   wvgpushb.prg \
-   wvgstatb.prg \
-   wvgstatc.prg \
-   wvgtreev.prg \
-   wvgcheck.prg \
-   wvgdatar.prg \
-   wvgradio.prg \
-   wvg3stat.prg \
-   wvgbitmp.prg \
-   wvgsle.prg \
-   wvgmle.prg \
-   wvghtmlv.prg \
-   wvgsysw.prg \
-   wvgdarea.prg \
-   wvgscrlb.prg \
-   wvgtabpg.prg \
-
-PRG_HEADERS := \
-   hbgtwvg.ch \
-   wvtwin.ch \
-   wvgparts.ch \
-
-ifeq ($(HB_PLATFORM),win)
-
-   HB_INC_DEPEND := -I$(TOP)$(ROOT)contrib/hbwin
-
-   # Optimize build time and make sure we build even with this option
-   HB_CFLAGS += -DWIN32_LEAN_AND_MEAN
-
-   include $(TOP)$(ROOT)config/header.mk
-   include $(TOP)$(ROOT)config/lib.mk
-else
-   HB_SKIP_REASON := platform not supported
-   include $(TOP)$(ROOT)config/none.mk
-endif
--- a/harbour/contrib/hbblat/Makefile
+++ b/harbour/contrib/hbblat/Makefile
@@ -1,26 +0,0 @@
-#
-# $Id$
-#
-
-ROOT := ../../
-
-include $(TOP)$(ROOT)config/global.mk
-
-LIBNAME := hbblat
-
-C_SOURCES := \
-   blatwrp.c \
-
-PRG_SOURCES := \
-   blatcls.prg \
-
-PRG_HEADERS := \
-   hbblat.ch \
-
-ifeq ($(HB_PLATFORM),win)
-   include $(TOP)$(ROOT)config/header.mk
-   include $(TOP)$(ROOT)config/lib.mk
-else
-   HB_SKIP_REASON := platform not supported
-   include $(TOP)$(ROOT)config/none.mk
-endif
--- a/harbour/contrib/hbblat/hbblat.hbi
+++ b/harbour/contrib/hbblat/hbblat.hbi
@@ -1,11 +0,0 @@
-#
-# $Id$
-#
-
-hbimplib
-
-stop{!HB_WITH_BLAT}
-
-${HB_WITH_BLAT}/../blat.dll
-
-iflag={bcc}-a
--- a/harbour/contrib/hbblink/Makefile
+++ b/harbour/contrib/hbblink/Makefile
@@ -1,16 +0,0 @@
-#
-# $Id$
-#
-
-ROOT := ../../
-
-LIBNAME := hbblink
-
-PRG_SOURCES := \
-   blinker.prg \
-
-PRG_HEADERS := \
-   hbblink.ch \
-
-include $(TOP)$(ROOT)config/header.mk
-include $(TOP)$(ROOT)config/lib.mk
--- a/harbour/contrib/hbbz2/Makefile
+++ b/harbour/contrib/hbbz2/Makefile
@@ -1,35 +0,0 @@
-#
-# $Id$
-#
-
-ROOT := ../../
-
-include $(TOP)$(ROOT)config/global.mk
-
-LIBNAME := hbbz2
-
-C_SOURCES := \
-   hbbz2.c \
-
-PRG_HEADERS := \
-   hbbz2.ch
-
-_DET_DSP_NAME := bzip2
-_DET_VAR_INC_ := HB_INC_BZIP2
-_DET_VAR_HAS_ := HB_HAS_BZIP2
-_DET_FLT_PLAT := !wce
-_DET_FLT_COMP :=
-_DET_INC_DEFP := /usr/include
-_DET_INC_LOCL := external/bzip2
-_DET_INC_HEAD := /bzlib.h
-include $(TOP)$(ROOT)config/detfun.mk
-
-ifneq ($(HB_HAS_BZIP2),)
-   HB_CFLAGS += $(foreach d,$(HB_HAS_BZIP2),-I$(d))
-
-   include $(TOP)$(ROOT)config/header.mk
-   include $(TOP)$(ROOT)config/lib.mk
-else
-   HB_SKIP_REASON := $(_DET_RES_TEXT)
-   include $(TOP)$(ROOT)config/none.mk
-endif
--- a/harbour/contrib/hbcairo/Makefile
+++ b/harbour/contrib/hbcairo/Makefile
@@ -1,43 +0,0 @@
-#
-# $Id$
-#
-
-ROOT := ../../
-
-include $(TOP)$(ROOT)config/global.mk
-
-LIBNAME := hbcairo
-
-C_SOURCES := \
-   context.c \
-   core.c \
-   image.c \
-   paths.c \
-   pdf.c \
-   png.c \
-   surface.c \
-   text.c \
-   transfor.c \
-   util.c \
-
-PRG_HEADERS := \
-   hbcairo.ch \
-
-_DET_DSP_NAME := cairo
-_DET_VAR_INC_ := HB_INC_CAIRO
-_DET_VAR_HAS_ := HB_HAS_CAIRO
-_DET_FLT_PLAT :=
-_DET_FLT_COMP :=
-_DET_INC_DEFP := /usr/include/cairo /opt/local/include/cairo
-_DET_INC_HEAD := /cairo.h
-include $(TOP)$(ROOT)config/detfun.mk
-
-ifneq ($(HB_HAS_CAIRO),)
-   HB_CFLAGS += $(foreach d,$(HB_HAS_CAIRO),-I$(d))
-
-   include $(TOP)$(ROOT)config/header.mk
-   include $(TOP)$(ROOT)config/lib.mk
-else
-   HB_SKIP_REASON := $(_DET_RES_TEXT)
-   include $(TOP)$(ROOT)config/none.mk
-endif
--- a/harbour/contrib/hbcairo/hbcairo.hbi
+++ b/harbour/contrib/hbcairo/hbcairo.hbi
@@ -1,13 +0,0 @@
-#
-# $Id$
-#
-
-hbimplib
-
-stop{!HB_WITH_CAIRO}
-
-${HB_WITH_CAIRO}/../../bin/libcairo-2.dll
-
-iflag={bcc}-a
-
-ocairo
--- a/harbour/contrib/hbclipsm/Makefile
+++ b/harbour/contrib/hbclipsm/Makefile
@@ -1,26 +0,0 @@
-#
-# $Id$
-#
-
-ROOT := ../../
-
-C_SOURCES := \
-   date.c \
-   environ.c \
-   gauge.c \
-   num.c \
-   numceil.c \
-   numfloor.c \
-   stack.c \
-   status.c \
-   time.c \
-
-PRG_SOURCES := \
-
-PRG_HEADERS := \
-   time87.ch \
-
-LIBNAME := hbclipsm
-
-include $(TOP)$(ROOT)config/header.mk
-include $(TOP)$(ROOT)config/lib.mk
--- a/harbour/contrib/hbcomm/Makefile
+++ b/harbour/contrib/hbcomm/Makefile
@@ -1,14 +0,0 @@
-#
-# $Id$
-#
-
-ROOT := ../../
-
-include $(TOP)$(ROOT)config/global.mk
-
-LIBNAME := hbcomm
-
-PRG_SOURCES := \
-   hbcomm.prg \
-
-include $(TOP)$(ROOT)config/lib.mk
--- a/harbour/contrib/hbct/Makefile
+++ b/harbour/contrib/hbct/Makefile
@@ -1,129 +0,0 @@
-#
-# $Id$
-#
-
-ROOT := ../../
-
-LIBNAME := hbct
-
-C_SOURCES := \
-   addascii.c \
-   asciisum.c \
-   ascpos.c \
-   atadjust.c \
-   atnum.c \
-   atrepl.c \
-   bitnum.c \
-   blank.c \
-   charevod.c \
-   charlihb.c \
-   charlist.c \
-   charmirr.c \
-   charmix.c \
-   charone.c \
-   charonly.c \
-   charop.c \
-   charophb.c \
-   charrepl.c \
-   charsort.c \
-   charsprd.c \
-   charswap.c \
-   color.c \
-   count.c \
-   ctc.c \
-   ctchksum.c \
-   ctcom1.c \
-   ctcom2.c \
-   ctcrypt.c \
-   ctmath.c \
-   ctmath2.c \
-   ctnet.c \
-   ctpad.c \
-   ctset.c \
-   ctstr.c \
-   ctstrfil.c \
-   ctwfunc.c \
-   ctwin.c \
-   cursor.c \
-   datetime.c \
-   dattime2.c \
-   dattime3.c \
-   dbftools.c \
-   disk.c \
-   expand.c \
-   exponent.c \
-   files.c \
-   finan.c \
-   ftoc.c \
-   justify.c \
-   keyset.c \
-   like.c \
-   lton.c \
-   maxline.c \
-   misc1.c \
-   misc2.c \
-   misc3.c \
-   num1.c \
-   numat.c \
-   numcount.c \
-   numline.c \
-   pack.c \
-   pos1.c \
-   pos2.c \
-   posdiff.c \
-   print.c \
-   range.c \
-   relation.c \
-   remove.c \
-   replace.c \
-   screen1.c \
-   screen2.c \
-   setlast.c \
-   setrc.c \
-   strdiff.c \
-   strswap.c \
-   tab.c \
-   token1.c \
-   token2.c \
-   trig.c \
-   video.c \
-   wordrepl.c \
-   wordtoch.c \
-
-C_HEADERS := \
-   ct.h \
-   ctmath.h \
-   ctset.h \
-   ctstr.h \
-   ctstrfil.h \
-   ctwin.h \
-
-PRG_SOURCES := \
-   ct.prg \
-   ctdummy.prg \
-   ctmisc.prg \
-   ctrand.prg \
-   cttime.prg \
-   fcopy.prg \
-   getinfo.prg \
-   getinput.prg \
-   getsecrt.prg \
-   keysave.prg \
-   keysec.prg \
-   keytime.prg \
-   numconv.prg \
-   screen3.prg \
-   scrmark.prg \
-   showtime.prg \
-   tempfile.prg \
-
-PRG_HEADERS := \
-   ct.ch \
-   ctcom.ch \
-   ctdisk.ch \
-   cterror.ch \
-   ctextern.ch \
-   ctvideo.ch \
-
-include $(TOP)$(ROOT)config/header.mk
-include $(TOP)$(ROOT)config/lib.mk
--- a/harbour/contrib/hbcups/Makefile
+++ b/harbour/contrib/hbcups/Makefile
@@ -1,30 +0,0 @@
-#
-# $Id$
-#
-
-ROOT := ../../
-
-include $(TOP)$(ROOT)config/global.mk
-
-LIBNAME := hbcups
-
-C_SOURCES := \
-   hbcups.c \
-
-_DET_DSP_NAME := cups
-_DET_VAR_INC_ := HB_INC_CUPS
-_DET_VAR_HAS_ := HB_HAS_CUPS
-_DET_FLT_PLAT := !win !wce !dos
-_DET_FLT_COMP :=
-_DET_INC_DEFP := /usr/include
-_DET_INC_HEAD := /cups/cups.h
-include $(TOP)$(ROOT)config/detfun.mk
-
-ifneq ($(HB_HAS_CUPS),)
-   HB_CFLAGS += $(foreach d,$(HB_HAS_CUPS),-I$(d))
-
-   include $(TOP)$(ROOT)config/lib.mk
-else
-   HB_SKIP_REASON := $(_DET_RES_TEXT)
-   include $(TOP)$(ROOT)config/none.mk
-endif
--- a/harbour/contrib/hbcurl/Makefile
+++ b/harbour/contrib/hbcurl/Makefile
@@ -1,44 +0,0 @@
-#
-# $Id$
-#
-
-ROOT := ../../
-
-include $(TOP)$(ROOT)config/global.mk
-
-LIBNAME := hbcurl
-
-C_SOURCES := \
-   hbcurl.c \
-
-PRG_HEADERS := \
-   hbcurl.ch \
-
-_DET_DSP_NAME := libcurl
-_DET_VAR_INC_ := HB_INC_CURL
-_DET_VAR_HAS_ := HB_HAS_CURL
-_DET_FLT_PLAT :=
-_DET_FLT_COMP :=
-_DET_INC_DEFP := /usr/include
-_DET_INC_HEAD := /curl/curl.h
-include $(TOP)$(ROOT)config/detfun.mk
-
-ifneq ($(HB_HAS_CURL),)
-
-   ifneq ($(HB_HAS_WATT),)
-      HB_CFLAGS += $(foreach d,$(HB_HAS_WATT),-I$(d))
-   endif
-
-   HB_CFLAGS += $(foreach d,$(HB_HAS_CURL),-I$(d))
-
-   include $(TOP)$(ROOT)config/header.mk
-   include $(TOP)$(ROOT)config/lib.mk
-
-   ifneq ($(filter $(HB_PLATFORM),win wce),)
-      DIRS += hbcurls
-      include $(TOP)$(ROOT)config/dir.mk
-   endif
-else
-   HB_SKIP_REASON := $(_DET_RES_TEXT)
-   include $(TOP)$(ROOT)config/none.mk
-endif
--- a/harbour/contrib/hbcurl/hbcurl.hbi
+++ b/harbour/contrib/hbcurl/hbcurl.hbi
@@ -1,12 +0,0 @@
-#
-# $Id$
-#
-
-hbimplib
-
-stop{!HB_WITH_CURL}
-
-${HB_WITH_CURL}/../libcurl.dll
-${HB_WITH_CURL}/../bin/libcurl.dll
-
-iflag={bcc}-a
--- a/harbour/contrib/hbcurl/hbcurls/Makefile
+++ b/harbour/contrib/hbcurl/hbcurls/Makefile
@@ -1,35 +0,0 @@
-#
-# $Id$
-#
-
-ROOT := ../../../
-
-include $(TOP)$(ROOT)config/global.mk
-
-vpath %.c ../
-
-LIBNAME := hbcurls
-
-C_SOURCES := \
-   hbcurl.c \
-
-_DET_DSP_NAME := libcurl
-_DET_VAR_INC_ := HB_INC_CURL
-_DET_VAR_HAS_ := HB_HAS_CURL
-_DET_FLT_PLAT :=
-_DET_FLT_COMP :=
-_DET_INC_DEFP := /usr/include
-_DET_INC_HEAD := /curl/curl.h
-include $(TOP)$(ROOT)config/detfun.mk
-
-ifneq ($(HB_HAS_CURL),)
-
-   HB_CFLAGS += $(foreach d,$(HB_HAS_CURL),-I$(d))
-   # always export symbols
-   HB_CFLAGS += -DCURL_STATICLIB
-
-   include $(TOP)$(ROOT)config/lib.mk
-else
-   HB_SKIP_REASON := $(_DET_RES_TEXT)
-   include $(TOP)$(ROOT)config/none.mk
-endif
--- a/harbour/contrib/hbfbird/Makefile
+++ b/harbour/contrib/hbfbird/Makefile
@@ -1,33 +0,0 @@
-#
-# $Id$
-#
-
-ROOT := ../../
-
-include $(TOP)$(ROOT)config/global.mk
-
-LIBNAME := hbfbird
-
-C_SOURCES := \
-   firebird.c \
-
-PRG_SOURCES := \
-   tfirebrd.prg \
-
-_DET_DSP_NAME := firebird
-_DET_VAR_INC_ := HB_INC_FIREBIRD
-_DET_VAR_HAS_ := HB_HAS_FIREBIRD
-_DET_FLT_PLAT :=
-_DET_FLT_COMP := !pocc64 !poccarm
-_DET_INC_DEFP := /usr/include /opt/firebird/include /Library/Frameworks/Firebird.framework/Headers
-_DET_INC_HEAD := /ibase.h
-include $(TOP)$(ROOT)config/detfun.mk
-
-ifneq ($(HB_HAS_FIREBIRD),)
-   HB_CFLAGS += $(foreach d,$(HB_HAS_FIREBIRD),-I$(d))
-
-   include $(TOP)$(ROOT)config/lib.mk
-else
-   HB_SKIP_REASON := $(_DET_RES_TEXT)
-   include $(TOP)$(ROOT)config/none.mk
-endif
--- a/harbour/contrib/hbfbird/hbfbird.hbi
+++ b/harbour/contrib/hbfbird/hbfbird.hbi
@@ -1,12 +0,0 @@
-#
-# $Id$
-#
-
-hbimplib
-
-stop{!HB_WITH_FIREBIRD}
-
-ofbclient
-
-{!(allgcc|allmsvc|allpocc)}${HB_WITH_FIREBIRD}/../bin/fbclient.dll
-{allgcc|allmsvc|allpocc}${HB_WITH_FIREBIRD}/../lib/fbclient_ms.lib
--- a/harbour/contrib/hbfimage/Makefile
+++ b/harbour/contrib/hbfimage/Makefile
@@ -1,37 +0,0 @@
-#
-# $Id$
-#
-
-ROOT := ../../
-
-include $(TOP)$(ROOT)config/global.mk
-
-LIBNAME := hbfimage
-
-C_SOURCES := \
-   fi_winfu.c \
-   fi_wrp.c \
-
-PRG_SOURCES := \
-
-PRG_HEADERS := \
-   freeimag.ch \
-
-_DET_DSP_NAME := freeimage
-_DET_VAR_INC_ := HB_INC_FREEIMAGE
-_DET_VAR_HAS_ := HB_HAS_FREEIMAGE
-_DET_FLT_PLAT := !dos !os2
-_DET_FLT_COMP :=
-_DET_INC_DEFP := /usr/include /opt/local/include
-_DET_INC_HEAD := /FreeImage.h
-include $(TOP)$(ROOT)config/detfun.mk
-
-ifneq ($(HB_HAS_FREEIMAGE),)
-   HB_CFLAGS += -DHB_LEGACY_TYPES_OFF $(foreach d,$(HB_HAS_FREEIMAGE),-I$(d))
-
-   include $(TOP)$(ROOT)config/header.mk
-   include $(TOP)$(ROOT)config/lib.mk
-else
-   HB_SKIP_REASON := $(_DET_RES_TEXT)
-   include $(TOP)$(ROOT)config/none.mk
-endif
--- a/harbour/contrib/hbfimage/hbfimage.hbi
+++ b/harbour/contrib/hbfimage/hbfimage.hbi
@@ -1,9 +0,0 @@
-#
-# $Id$
-#
-
-hbimplib
-
-stop{!HB_WITH_FREEIMAGE}
-
-${HB_WITH_FREEIMAGE}/../Dist/FreeImage.dll
--- a/harbour/contrib/hbfoxpro/Makefile
+++ b/harbour/contrib/hbfoxpro/Makefile
@@ -1,18 +0,0 @@
-#
-# $Id$
-#
-
-ROOT := ../../
-
-include $(TOP)$(ROOT)config/global.mk
-
-LIBNAME := hbfoxpro
-
-PRG_SOURCES := \
-   dll.prg \
-
-PRG_HEADERS := \
-   hbfoxpro.ch \
-
-include $(TOP)$(ROOT)config/header.mk
-include $(TOP)$(ROOT)config/lib.mk
--- a/harbour/contrib/hbfship/Makefile
+++ b/harbour/contrib/hbfship/Makefile
@@ -1,19 +0,0 @@
-#
-# $Id$
-#
-
-ROOT := ../../
-
-include $(TOP)$(ROOT)config/global.mk
-
-LIBNAME := hbfship
-
-C_SOURCES := \
-   pvalue.c \
-   secondfs.c \
-   strpeek.c \
-
-PRG_SOURCES := \
-
-include $(TOP)$(ROOT)config/header.mk
-include $(TOP)$(ROOT)config/lib.mk
--- a/harbour/contrib/hbgd/Makefile
+++ b/harbour/contrib/hbgd/Makefile
@@ -1,44 +0,0 @@
-#
-# $Id$
-#
-
-ROOT := ../../
-
-include $(TOP)$(ROOT)config/global.mk
-
-LIBNAME := hbgd
-
-C_SOURCES := \
-   gdwrp.c \
-
-PRG_HEADERS := \
-   gd.ch \
-   gdextern.ch \
-
-PRG_SOURCES := \
-   gd.prg \
-   gdbar.prg \
-   gdchart.prg \
-   gdimage.prg \
-   gdbarcod.prg \
-
-_DET_DSP_NAME := libgd
-_DET_VAR_INC_ := HB_INC_GD
-_DET_VAR_HAS_ := HB_HAS_GD
-_DET_FLT_PLAT :=
-_DET_FLT_COMP :=
-_DET_INC_DEFP := /usr/include /opt/local/include
-_DET_INC_HEAD := /gd.h
-include $(TOP)$(ROOT)config/detfun.mk
-
-ifneq ($(HB_HAS_GD),)
-
-   HB_CFLAGS += $(foreach d,$(HB_HAS_GD),-I$(d))
-
-   include $(TOP)$(ROOT)config/header.mk
-   include $(TOP)$(ROOT)config/lib.mk
-
-else
-   HB_SKIP_REASON := $(_DET_RES_TEXT)
-   include $(TOP)$(ROOT)config/none.mk
-endif
--- a/harbour/contrib/hbgd/hbgd.hbi
+++ b/harbour/contrib/hbgd/hbgd.hbi
@@ -1,9 +0,0 @@
-#
-# $Id$
-#
-
-hbimplib
-
-stop{!HB_WITH_GD}
-
-${HB_WITH_GD}/../bin/bgd.dll
--- a/harbour/contrib/hbgt/Makefile
+++ b/harbour/contrib/hbgt/Makefile
@@ -1,28 +0,0 @@
-#
-# $Id$
-#
-
-ROOT := ../../
-
-C_SOURCES := \
-   asciisgt.c \
-   ascposgt.c \
-   atdiff.c \
-   chareven.c \
-   charmixg.c \
-   charodd.c \
-   chrcount.c \
-   chrfirst.c \
-   chrtotal.c \
-   strasint.c \
-   strcount.c \
-   strcspn.c \
-   strdiffg.c \
-   strexpan.c \
-   strleft.c \
-   strpbrk.c \
-   strright.c \
-
-LIBNAME := hbgt
-
-include $(TOP)$(ROOT)config/lib.mk
--- a/harbour/contrib/hbhpdf/Makefile
+++ b/harbour/contrib/hbhpdf/Makefile
@@ -1,36 +0,0 @@
-#
-# $Id$
-#
-
-ROOT = ../../
-
-include $(TOP)$(ROOT)config/global.mk
-
-LIBNAME := hbhpdf
-
-C_SOURCES := \
-   harupdf.c \
-
-PRG_HEADERS := \
-   harupdf.ch \
-
-_DET_DSP_NAME := libharu
-_DET_VAR_INC_ := HB_INC_LIBHARU
-_DET_VAR_HAS_ := HB_HAS_LIBHARU
-_DET_FLT_PLAT :=
-_DET_FLT_COMP :=
-_DET_INC_DEFP := /usr/include /usr/local/include
-_DET_INC_LOCL := external/libhpdf
-_DET_INC_HEAD := /hpdf.h
-include $(TOP)$(ROOT)config/detfun.mk
-
-ifneq ($(HB_HAS_LIBHARU),)
-
-   HB_CFLAGS += $(foreach d,$(HB_HAS_LIBHARU),-I$(d))
-
-   include $(TOP)$(ROOT)config/header.mk
-   include $(TOP)$(ROOT)config/lib.mk
-else
-   HB_SKIP_REASON := $(_DET_RES_TEXT)
-   include $(TOP)$(ROOT)config/none.mk
-endif
--- a/harbour/contrib/hbhpdf/hbhpdf.hbi
+++ b/harbour/contrib/hbhpdf/hbhpdf.hbi
@@ -1,10 +0,0 @@
-#
-# $Id$
-#
-
-hbimplib
-
-stop{!HB_WITH_LIBHARU}
-
-${HB_WITH_LIBHARU}/../libhpdf.dll
-${HB_WITH_LIBHARU}/../lib_dll/libhpdf.dll
--- a/harbour/contrib/hbmemio/Makefile
+++ b/harbour/contrib/hbmemio/Makefile
@@ -1,12 +0,0 @@
-#
-# $Id$
-#
-
-ROOT := ../../
-
-LIBNAME := hbmemio
-
-C_SOURCES := \
-   memio.c \
-
-include $(TOP)$(ROOT)config/lib.mk
--- a/harbour/contrib/hbmisc/Makefile
+++ b/harbour/contrib/hbmisc/Makefile
@@ -1,29 +0,0 @@
-#
-# $Id$
-#
-
-ROOT := ../../
-
-LIBNAME := hbmisc
-
-C_SOURCES := \
-   dates2.c \
-   ffind.c \
-   hb_f.c \
-   hbeditc.c \
-   spd.c \
-   strfmt.c \
-   stringsx.c \
-
-PRG_SOURCES := \
-   calldll.prg \
-   fcomma.prg \
-   fileread.prg \
-   hbedit.prg \
-   nconvert.prg \
-   numtxthu.prg \
-   numtxten.prg \
-   stringp.prg \
-   twirler.prg \
-
-include $(TOP)$(ROOT)config/lib.mk
--- a/harbour/contrib/hbmysql/Makefile
+++ b/harbour/contrib/hbmysql/Makefile
@@ -1,41 +0,0 @@
-#
-# $Id$
-#
-
-ROOT := ../../
-
-include $(TOP)$(ROOT)config/global.mk
-
-LIBNAME := hbmysql
-
-C_SOURCES := \
-   mysql.c \
-   mysqlold.c \
-
-PRG_SOURCES := \
-   tmysql.prg \
-   tsqlbrw.prg \
-
-PRG_HEADERS := \
-   mysql.ch \
-
-_DET_DSP_NAME := mysql
-_DET_VAR_INC_ := HB_INC_MYSQL
-_DET_VAR_HAS_ := HB_HAS_MYSQL
-_DET_FLT_PLAT :=
-_DET_FLT_COMP :=
-_DET_INC_DEFP := /usr/include/mysql /opt/local/include/mysql5/mysql
-_DET_INC_HEAD := /mysql.h
-include $(TOP)$(ROOT)config/detfun.mk
-
-ifneq ($(HB_HAS_MYSQL),)
-
-   HB_CFLAGS += $(foreach d,$(HB_HAS_MYSQL),-I$(d))
-
-   include $(TOP)$(ROOT)config/header.mk
-   include $(TOP)$(ROOT)config/lib.mk
-
-else
-   HB_SKIP_REASON := $(_DET_RES_TEXT)
-   include $(TOP)$(ROOT)config/none.mk
-endif
--- a/harbour/contrib/hbmysql/hbmysql.hbi
+++ b/harbour/contrib/hbmysql/hbmysql.hbi
@@ -1,9 +0,0 @@
-#
-# $Id$
-#
-
-hbimplib
-
-stop{!HB_WITH_MYSQL}
-
-${HB_WITH_MYSQL}/../lib/opt/libmySQL.dll
--- a/harbour/contrib/hbmzip/Makefile
+++ b/harbour/contrib/hbmzip/Makefile
@@ -1,44 +0,0 @@
-#
-# $Id$
-#
-
-ROOT := ../../
-
-include $(TOP)$(ROOT)config/global.mk
-
-LIBNAME := hbmzip
-
-C_SOURCES := \
-   hbmzip.c
-
-PRG_HEADERS := \
-   hbmzip.ch
-
-ifneq ($(HB_HAS_ZLIB),)
-
-   HB_CFLAGS += -DHB_HAS_ZLIB $(foreach d,$(HB_HAS_ZLIB),-I$(d))
-
-   _DET_DSP_NAME := minizip
-   _DET_VAR_INC_ := HB_INC_MINIZIP
-   _DET_VAR_HAS_ := HB_HAS_MINIZIP
-   _DET_FLT_PLAT :=
-   _DET_FLT_COMP :=
-   _DET_INC_DEFP := /usr/include /usr/local/include
-   _DET_INC_LOCL := external/minizip
-   _DET_INC_HEAD := /zip.h
-   include $(TOP)$(ROOT)config/detfun.mk
-
-   ifneq ($(HB_HAS_MINIZIP),)
-
-      HB_CFLAGS += -DHB_HAS_MINIZIP $(foreach d,$(HB_HAS_MINIZIP),-I$(d))
-
-      include $(TOP)$(ROOT)config/header.mk
-      include $(TOP)$(ROOT)config/lib.mk
-   else
-      HB_SKIP_REASON := $(_DET_RES_TEXT)
-      include $(TOP)$(ROOT)config/none.mk
-   endif
-else
-   HB_SKIP_REASON := component not found
-   include $(TOP)$(ROOT)config/none.mk
-endif
--- a/harbour/contrib/hbnetio/Makefile
+++ b/harbour/contrib/hbnetio/Makefile
@@ -1,16 +0,0 @@
-#
-# $Id$
-#
-
-ROOT := ../../
-
-LIBNAME := hbnetio
-
-C_SOURCES := \
-   netiosrv.c \
-   netiocli.c \
-
-PRG_SOURCES := \
-   netiomt.prg \
-
-include $(TOP)$(ROOT)config/lib.mk
--- a/harbour/contrib/hbnf/Makefile
+++ b/harbour/contrib/hbnf/Makefile
@@ -1,157 +0,0 @@
-#
-# $Id$
-#
-
-ROOT := ../../
-
-LIBNAME := hbnf
-
-C_SOURCES := \
-   alt.c \
-   caplock.c \
-   chdir.c \
-   color2n.c \
-   ctrl.c \
-   descendn.c \
-   dispc.c \
-   ftattr.c \
-   ftidle.c \
-   ftint86.c \
-   ftisprn.c \
-   fttext.c \
-   ftshadow.c \
-   getenvrn.c \
-   getver.c \
-   getvid.c \
-   iamidle.c \
-   kspeed.c \
-   mkdir.c \
-   mouse.c \
-   n2color.c \
-   numlock.c \
-   origin.c \
-   proper.c \
-   prtscr.c \
-   putkey.c \
-   rmdir.c \
-   setkeys.c \
-   setlastk.c \
-   shift.c \
-   stod.c \
-
-BAD_C_SOURCES := \
-   ontick.c \
-   peek.c \
-   poke.c \
-
-PRG_SOURCES := \
-   aading.prg \
-   aavg.prg \
-   acctadj.prg \
-   acctmnth.prg \
-   acctqtr.prg \
-   acctweek.prg \
-   acctyear.prg \
-   adessort.prg \
-   aemaxlen.prg \
-   aeminlen.prg \
-   amedian.prg \
-   anomatch.prg \
-   any2any.prg \
-   aredit.prg \
-   asum.prg \
-   at2.prg \
-   bitclr.prg \
-   bitset.prg \
-   blink.prg \
-   byt2bit.prg \
-   byt2hex.prg \
-   byteand.prg \
-   byteneg.prg \
-   bytenot.prg \
-   byteor.prg \
-   bytexor.prg \
-   calendar.prg \
-   clrsel.prg \
-   cntryset.prg \
-   d2e.prg \
-   datecnfg.prg \
-   dayofyr.prg \
-   daytobow.prg \
-   dectobin.prg \
-   dfile.prg \
-   diskfunc.prg \
-   dispmsg.prg \
-   dosver.prg \
-   e2d.prg \
-   easter.prg \
-   elapmil.prg \
-   elapsed.prg \
-   eltime.prg \
-   findith.prg \
-   firstday.prg \
-   floptst.prg \
-   gcd.prg \
-   hex2dec.prg \
-   invclr.prg \
-   isbit.prg \
-   isbiton.prg \
-   isshare.prg \
-   lastday.prg \
-   linked.prg \
-   madd.prg \
-   menu1.prg \
-   menutonf.prg \
-   metaph.prg \
-   miltime.prg \
-   min2dhm.prg \
-   month.prg \
-   mouse2.prg \
-   netpv.prg \
-   nooccur.prg \
-   ntow.prg \
-   nwlstat.prg \
-   nwsem.prg \
-   nwuid.prg \
-   page.prg \
-   pchr.prg \
-   pegs.prg \
-   pending.prg \
-   pickday.prg \
-   popadder.prg \
-   prtesc.prg \
-   pvid.prg \
-   qtr.prg \
-   rand1.prg \
-   restsets.prg \
-   ftround.prg \
-   savearr.prg \
-   savesets.prg \
-   scancode.prg \
-   scregion.prg \
-   setdate.prg \
-   settime.prg \
-   sinkey.prg \
-   sleep.prg \
-   sqzn.prg \
-   sysmem.prg \
-   tbwhile.prg \
-   tempfile.prg \
-   vertmenu.prg \
-   vidcur.prg \
-   vidmode.prg \
-   wda.prg \
-   week.prg \
-   workdays.prg \
-   woy.prg \
-   xbox.prg \
-   year.prg \
-
-BAD_PRG_SOURCES := \
-   mouse1.prg \
-
-PRG_HEADERS := \
-   ftmenuto.ch \
-
-include $(TOP)$(ROOT)config/header.mk
-include $(TOP)$(ROOT)config/lib.mk
--- a/harbour/contrib/hbodbc/Makefile
+++ b/harbour/contrib/hbodbc/Makefile
@@ -1,48 +0,0 @@
-#
-# $Id$
-#
-
-ROOT := ../../
-
-include $(TOP)$(ROOT)config/global.mk
-
-LIBNAME := hbodbc
-
-C_SOURCES := \
-   odbc.c \
-   odbcold.c \
-
-PRG_SOURCES := \
-   todbc.prg \
-   browodbc.prg \
-
-PRG_HEADERS := \
-   sql.ch \
-
-ifneq ($(filter $(HB_PLATFORM),win wce),)
-   HB_INC_ODBC := force
-   ifeq ($(HB_COMPILER),msvcarm)
-      HB_INC_ODBC :=
-   endif
-endif
-
-_DET_DSP_NAME := odbc
-_DET_VAR_INC_ := HB_INC_ODBC
-_DET_VAR_HAS_ := HB_HAS_ODBC
-_DET_FLT_PLAT := !dos !os2
-_DET_FLT_COMP := !rsxnt
-_DET_INC_DEFP := /usr/include /usr/local/include
-_DET_INC_HEAD := /sql.h
-include $(TOP)$(ROOT)config/detfun.mk
-
-ifneq ($(HB_HAS_ODBC),)
-
-   HB_CFLAGS += $(foreach d,$(HB_HAS_ODBC),-I$(d))
-
-   include $(TOP)$(ROOT)config/header.mk
-   include $(TOP)$(ROOT)config/lib.mk
-
-else
-   HB_SKIP_REASON := $(_DET_RES_TEXT)
-   include $(TOP)$(ROOT)config/none.mk
-endif
--- a/harbour/contrib/hbpgsql/Makefile
+++ b/harbour/contrib/hbpgsql/Makefile
@@ -1,41 +0,0 @@
-#
-# $Id$
-#
-
-ROOT := ../../
-
-include $(TOP)$(ROOT)config/global.mk
-
-LIBNAME := hbpgsql
-
-C_SOURCES := \
-   postgres.c \
-
-PRG_SOURCES := \
-   tpostgre.prg \
-   pgrdd.prg \
-
-PRG_HEADERS := \
-   postgres.ch \
-
-_DET_DSP_NAME := postgresql
-_DET_VAR_INC_ := HB_INC_PGSQL
-_DET_VAR_HAS_ := HB_HAS_PGSQL
-_DET_FLT_PLAT :=
-_DET_FLT_COMP :=
-_DET_INC_DEFP := /usr/include /usr/local/pgsql/include /usr/local/pgsql/include/libpq
-_DET_INC_DEFP += /usr/include/pgsql /usr/include/postgresql /postgres/include /opt/local/include/postgresql84 /opt/local/include/postgresql83
-_DET_INC_HEAD := /libpq-fe.h
-include $(TOP)$(ROOT)config/detfun.mk
-
-ifneq ($(HB_HAS_PGSQL),)
-
-   HB_CFLAGS += $(foreach d,$(HB_HAS_PGSQL),-I$(d))
-
-   include $(TOP)$(ROOT)config/header.mk
-   include $(TOP)$(ROOT)config/lib.mk
-
-else
-   HB_SKIP_REASON := $(_DET_RES_TEXT)
-   include $(TOP)$(ROOT)config/none.mk
-endif
--- a/harbour/contrib/hbpgsql/hbpgsql.hbi
+++ b/harbour/contrib/hbpgsql/hbpgsql.hbi
@@ -1,11 +0,0 @@
-#
-# $Id$
-#
-
-hbimplib
-
-stop{!HB_WITH_PGSQL}
-
-${HB_WITH_PGSQL}/../lib/libpq.dll
-
-iflag={bcc}-a
--- a/harbour/contrib/hbqt/Makefile
+++ b/harbour/contrib/hbqt/Makefile
@@ -1,36 +0,0 @@
-#
-# $Id$
-#
-
-ROOT := ../../
-
-include $(TOP)$(ROOT)config/global.mk
-
-LIBNAME := hbqt
-
-PRG_HEADERS := \
-   hbqt.ch \
-
-include $(TOP)$(ROOT)contrib/hbqt/detect.mk
-
-ifneq ($(HB_HAS_QT),)
-
-   include $(TOP)$(ROOT)contrib/hbqt/filelist.mk
-
-   include $(TOP)$(ROOT)contrib/hbqt/moc.mk
-   include $(TOP)$(ROOT)config/header.mk
-   include $(TOP)$(ROOT)config/lib.mk
-
-   ifneq ($(HB_QT_BUILD_STATIC),)
-      ifneq ($(filter $(HB_PLATFORM),win wce),)
-         DIRS += hbqts
-      endif
-   endif
-
-   DIRS += \
-      qtcore \
-      qtgui \
-      qtnetwork
-
-   include $(TOP)$(ROOT)config/dir.mk
-endif
--- a/harbour/contrib/hbqt/detect.mk
+++ b/harbour/contrib/hbqt/detect.mk
@@ -1,70 +0,0 @@
-#
-# $Id$
-#
-
-# ---------------------------------------------------------------
-# Copyright 2009 Viktor Szakats (harbour.01 syenar.hu)
-# See COPYING for licensing terms.
-# ---------------------------------------------------------------
-
-# force redetect. needed for _QT_DARWIN trick
-HB_HAS_QT :=
-
-_DET_DSP_NAME := qt
-_DET_VAR_INC_ := HB_INC_QT
-_DET_VAR_HAS_ := HB_HAS_QT
-_DET_FLT_PLAT := !dos
-_DET_FLT_COMP := !watcom !bcc !pocc !pocc64 !poccarm !msvcia64
-_DET_INC_DEFP := /usr/include/qt4 /usr/lib/qt4/include /usr/include /Developer/qt/include
-_DET_INC_HEAD := /QtCore/qglobal.h
-include $(TOP)$(ROOT)config/detfun.mk
-
-_QT_DARWIN :=
-ifeq ($(HB_PLATFORM),darwin)
-   ifeq ($(HB_HAS_QT),)
-      _DET_DSP_NAME := qt
-      _DET_VAR_INC_ := HB_INC_QT
-      _DET_VAR_HAS_ := HB_HAS_QT
-      _DET_INC_DEFP := /Library/Frameworks/QtCore.framework/Headers
-      _DET_INC_HEAD := /QtCore
-      include $(TOP)$(ROOT)config/detfun.mk
-      _QT_DARWIN := yes
-   endif
-endif
-
-ifneq ($(HB_HAS_QT),)
-   ifeq ($(_QT_DARWIN),yes)
-      HB_CFLAGS += -I/Library/Frameworks
-   else
-      HB_CFLAGS += $(foreach d,$(HB_HAS_QT),-I$(d))
-   endif
-
-   # Locate 'moc' executable
-   ifeq ($(MOC_BIN),)
-      ifeq ($(HB_QT_MOC_BIN),)
-         ifeq ($(HB_HOST_PLAT),win)
-            MOC_BIN := $(HB_HAS_QT)\..\bin\moc.exe
-         else
-            MOC_BIN := $(firstword $(call find_in_path_par,moc,$(PATH) /opt/qtsdk/qt/bin))
-            ifeq ($(MOC_BIN),)
-               MOC_BIN := $(firstword $(call find_in_path_par,moc-qt4,$(PATH) /opt/qtsdk/qt/bin))
-               ifeq ($(MOC_BIN),)
-                  $(error ! HB_QT_MOC_BIN not set, could not autodetect)
-               endif
-            endif
-         endif
-         $(info ! Using QT 'moc' executable: $(MOC_BIN) (autodetected))
-      else
-         ifneq ($(wildcard $(HB_QT_MOC_BIN)),)
-            MOC_BIN := $(HB_QT_MOC_BIN)
-            $(info ! Using QT 'moc' executable: $(MOC_BIN))
-         else
-            $(error ! HB_QT_MOC_BIN points to non-existent file. Make sure to set it to full path and filename of moc executable.)
-         endif
-      endif
-      export MOC_BIN
-   endif
-else
-   HB_SKIP_REASON := $(_DET_RES_TEXT)
-   include $(TOP)$(ROOT)config/none.mk
-endif
--- a/harbour/contrib/hbqt/filelist.mk
+++ b/harbour/contrib/hbqt/filelist.mk
@@ -1,34 +0,0 @@
-#
-# $Id$
-#
-
-MOC_HEADERS := \
-   hbqt_hbqabstractitemmodel.h \
-   hbqt_hbdbfmodel.h \
-   hbqt_hbevents.h \
-   hbqt_hbqmainwindow.h \
-   hbqt_hbqplaintextedit.h \
-   hbqt_hbqsyntaxhighlighter.h \
-   hbqt_hbqtableview.h \
-   hbqt_hbslots.h \
-
-CPP_SOURCES := \
-   hbqt_base.cpp \
-   hbqt_utils.cpp \
-   hbqt_destruct.cpp \
-   hbqt_hbqabstractitemmodel.cpp \
-   hbqt_hbdbfmodel.cpp \
-   hbqt_hbevents.cpp \
-   hbqt_hbqmainwindow.cpp \
-   hbqt_hbqplaintextedit.cpp \
-   hbqt_hbqsyntaxhighlighter.cpp \
-   hbqt_hbqtableview.cpp \
-   hbqt_hbslots.cpp \
-
-PRG_SOURCES := \
-   hbqt_misc.prg \
-   hbqt_errorsys.prg \
-   THbQtUI.prg \
-   
-# Don't delete this comment, it's here to ensure empty
-# line above is kept intact.
--- a/harbour/contrib/hbqt/generator/hbqtgen.prg
+++ b/harbour/contrib/hbqt/generator/hbqtgen.prg
@@ -1897,7 +1897,7 @@ STATIC FUNCTION Build_GarbageFile( cpp_, cPathOut )

 STATIC FUNCTION Build_MakeFile( cpp_, prg_, cPathOut )
   LOCAL cFile, s, i
-   LOCAL txt_ := {}, hdr_:= {}, aSubs := {}
+   LOCAL hdr_:= {}, aSubs := {}
   LOCAL hbm_ := {}

   HB_SYMBOL_UNUSED( cpp_ )
@@ -1929,31 +1929,18 @@ STATIC FUNCTION Build_MakeFile( cpp_, prg_, cPathOut )
   ENDIF
   //
   FOR i := 1 TO len( aSubs )
-      txt_:= {}
-      aeval( hdr_, {|e| aadd( txt_, e ) } )
      hbm_ := {}
      aeval( hdr_, {|e| aadd( hbm_, e ) } )
-      aadd( txt_, "CPP_SOURCES := \" )
      //
      FOR EACH s IN aSubs[ i, 2 ]
-         aadd( txt_, "   " + s + ".cpp \" )
         aadd( hbm_, + s + ".cpp" )
      NEXT
      aadd( hbm_, "" )
-      aadd( txt_, "" )
-      aadd( txt_, "" )
-      aadd( txt_, "" )
-      aadd( txt_, "PRG_SOURCES := \" )
      FOR EACH s IN aSubs[ i, 2 ]
-         aadd( txt_, "   " + "T" + s + ".prg \" )
         aadd( hbm_, + "T" + s + ".prg" )
      NEXT
-      aadd( txt_, "" )
-      aadd( txt_, "# Don't delete this comment, it's here to ensure empty" )
-      aadd( txt_, "# line above is kept intact." )
      //
      cFile := iif( empty( cPathOut ), "", cPathOut + s_PathSep + aSubs[ i, 1 ] + s_PathSep )
-      CreateTarget( cFile + "filelist.mk", txt_ )
      CreateTarget( cFile + "filelist.hbm", hbm_ )
   NEXT

--- a/harbour/contrib/hbqt/gtqtc/Makefile
+++ b/harbour/contrib/hbqt/gtqtc/Makefile
@@ -1,34 +0,0 @@
-#
-# $Id$
-#
-
-ROOT := ../../../
-
-include $(TOP)$(ROOT)config/global.mk
-
-LIBNAME := gtqtc
-
-MOC_HEADERS := \
-   gtqtc.h \
-
-CPP_SOURCES := \
-   gtqtc.cpp \
-
-PRG_HEADERS := \
-   hbgtqtc.ch
-
-include $(TOP)$(ROOT)contrib/hbqt/detect.mk
-
-ifneq ($(HB_HAS_QT),)
-
-   include $(TOP)$(ROOT)contrib/hbqt/moc.mk
-   include $(TOP)$(ROOT)config/header.mk
-   include $(TOP)$(ROOT)config/lib.mk
-
-   ifneq ($(HB_QT_STATIC),)
-      ifneq ($(filter $(HB_PLATFORM),win wce),)
-         DIRS += gtqtcs
-         include $(TOP)$(ROOT)config/dir.mk
-      endif
-   endif
-endif
--- a/harbour/contrib/hbqt/gtqtc/gtqtcs/Makefile
+++ b/harbour/contrib/hbqt/gtqtc/gtqtcs/Makefile
@@ -1,29 +0,0 @@
-#
-# $Id$
-#
-
-ROOT := ../../../
-
-include $(TOP)$(ROOT)config/global.mk
-
-vpath %.h ../
-vpath %.cpp ../
-vpath %.prg ../
-
-LIBNAME := gtqtcs
-
-MOC_HEADERS := \
-   gtqtc.h \
-
-CPP_SOURCES := \
-   gtqtc.cpp \
-
-include $(TOP)$(ROOT)contrib/hbqt/detect.mk
-
-ifneq ($(HB_HAS_QT),)
-
-   HB_CFLAGS += -DQT_NODLL
-
-   include $(TOP)$(ROOT)contrib/hbqt/moc.mk
-   include $(TOP)$(ROOT)config/lib.mk
-endif
--- a/harbour/contrib/hbqt/hbqts/Makefile
+++ b/harbour/contrib/hbqt/hbqts/Makefile
@@ -1,26 +0,0 @@
-#
-# $Id$
-#
-
-ROOT := ../../../
-
-include $(TOP)$(ROOT)config/global.mk
-
-vpath %.h ../
-vpath %.cpp ../
-vpath %.prg ../
-
-LIBNAME := hbqts
-
-include $(TOP)$(ROOT)contrib/hbqt/detect.mk
-
-ifneq ($(HB_HAS_QT),)
-
-   HB_CFLAGS += -DQT_NODLL
-
-   include $(TOP)$(ROOT)contrib/hbqt/filelist.mk
-
-   include $(TOP)$(ROOT)contrib/hbqt/moc.mk
-   include $(TOP)$(ROOT)config/header.mk
-   include $(TOP)$(ROOT)config/lib.mk
-endif
--- a/harbour/contrib/hbqt/moc.mk
+++ b/harbour/contrib/hbqt/moc.mk
@@ -1,17 +0,0 @@
-#
-# $Id$
-#
-
-# ---------------------------------------------------------------
-# Copyright 2009 Viktor Szakats (harbour.01 syenar.hu)
-# See COPYING for licensing terms.
-# ---------------------------------------------------------------
-
-MOC_CPP_SOURCES := $(foreach dir,$(MOC_HEADERS),moc_$(dir:.h=.cpp))
-
-$(MOC_CPP_SOURCES) : moc_%.cpp : $(GRANDP)%.h
-
-CPP_SOURCES += $(MOC_CPP_SOURCES)
-
-moc_%.cpp : $(GRANDP)%.h
-	$(MOC_BIN) $? -o $@
--- a/harbour/contrib/hbqt/qtcore/Makefile
+++ b/harbour/contrib/hbqt/qtcore/Makefile
@@ -1,27 +0,0 @@
-#
-# $Id$
-#
-
-ROOT := ../../../
-
-include $(TOP)$(ROOT)config/global.mk
-
-LIBNAME := hbqtcore
-
-include $(TOP)$(ROOT)contrib/hbqt/detect.mk
-
-ifneq ($(HB_HAS_QT),)
-
-   include $(TOP)$(ROOT)contrib/hbqt/qtcore/filelist.mk
-
-   include $(TOP)$(ROOT)contrib/hbqt/moc.mk
-   include $(TOP)$(ROOT)config/header.mk
-   include $(TOP)$(ROOT)config/lib.mk
-
-   ifneq ($(HB_QT_STATIC),)
-      ifneq ($(filter $(HB_PLATFORM),win wce),)
-         DIRS += qtcores
-         include $(TOP)$(ROOT)config/dir.mk
-      endif
-   endif
-endif
--- a/harbour/contrib/hbqt/qtcore/filelist.mk
+++ b/harbour/contrib/hbqt/qtcore/filelist.mk
@@ -1,126 +0,0 @@
-#
-# $Id$
-#
-
-# --------------------------------------------------------------------
-# WARNING: Automatically generated source file. DO NOT EDIT!
-#          Instead, edit corresponding .qth file,
-#          or the generator tool itself, and run regenarate.
-# --------------------------------------------------------------------
-
-CPP_SOURCES := \
-   HBQAbstractItemModel.cpp \
-   HBDbfModel.cpp \
-   HBEvents.cpp \
-   HBSlots.cpp \
-   QAbstractItemModel.cpp \
-   QAbstractListModel.cpp \
-   QAbstractTableModel.cpp \
-   QBitArray.cpp \
-   QBuffer.cpp \
-   QByteArray.cpp \
-   QChar.cpp \
-   QCoreApplication.cpp \
-   QDataStream.cpp \
-   QDate.cpp \
-   QDateTime.cpp \
-   QDir.cpp \
-   QEvent.cpp \
-   QEventLoop.cpp \
-   QFile.cpp \
-   QFileInfo.cpp \
-   QIODevice.cpp \
-   QLatin1Char.cpp \
-   QLatin1String.cpp \
-   QLine.cpp \
-   QLineF.cpp \
-   QList.cpp \
-   QLocale.cpp \
-   QMimeData.cpp \
-   QModelIndex.cpp \
-   QObject.cpp \
-   QPoint.cpp \
-   QPointF.cpp \
-   QProcess.cpp \
-   QRect.cpp \
-   QRectF.cpp \
-   QRegExp.cpp \
-   QResource.cpp \
-   QSettings.cpp \
-   QSignalMapper.cpp \
-   QSize.cpp \
-   QSizeF.cpp \
-   QStringList.cpp \
-   QTextBoundaryFinder.cpp \
-   QTextCodec.cpp \
-   QTextDecoder.cpp \
-   QTextEncoder.cpp \
-   QTextStream.cpp \
-   QThread.cpp \
-   QTime.cpp \
-   QTimer.cpp \
-   QTranslator.cpp \
-   QUiLoader.cpp \
-   QUrl.cpp \
-   QVariant.cpp \
-
-
-
-PRG_SOURCES := \
-   THBQAbstractItemModel.prg \
-   THBDbfModel.prg \
-   THBEvents.prg \
-   THBSlots.prg \
-   TQAbstractItemModel.prg \
-   TQAbstractListModel.prg \
-   TQAbstractTableModel.prg \
-   TQBitArray.prg \
-   TQBuffer.prg \
-   TQByteArray.prg \
-   TQChar.prg \
-   TQCoreApplication.prg \
-   TQDataStream.prg \
-   TQDate.prg \
-   TQDateTime.prg \
-   TQDir.prg \
-   TQEvent.prg \
-   TQEventLoop.prg \
-   TQFile.prg \
-   TQFileInfo.prg \
-   TQIODevice.prg \
-   TQLatin1Char.prg \
-   TQLatin1String.prg \
-   TQLine.prg \
-   TQLineF.prg \
-   TQList.prg \
-   TQLocale.prg \
-   TQMimeData.prg \
-   TQModelIndex.prg \
-   TQObject.prg \
-   TQPoint.prg \
-   TQPointF.prg \
-   TQProcess.prg \
-   TQRect.prg \
-   TQRectF.prg \
-   TQRegExp.prg \
-   TQResource.prg \
-   TQSettings.prg \
-   TQSignalMapper.prg \
-   TQSize.prg \
-   TQSizeF.prg \
-   TQStringList.prg \
-   TQTextBoundaryFinder.prg \
-   TQTextCodec.prg \
-   TQTextDecoder.prg \
-   TQTextEncoder.prg \
-   TQTextStream.prg \
-   TQThread.prg \
-   TQTime.prg \
-   TQTimer.prg \
-   TQTranslator.prg \
-   TQUiLoader.prg \
-   TQUrl.prg \
-   TQVariant.prg \
-
-# Don't delete this comment, it's here to ensure empty
-# line above is kept intact.
--- a/harbour/contrib/hbqt/qtcore/qtcores/Makefile
+++ b/harbour/contrib/hbqt/qtcore/qtcores/Makefile
@@ -1,29 +0,0 @@
-#
-# $Id$
-#
-
-ROOT := ../../../../
-
-include $(TOP)$(ROOT)config/global.mk
-
-vpath %.h ../
-vpath %.cpp ../
-vpath %.prg ../
-
-LIBNAME := hbqtcores
-
-include $(TOP)$(ROOT)contrib/hbqt/detect.mk
-
-ifneq ($(HB_HAS_QT),)
-
-   HB_CFLAGS += -DQT_NODLL
-
-   include $(TOP)$(ROOT)contrib/hbqt/qtcore/filelist.mk
-
-   include $(TOP)$(ROOT)contrib/hbqt/moc.mk
-   include $(TOP)$(ROOT)config/header.mk
-   include $(TOP)$(ROOT)config/lib.mk
-else
-   HB_SKIP_REASON := $(_DET_RES_TEXT)
-   include $(TOP)$(ROOT)config/none.mk
-endif
--- a/harbour/contrib/hbqt/qtgui/Makefile
+++ b/harbour/contrib/hbqt/qtgui/Makefile
@@ -1,27 +0,0 @@
-#
-# $Id$
-#
-
-ROOT := ../../../
-
-include $(TOP)$(ROOT)config/global.mk
-
-LIBNAME := hbqtgui
-
-include $(TOP)$(ROOT)contrib/hbqt/detect.mk
-
-ifneq ($(HB_HAS_QT),)
-
-   include $(TOP)$(ROOT)contrib/hbqt/qtgui/filelist.mk
-
-   include $(TOP)$(ROOT)contrib/hbqt/moc.mk
-   include $(TOP)$(ROOT)config/header.mk
-   include $(TOP)$(ROOT)config/lib.mk
-
-   ifneq ($(HB_QT_STATIC),)
-      ifneq ($(filter $(HB_PLATFORM),win wce),)
-         DIRS += qtguis
-         include $(TOP)$(ROOT)config/dir.mk
-      endif
-   endif
-endif
--- a/harbour/contrib/hbqt/qtgui/qtguis/Makefile
+++ b/harbour/contrib/hbqt/qtgui/qtguis/Makefile
@@ -1,29 +0,0 @@
-#
-# $Id$
-#
-
-ROOT := ../../../../
-
-include $(TOP)$(ROOT)config/global.mk
-
-vpath %.h ../
-vpath %.cpp ../
-vpath %.prg ../
-
-LIBNAME := hbqtguis
-
-include $(TOP)$(ROOT)contrib/hbqt/detect.mk
-
-ifneq ($(HB_HAS_QT),)
-
-   HB_CFLAGS += -DQT_NODLL
-
-   include $(TOP)$(ROOT)contrib/hbqt/qtgui/filelist.mk
-
-   include $(TOP)$(ROOT)contrib/hbqt/moc.mk
-   include $(TOP)$(ROOT)config/header.mk
-   include $(TOP)$(ROOT)config/lib.mk
-else
-   HB_SKIP_REASON := $(_DET_RES_TEXT)
-   include $(TOP)$(ROOT)config/none.mk
-endif
--- a/harbour/contrib/hbqt/qtnetwork/Makefile
+++ b/harbour/contrib/hbqt/qtnetwork/Makefile
@@ -1,30 +0,0 @@
-#
-# $Id$
-#
-
-ROOT := ../../../
-
-include $(TOP)$(ROOT)config/global.mk
-
-LIBNAME := hbqtnetwork
-
-include $(TOP)$(ROOT)contrib/hbqt/detect.mk
-
-ifneq ($(HB_HAS_QT),)
-
-   include $(TOP)$(ROOT)contrib/hbqt/qtnetwork/filelist.mk
-
-   include $(TOP)$(ROOT)contrib/hbqt/moc.mk
-   include $(TOP)$(ROOT)config/header.mk
-   include $(TOP)$(ROOT)config/lib.mk
-
-   ifneq ($(HB_QT_STATIC),)
-      ifneq ($(filter $(HB_PLATFORM),win wce),)
-         DIRS += qtnetworks
-         include $(TOP)$(ROOT)config/dir.mk
-      endif
-   endif
-else
-   HB_SKIP_REASON := $(_DET_RES_TEXT)
-   include $(TOP)$(ROOT)config/none.mk
-endif
--- a/harbour/contrib/hbqt/qtnetwork/filelist.mk
+++ b/harbour/contrib/hbqt/qtnetwork/filelist.mk
@@ -1,30 +0,0 @@
-#
-# $Id$
-#
-
-# --------------------------------------------------------------------
-# WARNING: Automatically generated source file. DO NOT EDIT!
-#          Instead, edit corresponding .qth file,
-#          or the generator tool itself, and run regenarate.
-# --------------------------------------------------------------------
-
-CPP_SOURCES := \
-   QFtp.cpp \
-   QHttp.cpp \
-   QHttpHeader.cpp \
-   QHttpRequestHeader.cpp \
-   QHttpResponseHeader.cpp \
-   QNetworkRequest.cpp \
-
-
-
-PRG_SOURCES := \
-   TQFtp.prg \
-   TQHttp.prg \
-   TQHttpHeader.prg \
-   TQHttpRequestHeader.prg \
-   TQHttpResponseHeader.prg \
-   TQNetworkRequest.prg \
-
-# Don't delete this comment, it's here to ensure empty
-# line above is kept intact.
--- a/harbour/contrib/hbqt/qtnetwork/qtnetworks/Makefile
+++ b/harbour/contrib/hbqt/qtnetwork/qtnetworks/Makefile
@@ -1,29 +0,0 @@
-#
-# $Id$
-#
-
-ROOT := ../../../../
-
-include $(TOP)$(ROOT)config/global.mk
-
-vpath %.h ../
-vpath %.cpp ../
-vpath %.prg ../
-
-LIBNAME := hbqtnetworks
-
-include $(TOP)$(ROOT)contrib/hbqt/detect.mk
-
-ifneq ($(HB_HAS_QT),)
-
-   HB_CFLAGS += -DQT_NODLL
-
-   include $(TOP)$(ROOT)contrib/hbqt/qtnetwork/filelist.mk
-
-   include $(TOP)$(ROOT)contrib/hbqt/moc.mk
-   include $(TOP)$(ROOT)config/header.mk
-   include $(TOP)$(ROOT)config/lib.mk
-else
-   HB_SKIP_REASON := $(_DET_RES_TEXT)
-   include $(TOP)$(ROOT)config/none.mk
-endif
--- a/harbour/contrib/hbsms/Makefile
+++ b/harbour/contrib/hbsms/Makefile
@@ -1,14 +0,0 @@
-#
-# $Id$
-#
-
-ROOT := ../../
-
-include $(TOP)$(ROOT)config/global.mk
-
-LIBNAME := hbsms
-
-PRG_SOURCES := \
-   hbsms.prg \
-
-include $(TOP)$(ROOT)config/lib.mk
--- a/harbour/contrib/hbsqlit3/Makefile
+++ b/harbour/contrib/hbsqlit3/Makefile
@@ -1,36 +0,0 @@
-#
-# $Id$
-#
-
-ROOT := ../../
-
-include $(TOP)$(ROOT)config/global.mk
-
-LIBNAME := hbsqlit3
-
-C_SOURCES := \
-   hbsqlit3.c \
-
-PRG_HEADERS := \
-   hbsqlit3.ch \
-
-_DET_DSP_NAME := sqlite3
-_DET_VAR_INC_ := HB_INC_SQLITE3
-_DET_VAR_HAS_ := HB_HAS_SQLITE3
-_DET_FLT_PLAT :=
-_DET_FLT_COMP :=
-_DET_INC_DEFP := /usr/include /boot/common/include
-_DET_INC_LOCL := external/sqlite3
-_DET_INC_HEAD := /sqlite3.h
-include $(TOP)$(ROOT)config/detfun.mk
-
-ifneq ($(HB_HAS_SQLITE3),)
-
-   HB_CFLAGS += $(foreach d,$(HB_HAS_SQLITE3),-I$(d))
-
-   include $(TOP)$(ROOT)config/header.mk
-   include $(TOP)$(ROOT)config/lib.mk
-else
-   HB_SKIP_REASON := $(_DET_RES_TEXT)
-   include $(TOP)$(ROOT)config/none.mk
-endif
--- a/harbour/contrib/hbssl/Makefile
+++ b/harbour/contrib/hbssl/Makefile
@@ -1,60 +0,0 @@
-#
-# $Id$
-#
-
-ROOT := ../../
-
-include $(TOP)$(ROOT)config/global.mk
-
-LIBNAME := hbssl
-
-C_SOURCES := \
-   hbssl.c \
-   bio.c \
-   err.c \
-   evp.c \
-   evpciph.c \
-   evpenc.c \
-   evpmd.c \
-   evppkey.c \
-   pem.c \
-   rand.c \
-   ssl.c \
-   sslciph.c \
-   sslctx.c \
-   sslsess.c \
-   x509.c \
-
-PRG_HEADERS := \
-   hbssl.ch \
-
-_DET_DSP_NAME := openssl
-_DET_VAR_INC_ := HB_INC_OPENSSL
-_DET_VAR_HAS_ := HB_HAS_OPENSSL
-_DET_FLT_PLAT := !wce
-_DET_FLT_COMP :=
-_DET_INC_DEFP := /usr/include /usr/local/include /usr/local/ssl/include /boot/common/include
-_DET_INC_HEAD := /openssl/ssl.h
-
-include $(TOP)$(ROOT)config/detfun.mk
-
-ifneq ($(HB_HAS_OPENSSL),)
-
-   HB_CFLAGS += $(foreach d,$(HB_HAS_OPENSSL),-I$(d))
-   ifeq ($(HB_PLATFORM),darwin)
-      HB_CFLAGS += -DOPENSSL_NO_SHA256 -DOPENSSL_NO_SHA512 -DOPENSSL_NO_CAMELLIA -DOPENSSL_NO_SEED -DOPENSSL_NO_DGRAM -DHB_OPENSSL_OLD_OSX_
-   endif
-   # Patent will expire in 2010/2011
-   HB_CFLAGS += -DOPENSSL_NO_IDEA
-
-   include $(TOP)$(ROOT)config/header.mk
-   include $(TOP)$(ROOT)config/lib.mk
-
-   ifneq ($(filter $(HB_PLATFORM),win wce),)
-      DIRS += hbssls
-      include $(TOP)$(ROOT)config/dir.mk
-   endif
-else
-   HB_SKIP_REASON := component not found
-   include $(TOP)$(ROOT)config/none.mk
-endif
--- a/harbour/contrib/hbssl/hbssl.hbi
+++ b/harbour/contrib/hbssl/hbssl.hbi
@@ -1,16 +0,0 @@
-#
-# $Id$
-#
-
-hbimplib
-
-stop{!HB_WITH_OPENSSL}
-
-${HB_WITH_OPENSSL}/../out32dll/libeay32.dll
-${HB_WITH_OPENSSL}/../out32dll/ssleay32.dll
-${HB_WITH_OPENSSL}/../dll/libeay32.dll
-${HB_WITH_OPENSSL}/../dll/ssleay32.dll
-${HB_WITH_OPENSSL}/../libeay32.dll
-${HB_WITH_OPENSSL}/../ssleay32.dll
-
-iflag={bcc}-a
--- a/harbour/contrib/hbssl/hbssls/Makefile
+++ b/harbour/contrib/hbssl/hbssls/Makefile
@@ -1,42 +0,0 @@
-#
-# $Id$
-#
-
-ROOT := ../../../
-
-include $(TOP)$(ROOT)config/global.mk
-
-vpath %.c ../
-
-LIBNAME := hbssls
-
-C_SOURCES := \
-   hbssl.c \
-   bio.c \
-   err.c \
-   evp.c \
-   evpciph.c \
-   evpenc.c \
-   evpmd.c \
-   evppkey.c \
-   pem.c \
-   rand.c \
-   ssl.c \
-   sslciph.c \
-   sslctx.c \
-   sslsess.c \
-   x509.c \
-
-ifneq ($(HB_HAS_OPENSSL),)
-
-   HB_CFLAGS += $(foreach d,$(HB_HAS_OPENSSL),-I$(d))
-
-   HB_CFLAGS += -DHB_OPENSSL_STATIC
-
-   # Patent will expire in 2010/2011
-   HB_CFLAGS += -DOPENSSL_NO_IDEA
-
-   include $(TOP)$(ROOT)config/lib.mk
-else
-   include $(TOP)$(ROOT)config/none.mk
-endif
--- a/harbour/contrib/hbtip/Makefile
+++ b/harbour/contrib/hbtip/Makefile
@@ -1,43 +0,0 @@
-#
-# $Id$
-#
-
-ROOT := ../../
-
-include $(TOP)$(ROOT)config/global.mk
-
-LIBNAME := hbtip
-
-C_SOURCES := \
-   encb64c.c \
-   encurlc.c \
-   utils.c \
-
-PRG_SOURCES := \
-   cgi.prg \
-   client.prg \
-   credent.prg \
-   encb64.prg \
-   encoder.prg \
-   encqp.prg \
-   encurl.prg \
-   ftpcli.prg \
-   httpcli.prg \
-   log.prg \
-   mail.prg \
-   popcli.prg \
-   sendmail.prg \
-   sessid.prg \
-   smtpcli.prg \
-   thtml.prg \
-   url.prg \
-
-PRG_HEADERS := \
-   thtml.ch \
-   tip.ch \
-
-DIRS := hbtipssl
-
-include $(TOP)$(ROOT)config/header.mk
-include $(TOP)$(ROOT)config/lib.mk
-include $(TOP)$(ROOT)config/dir.mk
--- a/harbour/contrib/hbtip/hbtipssl/Makefile
+++ b/harbour/contrib/hbtip/hbtipssl/Makefile
@@ -1,41 +0,0 @@
-#
-# $Id$
-#
-
-ROOT := ../../../
-
-include $(TOP)$(ROOT)config/global.mk
-
-vpath %.c ../
-vpath %.prg ../
-
-LIBNAME := hbtipssl
-
-C_SOURCES := \
-   encb64c.c \
-   encurlc.c \
-   utils.c \
-
-PRG_SOURCES := \
-   cgi.prg \
-   client.prg \
-   credent.prg \
-   encb64.prg \
-   encoder.prg \
-   encqp.prg \
-   encurl.prg \
-   ftpcli.prg \
-   httpcli.prg \
-   log.prg \
-   mail.prg \
-   popcli.prg \
-   sendmail.prg \
-   sessid.prg \
-   smtpcli.prg   \
-   thtml.prg \
-   url.prg \
-
-HB_PRGFLAGS += -DHB_HAS_OPENSSL
-HB_INC_DEPEND := -I$(TOP)$(ROOT)contrib/hbssl
-
-include $(TOP)$(ROOT)config/lib.mk
--- a/harbour/contrib/hbtpathy/Makefile
+++ b/harbour/contrib/hbtpathy/Makefile
@@ -1,18 +0,0 @@
-#
-# $Id$
-#
-
-ROOT := ../../
-
-include $(TOP)$(ROOT)config/global.mk
-
-LIBNAME := hbtpathy
-
-PRG_SOURCES := \
-   telepath.prg \
-
-PRG_HEADERS := \
-   telepath.ch \
-
-include $(TOP)$(ROOT)config/header.mk
-include $(TOP)$(ROOT)config/lib.mk
--- a/harbour/contrib/hbwin/Makefile
+++ b/harbour/contrib/hbwin/Makefile
@@ -1,95 +0,0 @@
-#
-# $Id$
-#
-
-ROOT := ../../
-
-include $(TOP)$(ROOT)config/global.mk
-
-LIBNAME := hbwin
-
-C_SOURCES := \
-   axcore.c \
-   legacycd.c \
-   legacyco.c \
-   legacycp.c \
-   mapi.c \
-   olecore.c \
-   oleinit.c \
-   hbolesrv.c \
-   wapi_alloc.c \
-   wapi_commctrl.c \
-   wapi_err.c \
-   wapi_mmsystem.c \
-   wapi_shellapi.c \
-   wapi_winbase.c \
-   wapi_winbase_mutex.c \
-   wapi_wingdi.c \
-   wapi_wingdi_font.c \
-   wapi_winnetwk.c \
-   wapi_winnls.c \
-   wapi_winuser.c \
-   wce_simc.c \
-   wce_smsc.c \
-   win_bmp.c \
-   win_bmpd.c \
-   win_com.c \
-   win_dlg.c \
-   win_evnt.c \
-   win_misc.c \
-   win_osc.c \
-   win_prn1.c \
-   win_prn2.c \
-   win_prn3.c \
-   win_regc.c \
-   win_shell.c \
-   win_svc.c \
-
-PRG_SOURCES := \
-   legacy.prg \
-   oleauto.prg \
-   axfunc.prg \
-   wce_sim.prg \
-   win_os.prg \
-   win_reg.prg \
-   win_tbmp.prg \
-   win_tcom.prg \
-   win_tprn.prg \
-
-C_HEADERS := \
-   hbwapi.h \
-   hbwin.h \
-   hbwinole.h \
-
-PRG_HEADERS := \
-   hbwin.ch \
-
-ifneq ($(filter $(HB_PLATFORM),win wce),)
-
-   _DET_DSP_NAME := libpng
-   _DET_VAR_INC_ := HB_INC_PNG
-   _DET_VAR_HAS_ := HB_HAS_PNG
-   _DET_FLT_PLAT :=
-   _DET_FLT_COMP :=
-   _DET_INC_DEFP :=
-   _DET_INC_LOCL := external/libpng
-   _DET_INC_HEAD := /png.h
-   include $(TOP)$(ROOT)config/detfun.mk
-
-   ifneq ($(HB_HAS_PNG),)
-      HB_CFLAGS += -DHB_HAS_PNG $(foreach d,$(HB_HAS_PNG),-I$(d))
-
-      ifneq ($(HB_HAS_ZLIB),)
-         HB_CFLAGS += -DHB_HAS_ZLIB $(foreach d,$(HB_HAS_ZLIB),-I$(d))
-      endif
-   endif
-
-   # Optimize build time and make sure we build even with this option
-   HB_CFLAGS += -DWIN32_LEAN_AND_MEAN
-
-   include $(TOP)$(ROOT)config/header.mk
-   include $(TOP)$(ROOT)config/lib.mk
-else
-   HB_SKIP_REASON := platform not supported
-   include $(TOP)$(ROOT)config/none.mk
-endif
--- a/harbour/contrib/hbxbp/Makefile
+++ b/harbour/contrib/hbxbp/Makefile
@@ -1,75 +0,0 @@
-#
-# $Id$
-#
-
-ROOT := ../../
-
-include $(TOP)$(ROOT)config/global.mk
-
-LIBNAME := hbxbp
-
-PRG_SOURCES := \
-   hbpprocess.prg \
-   xbp3state.prg \
-   xbpappevent.prg \
-   xbpbitmap.prg \
-   xbpbrowse.prg \
-   xbpcheckbox.prg \
-   xbpcombobox.prg \
-   xbpdataref.prg \
-   xbpdialog.prg \
-   xbpfiledialog.prg \
-   xbpfontdialog.prg \
-   xbpgeneric.prg \
-   xbphtmlviewer.prg \
-   xbplistbox.prg \
-   xbpmenubar.prg \
-   xbpmle.prg \
-   xbpparthandler.prg \
-   xbppresspace.prg \
-   xbpprintdialog.prg \
-   xbpprinter.prg \
-   xbppushbutton.prg \
-   xbpradiobutton.prg \
-   xbprtf.prg \
-   xbpscrollbar.prg \
-   xbpsle.prg \
-   xbpspinbutton.prg \
-   xbpstatic.prg \
-   xbpstatusbar.prg \
-   xbpstyle.prg \
-   xbptabpage.prg \
-   xbptoolbar.prg \
-   xbptreeview.prg \
-   xbpwindow.prg \
-   xbpclipboard.prg \
-   xbpgra.prg \
-
-PRG_HEADERS := \
-   appevent.ch \
-   gra.ch \
-   xbp.ch \
-   xbpdev.ch \
-
-# Try to be in sync with hbqt, but not too hard, since this
-# lib doesn't need QT external component directly.
-ifeq ($(filter $(HB_PLATFORM),dos),)
-   ifeq ($(filter $(HB_COMPILER),watcom bcc pocc pocc64 poccarm msvcia64),)
-      ifneq ($(HB_WITH_QT),no)
-
-         HB_INC_DEPEND := -I$(TOP)$(ROOT)contrib/hbqt
-
-         include $(TOP)$(ROOT)config/header.mk
-         include $(TOP)$(ROOT)config/lib.mk
-      else
-         HB_SKIP_REASON := component explicitly disabled
-         include $(TOP)$(ROOT)config/none.mk
-      endif
-   else
-      HB_SKIP_REASON := compiler not supported
-      include $(TOP)$(ROOT)config/none.mk
-   endif
-else
-   HB_SKIP_REASON := platform not supported
-   include $(TOP)$(ROOT)config/none.mk
-endif
--- a/harbour/contrib/hbxpp/Makefile
+++ b/harbour/contrib/hbxpp/Makefile
@@ -1,50 +0,0 @@
-#
-# $Id$
-#
-
-ROOT := ../../
-
-include $(TOP)$(ROOT)config/global.mk
-
-LIBNAME := hbxpp
-
-C_SOURCES := \
-   binnumx.c \
-   dbcmdx.c \
-   dbdetacx.c \
-   dllx.c \
-   idlex.c \
-   mousex.c \
-   oemansix.c \
-   philesx.c \
-   pvalue.c \
-   wafuncx.c \
-   xppopc.c \
-
-PRG_SOURCES := \
-   browdbx.prg \
-   dbfuncsx.prg \
-   dbjoinx.prg \
-   dblistx.prg \
-   dbsortx.prg \
-   dbstruxx.prg \
-   dbtotalx.prg \
-   dbupdatx.prg \
-   runshell.prg \
-   tbcolumx.prg \
-   tbrowsex.prg \
-   tgetx.prg \
-   thfuncx.prg \
-   tthreadx.prg \
-   typefilx.prg \
-   xppop.prg \
-
-PRG_HEADERS := \
-   dll.ch \
-   dmlb.ch \
-   hbxpp.ch \
-   hbxppext.ch \
-   thread.ch \
-
-include $(TOP)$(ROOT)config/header.mk
-include $(TOP)$(ROOT)config/lib.mk
--- a/harbour/contrib/hbziparc/Makefile
+++ b/harbour/contrib/hbziparc/Makefile
@@ -1,14 +0,0 @@
-#
-# $Id$
-#
-
-ROOT := ../../
-
-LIBNAME := hbziparc
-
-PRG_SOURCES := \
-   hbziparc.prg \
-
-HB_INC_DEPEND := -I$(TOP)$(ROOT)contrib/hbmzip
-
-include $(TOP)$(ROOT)config/lib.mk
--- a/harbour/contrib/make.hbs
+++ b/harbour/contrib/make.hbs
@@ -41,19 +41,19 @@
        and local projects)
     7. 'install' is ignored in stdalone mode. It would be needed to
        replicate the install dir defaulting logic found in global.mk
+        to implement it.
     8. Delete header install related logic from GNU Make system,
-        also delete doc install related logic (easily replacable
+        also delete doc/*.txt install related logic (easily replacable
        with postinst.hbs logic)
-     9. Delete Makefiles in contrib area.
-    10. Move some logic to hbmk2.
-    11. Honor paths found in --hbinfo hbctree{{}} section.
+     9. Move some logic to hbmk2.
+    10. Honor paths found in --hbinfo hbctree{{}} section.
 */

 #pragma warninglevel=3

 /* ----------------------------------------------------------------------- */

-STATIC s_hDirList := {;
+STATIC s_hPackageList := {;
   "gtalleg"       => { "gtalleg.hbp", "gtallegs.hbp" },;
   "gtwvg"         => { "gtwvg.hbp"                   },;
   "hbblat"        => { "hbblat.hbp"                  },;
@@ -101,7 +101,7 @@ STATIC s_hDirList := {;
   "sddoci"        => { "sddoci.hbp"                  },;
   "sddodbc"       => { "sddodbc.hbp"                 },;
   "sddpg"         => { "sddpg.hbp"                   },;
-   "sddsqlt3"      => { "sddsqlt3.hbp"                },;
+   "sddsqlt3"      => { "sddsqlt3.hbp"                },; /* uses: sqlite3 (external) */
   "xhb"           => { "xhb.hbp"                     }}

 /* ----------------------------------------------------------------------- */
@@ -144,7 +144,7 @@ PROCEDURE Main( ... )

   /* Convert list of contribs */

-   FOR EACH aProject IN s_hDirList
+   FOR EACH aProject IN s_hPackageList
      FOR EACH tmp IN aProject
         tmp := { "cFileName" => tmp }
      NEXT
@@ -249,15 +249,15 @@ PROCEDURE Standalone( ... )
      IF ! Empty( aFileList )

         /* Add the project in current dir */
-         s_hDirList[ "." ] := {}
+         s_hPackageList[ "." ] := {}
         FOR EACH aFile IN aFileList
-            AAdd( s_hDirList[ "." ], { "cFileName" => aFile[ F_NAME ] } )
+            AAdd( s_hPackageList[ "." ], { "cFileName" => aFile[ F_NAME ] } )
         NEXT

         /* Query project information and dependencies and calculate build order */
         aPairList := {}

-         FOR EACH hProject IN s_hDirList[ "." ]
+         FOR EACH hProject IN s_hPackageList[ "." ]
            call_hbmk2_hbinfo( cBinDir, s_cBase + "." + "/" + hProject[ "cFileName" ], hProject )
            DeptLinesToDeptPairList( aPairList, ".", hProject[ "aDept" ] )
         NEXT
@@ -266,15 +266,12 @@ PROCEDURE Standalone( ... )

         /* Build the dependencies and ourselves in in sorted order */
         FOR EACH cDir IN aSortedList DESCEND
-            FOR EACH hProject IN s_hDirList[ cDir ]
+            FOR EACH hProject IN s_hPackageList[ cDir ]
               IF cDir == "." .AND. hProject[ "cType" ] $ "hbhrb|hbppo"
                  LOOP
               ENDIF
               cProject := s_cBase + iif( cDir == ".", "", s_cHome ) + cDir + "/" + hProject[ "cFileName" ]
               call_hbmk2( cBinDir, cProject, iif( cDir == ".", cOptions + cOptionsUser, "" ), "" )
-//             IF hb_FileExists( PathSepToSelf( FNameExtSet( cProject, ".hbi" ) ) )
-//                call_hbmk2( cBinDir, s_cBase + FNameExtSet( cProject, ".hbi" ), iif( cDir == ".", cOptions + cOptionsUser, "" ), "" )
-//             ENDIF
            NEXT
         NEXT
      ENDIF
@@ -347,7 +344,7 @@ PROCEDURE GNUMake( ... )
   FOR EACH cItem IN hb_ATokens( GetEnv( "HB_BUILD_ADDONS" ),, .T. )
      IF ! Empty( cItem )
         hb_FNameSplit( PathSepToSelf( cItem ), @cDir, @cName )
-         s_hDirList[ StrTran( DirDelPathSep( cDir ), "\", "/" ) ] := { "cFileName" => cName }
+         s_hPackageList[ StrTran( DirDelPathSep( cDir ), "\", "/" ) ] := { "cFileName" => cName }
         lAnyAddons := .T.
      ENDIF
   NEXT
@@ -412,11 +409,11 @@ PROCEDURE GNUMake( ... )

   cBinDir := GetEnv( "HB_HOST_BIN_DIR" ) + hb_ps()

-   OutStd( "! Calculating sorting order for contribs..." + hb_eol() )
+   OutStd( "! Calculating sorting order for contrib packages..." + hb_eol() )

   aPairList := {}

-   FOR EACH aProject IN s_hDirList
+   FOR EACH aProject IN s_hPackageList
      FOR EACH hProject IN aProject
         call_hbmk2_hbinfo( cBinDir, s_cBase + aProject:__enumKey() + "/" + hProject[ "cFileName" ], hProject )
         DeptLinesToDeptPairList( aPairList, aProject:__enumKey(), hProject[ "aDept" ] )
@@ -449,7 +446,7 @@ PROCEDURE GNUMake( ... )
   OutStd( hb_StrFormat( "! Contribs %1$s...", hActions[ nAction ] ) + hb_eol() )

   FOR EACH cDir IN aSortedList DESCEND
-      FOR EACH hProject IN s_hDirList[ cDir ]
+      FOR EACH hProject IN s_hPackageList[ cDir ]

         cProject := s_cBase + cDir + "/" + hProject[ "cFileName" ]

@@ -464,10 +461,6 @@ PROCEDURE GNUMake( ... )

            call_hbmk2( cBinDir, cProject, cOptions, "" )

-//          IF hb_FileExists( PathSepToSelf( FNameExtSet( cProject, ".hbi" ) ) )
-//             call_hbmk2( cBinDir, FNameExtSet( cProject, ".hbi" ), cOptions, "" )
-//          ENDIF
-
            /* Highly experimental */
            IF hProject[ "cType" ] == "hblib" .AND. ;
               GetEnv( "HB_BUILD_CONTRIB_DLL" ) == "yes" .AND. ;
@@ -489,9 +482,9 @@ PROCEDURE GNUMake( ... )

   OutStd( hb_eol() )
   IF lAnyAddons
-      OutStd( "! Building of contribs and addons finished." + hb_eol() )
+      OutStd( "! Building of contrib and addon packages finished." + hb_eol() )
   ELSE
-      OutStd( "! Building of contribs finished." + hb_eol() )
+      OutStd( "! Building of contrib packages finished." + hb_eol() )
   ENDIF

   ErrorLevel( 0 )
--- a/harbour/contrib/rddads/Makefile
+++ b/harbour/contrib/rddads/Makefile
@@ -1,40 +0,0 @@
-#
-# $Id$
-#
-
-ROOT := ../../
-
-include $(TOP)$(ROOT)config/global.mk
-
-LIBNAME := rddads
-
-C_SOURCES := \
-   ads1.c \
-   adsfunc.c \
-   adsmgmnt.c \
-   adsx.c \
-
-PRG_HEADERS := \
-   ads.ch \
-   adsextrn.ch \
-
-_DET_DSP_NAME := ads
-_DET_VAR_INC_ := HB_INC_ADS
-_DET_VAR_HAS_ := HB_HAS_ADS
-_DET_FLT_PLAT := !dos !os2
-_DET_FLT_COMP :=
-_DET_INC_DEFP := /usr/local/ads/acesdk $(HOME)/ads/acesdk
-_DET_INC_HEAD := /ace.h
-include $(TOP)$(ROOT)config/detfun.mk
-
-ifneq ($(HB_HAS_ADS),)
-
-   HB_CFLAGS += $(foreach d,$(HB_HAS_ADS),-I$(d))
-
-   include $(TOP)$(ROOT)config/header.mk
-   include $(TOP)$(ROOT)config/lib.mk
-
-else
-   HB_SKIP_REASON := $(_DET_RES_TEXT)
-   include $(TOP)$(ROOT)config/none.mk
-endif
--- a/harbour/contrib/rddads/rddads.hbi
+++ b/harbour/contrib/rddads/rddads.hbi
@@ -1,11 +0,0 @@
-#
-# $Id$
-#
-
-hbimplib
-
-stop{!HB_WITH_ADS}
-
-${HB_WITH_ADS}/Redistribute/ace32.dll
-${HB_WITH_ADS}/ace32.dll
-${HB_WITH_ADS}/32bit/ace32.dll
--- a/harbour/contrib/rddbmcdx/Makefile
+++ b/harbour/contrib/rddbmcdx/Makefile
@@ -1,13 +0,0 @@
-#
-# $Id$
-#
-
-ROOT := ../../
-
-C_SOURCES := \
-   bmdbfcdx.c \
-   bmsixcdx.c
-
-LIBNAME := rddbmcdx
-
-include $(TOP)$(ROOT)config/lib.mk
--- a/harbour/contrib/rddsql/Makefile
+++ b/harbour/contrib/rddsql/Makefile
@@ -1,17 +0,0 @@
-#
-# $Id$
-#
-
-ROOT := ../../
-
-LIBNAME := rddsql
-
-C_SOURCES := \
-   sqlbase.c \
-   sqlmix.c \
-
-PRG_HEADERS := \
-   hbrddsql.ch \
-
-include $(TOP)$(ROOT)config/header.mk
-include $(TOP)$(ROOT)config/lib.mk
--- a/harbour/contrib/sddfb/Makefile
+++ b/harbour/contrib/sddfb/Makefile
@@ -1,30 +0,0 @@
-#
-# $Id$
-#
-
-ROOT := ../../
-
-include $(TOP)$(ROOT)config/global.mk
-
-LIBNAME := sddfb
-
-C_SOURCES := \
-   sddfb.c \
-
-_DET_DSP_NAME := firebird
-_DET_VAR_INC_ := HB_INC_FIREBIRD
-_DET_VAR_HAS_ := HB_HAS_FIREBIRD
-_DET_FLT_PLAT :=
-_DET_FLT_COMP := !pocc64 !poccarm
-_DET_INC_DEFP := /usr/include /opt/firebird/include /Library/Frameworks/Firebird.framework/Headers
-_DET_INC_HEAD := /ibase.h
-include $(TOP)$(ROOT)config/detfun.mk
-
-ifneq ($(HB_HAS_FIREBIRD),)
-   HB_INC_DEPEND := -I$(TOP)$(ROOT)contrib/rddsql
-   HB_CFLAGS += $(foreach d,$(HB_HAS_FIREBIRD),-I$(d))
-   include $(TOP)$(ROOT)config/lib.mk
-else
-   HB_SKIP_REASON := $(_DET_RES_TEXT)
-   include $(TOP)$(ROOT)config/none.mk
-endif
--- a/harbour/contrib/sddfb/sddfb.hbi
+++ b/harbour/contrib/sddfb/sddfb.hbi
@@ -1,12 +0,0 @@
-#
-# $Id$
-#
-
-hbimplib
-
-stop{!HB_WITH_FIREBIRD}
-
-ofbclient
-
-{!(allgcc|allmsvc|allpocc)}${HB_WITH_FIREBIRD}/../bin/fbclient.dll
-{allgcc|allmsvc|allpocc}${HB_WITH_FIREBIRD}/../lib/fbclient_ms.lib
--- a/harbour/contrib/sddmy/Makefile
+++ b/harbour/contrib/sddmy/Makefile
@@ -1,30 +0,0 @@
-#
-# $Id$
-#
-
-ROOT := ../../
-
-include $(TOP)$(ROOT)config/global.mk
-
-LIBNAME := sddmy
-
-C_SOURCES := \
-   sddmy.c \
-
-_DET_DSP_NAME := mysql
-_DET_VAR_INC_ := HB_INC_MYSQL
-_DET_VAR_HAS_ := HB_HAS_MYSQL
-_DET_FLT_PLAT :=
-_DET_FLT_COMP :=
-_DET_INC_DEFP := /usr/include/mysql /opt/local/include/mysql5/mysql
-_DET_INC_HEAD := /mysql.h
-include $(TOP)$(ROOT)config/detfun.mk
-
-ifneq ($(HB_HAS_MYSQL),)
-   HB_INC_DEPEND := -I$(TOP)$(ROOT)contrib/rddsql
-   HB_CFLAGS += $(foreach d,$(HB_HAS_MYSQL),-I$(d))
-   include $(TOP)$(ROOT)config/lib.mk
-else
-   HB_SKIP_REASON := $(_DET_RES_TEXT)
-   include $(TOP)$(ROOT)config/none.mk
-endif
--- a/harbour/contrib/sddmy/sddmy.hbi
+++ b/harbour/contrib/sddmy/sddmy.hbi
@@ -1,9 +0,0 @@
-#
-# $Id$
-#
-
-hbimplib
-
-stop{!HB_WITH_MYSQL}
-
-${HB_WITH_MYSQL}/../lib/opt/libmySQL.dll
--- a/harbour/contrib/sddoci/Makefile
+++ b/harbour/contrib/sddoci/Makefile
@@ -1,45 +0,0 @@
-#
-# $Id$
-#
-
-ROOT := ../../
-
-include $(TOP)$(ROOT)config/global.mk
-
-LIBNAME := sddoci
-
-C_SOURCES := \
-   sddoci.c \
-
-_DET_DSP_NAME := ocilib
-_DET_VAR_INC_ := HB_INC_OCILIB
-_DET_VAR_HAS_ := HB_HAS_OCILIB
-_DET_FLT_PLAT := !dos !os2 !wce
-_DET_FLT_COMP :=
-_DET_INC_DEFP := /usr/include /usr/local/include
-_DET_INC_HEAD := /ocilib.h
-include $(TOP)$(ROOT)config/detfun.mk
-
-ifneq ($(HB_HAS_OCILIB),)
-   HB_INC_DEPEND := -I$(TOP)$(ROOT)contrib/rddsql
-   HB_CFLAGS += $(foreach d,$(HB_HAS_OCILIB),-I$(d))
-   # Using prebuilt static libs with MinGW
-   ifeq ($(HB_COMPILER),mingw)
-      HB_CFLAGS += -DOCI_API=_stdcall
-   endif
-   # Required to link against generated implib
-   ifeq ($(HB_COMPILER),bcc)
-      HB_CFLAGS += -DOCI_API=_stdcall
-   endif
-   ifneq ($(HB_WITH_OCILIB_WIDE),)
-      HB_CFLAGS += -DOCI_CHARSET_UNICODE -DOCI_CHARSET_WIDE
-   else
-   ifneq ($(HB_WITH_OCILIB_MIXED),)
-      HB_CFLAGS += -DOCI_CHARSET_MIXED
-   endif
-   endif
-   include $(TOP)$(ROOT)config/lib.mk
-else
-   HB_SKIP_REASON := $(_DET_RES_TEXT)
-   include $(TOP)$(ROOT)config/none.mk
-endif
--- a/harbour/contrib/sddoci/sddoci.hbi
+++ b/harbour/contrib/sddoci/sddoci.hbi
@@ -1,11 +0,0 @@
-#
-# $Id$
-#
-
-hbimplib
-
-stop{!HB_WITH_OCILIB}
-
-${HB_WITH_OCILIB}/../lib32/ociliba.dll
-${HB_WITH_OCILIB}/../lib32/ocilibm.dll
-${HB_WITH_OCILIB}/../lib32/ocilibw.dll
--- a/harbour/contrib/sddodbc/Makefile
+++ b/harbour/contrib/sddodbc/Makefile
@@ -1,37 +0,0 @@
-#
-# $Id$
-#
-
-ROOT := ../../
-
-include $(TOP)$(ROOT)config/global.mk
-
-LIBNAME := sddodbc
-
-C_SOURCES := \
-   sddodbc.c \
-
-ifneq ($(filter $(HB_PLATFORM),win wce),)
-   HB_INC_ODBC := force
-   ifeq ($(HB_COMPILER),msvcarm)
-      HB_INC_ODBC :=
-   endif
-endif
-
-_DET_DSP_NAME := odbc
-_DET_VAR_INC_ := HB_INC_ODBC
-_DET_VAR_HAS_ := HB_HAS_ODBC
-_DET_FLT_PLAT := !dos !os2
-_DET_FLT_COMP := !rsxnt
-_DET_INC_DEFP := /usr/include /usr/local/include
-_DET_INC_HEAD := /sql.h
-include $(TOP)$(ROOT)config/detfun.mk
-
-ifneq ($(HB_HAS_ODBC),)
-   HB_INC_DEPEND := -I$(TOP)$(ROOT)contrib/rddsql
-   HB_CFLAGS += $(foreach d,$(HB_HAS_ODBC),-I$(d))
-   include $(TOP)$(ROOT)config/lib.mk
-else
-   HB_SKIP_REASON := $(_DET_RES_TEXT)
-   include $(TOP)$(ROOT)config/none.mk
-endif
--- a/harbour/contrib/sddpg/Makefile
+++ b/harbour/contrib/sddpg/Makefile
@@ -1,31 +0,0 @@
-#
-# $Id$
-#
-
-ROOT := ../../
-
-include $(TOP)$(ROOT)config/global.mk
-
-LIBNAME := sddpg
-
-C_SOURCES := \
-   sddpg.c \
-
-_DET_DSP_NAME := postgresql
-_DET_VAR_INC_ := HB_INC_PGSQL
-_DET_VAR_HAS_ := HB_HAS_PGSQL
-_DET_FLT_PLAT :=
-_DET_FLT_COMP :=
-_DET_INC_DEFP := /usr/include /usr/local/pgsql/include /usr/local/pgsql/include/libpq
-_DET_INC_DEFP += /usr/include/pgsql /usr/include/postgresql /postgres/include /opt/local/include/postgresql84 /opt/local/include/postgresql83
-_DET_INC_HEAD := /libpq-fe.h
-include $(TOP)$(ROOT)config/detfun.mk
-
-ifneq ($(HB_HAS_PGSQL),)
-   HB_INC_DEPEND := -I$(TOP)$(ROOT)contrib/rddsql
-   HB_CFLAGS += $(foreach d,$(HB_HAS_PGSQL),-I$(d))
-   include $(TOP)$(ROOT)config/lib.mk
-else
-   HB_SKIP_REASON := $(_DET_RES_TEXT)
-   include $(TOP)$(ROOT)config/none.mk
-endif
--- a/harbour/contrib/sddpg/sddpg.hbi
+++ b/harbour/contrib/sddpg/sddpg.hbi
@@ -1,11 +0,0 @@
-#
-# $Id$
-#
-
-hbimplib
-
-stop{!HB_WITH_PGSQL}
-
-${HB_WITH_PGSQL}/../lib/libpq.dll
-
-iflag={bcc}-a
--- a/harbour/contrib/sddsqlt3/Makefile
+++ b/harbour/contrib/sddsqlt3/Makefile
@@ -1,32 +0,0 @@
-#
-# $Id$
-#
-
-ROOT := ../../
-
-include $(TOP)$(ROOT)config/global.mk
-
-LIBNAME := sddsqlt3
-
-C_SOURCES := \
-   sddsqlt3.c \
-
-_DET_DSP_NAME := sqlite3
-_DET_VAR_INC_ := HB_INC_SQLITE3
-_DET_VAR_HAS_ := HB_HAS_SQLITE3
-_DET_FLT_PLAT :=
-_DET_FLT_COMP :=
-_DET_INC_DEFP := /usr/include /boot/common/include
-_DET_INC_LOCL := external/sqlite3
-_DET_INC_HEAD := /sqlite3.h
-include $(TOP)$(ROOT)config/detfun.mk
-
-ifneq ($(HB_HAS_SQLITE3),)
-   HB_INC_DEPEND := -I$(TOP)$(ROOT)contrib/rddsql
-   HB_CFLAGS += $(foreach d,$(HB_HAS_SQLITE3),-I$(d))
-   include $(TOP)$(ROOT)config/header.mk
-   include $(TOP)$(ROOT)config/lib.mk
-else
-   HB_SKIP_REASON := $(_DET_RES_TEXT)
-   include $(TOP)$(ROOT)config/none.mk
-endif
--- a/harbour/contrib/xhb/Makefile
+++ b/harbour/contrib/xhb/Makefile
@@ -1,105 +0,0 @@
-#
-# $Id$
-#
-
-ROOT := ../../
-
-include $(TOP)$(ROOT)config/global.mk
-
-LIBNAME := xhb
-
-C_SOURCES := \
-   bkgtsks.c \
-   cstructc.c \
-   datesxhb.c \
-   dbf2txt.c \
-   dbgfxc.c \
-   filestat.c \
-   fparse.c \
-   freadlin.c \
-   hbcrypt.c \
-   hboutdbg.c \
-   hbserv.c \
-   hbsyslog.c \
-   hbxml.c \
-   txtline.c \
-   xhbarr.c \
-   xhbat.c \
-   xhbcopyf.c \
-   xhbdate.c \
-   xhbenum.c \
-   xhberrc.c \
-   xhbfs.c \
-   xhbfunc.c \
-   xhbgt.c \
-   xhbhash.c \
-   xhbhasha.c \
-   xhbhashp.c \
-   xhbi18n.c \
-   xhbinet.c \
-   xhbini.c \
-   xhbis.c \
-   xhbmsgs.c \
-   xhbmtc.c \
-   xhbqself.c \
-   xhbproc.c \
-   xhbregx.c \
-   xhbsave.c \
-   xhbscr.c \
-   xhbtrim.c \
-   xhbwith.c \
-   xstrdel.c \
-   xwin_reg.c \
-   xwin_ver.c \
-
-C_HEADERS := \
-   hbcompat.h \
-   xhb.h \
-
-PRG_SOURCES := \
-   arrayblk.prg \
-   cstruct.prg \
-   dbgfx.prg \
-   decode.prg \
-   dirrec.prg \
-   diskhb.prg \
-   dumpvar.prg \
-   hbcomprs.prg \
-   hblog.prg \
-   hblognet.prg \
-   hbstruct.prg \
-   regexrpl.prg \
-   sprintf.prg \
-   stream.prg \
-   traceprg.prg \
-   trpc.prg \
-   trpccli.prg \
-   ttable.prg \
-   txml.prg \
-   xcstr.prg \
-   xdbmodst.prg \
-   xhbcomp.prg \
-   xhberr.prg \
-   xhbfunp.prg \
-   xhbinkey.prg \
-   xhbmt.prg \
-   xhbver.prg \
-   xthrow.prg \
-   xhw32prn.prg \
-   \
-   hjwindow.prg \
-   hterrsys.prg \
-   htjlist.prg \
-   htmutil.prg \
-   tcgi.prg \
-   tedit.prg \
-   tfile.prg \
-   tframe.prg \
-   thtm.prg \
-
-PRG_HEADERS := \
-   hbcompat.ch \
-   xhb.ch \
-
-include $(TOP)$(ROOT)config/header.mk
-include $(TOP)$(ROOT)config/lib.mk
--- a/harbour/package/winuni/mpkg_win_uni_extra_copy.bat
+++ b/harbour/package/winuni/mpkg_win_uni_extra_copy.bat
@@ -60,10 +60,8 @@ cd ..\..\contrib
 for /F %%a in ( 'dir /b /ad' ) do (
   echo %%a
   xcopy /y /s %%a\*.hbc     F:\hb\hb21\contrib\%%a\
-   xcopy /y /s %%a\*.hbi     F:\hb\hb21\contrib\%%a\
   xcopy /y /s %%a\*.def     F:\hb\hb21\contrib\%%a\
   xcopy /y /s %%a\tests\*.* F:\hb\hb21\contrib\%%a\tests\
-   xcopy /y /s %%a\utils\*.* F:\hb\hb21\contrib\%%a\utils\
 )

 popd