2009-11-30 13:49 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)

* config/global.mk
  * config/bin.mk
  * src/rdd/Makefile
    * Moved central RDD related information to local makefiles.
    - Deleted support for $(HB_DB_DRVEXT) envvar.
      To extend Harbour with RDDs these should be added as
      regular addons, and optionally hbrun rebuilt using hbrun.hbp.
      [ $(HB_DB_DRVEXT) is still used from hbmk script, I didn't 
      touch that part. ]

  * INSTALL
    * Minor.

harbour/ChangeLog

@@ -17,6 +17,20 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-11-30 13:49 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * config/global.mk
+  * config/bin.mk
+  * src/rdd/Makefile
+    * Moved central RDD related information to local makefiles.
+    - Deleted support for $(HB_DB_DRVEXT) envvar.
+      To extend Harbour with RDDs these should be added as
+      regular addons, and optionally hbrun rebuilt using hbrun.hbp.
+      [ $(HB_DB_DRVEXT) is still used from hbmk script, I didn't
+      touch that part. ]
+
+  * INSTALL
+    * Minor.
+
 2009-11-30 12:03 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
   * utils/hbmk2/examples/xhgtk.hbc
     ! Minor correction to prev.

harbour/INSTALL

@@ -220,8 +220,7 @@ HARBOUR
    Binary .rpm on Linux
    --------------------
 
-      for native build:
-         $ ./mpkg_rpm.sh
+      $ ./mpkg_rpm.sh
 
       You can fine-tune the build with these options:
          --with static      - link all binaries with static libs

harbour/config/bin.mk

@@ -69,7 +69,17 @@ else
    endif
 
    # Create a few common core lib lists
-   _HB_RDD := hbrdd $(HB_RDD_LIBS)
+   _HB_RDD := \
+      hbrdd \
+      rddntx \
+      rddnsx \
+      rddcdx \
+      rddfpt \
+      hbsix \
+      hbhsx \
+      hbusrrdd \
+      hbuddall
+
    _HB_VM := hbvm
    HB_LIBS_ST_RDD := $(HB_LIBS_TPL)
    _HB_VM := hbvmmt

harbour/config/global.mk

@@ -249,7 +249,6 @@ ifeq ($(HB_INIT_DONE),)
    ifneq ($(MAKE_381),)
 
       # Some additional ones to be given a standard name:
-      #   HB_DB_DRVEXT                -> -
       #   HB_COMMERCE                 -> ?
       #   HB_BIN_COMPILE              -> HB_BUILD_BIN_DIR
       #   HB_INC_COMPILE              -> - (HB_BUILD_INC_DIR)
@@ -1135,33 +1134,6 @@ ifneq ($(HB_HAS_X11),)
    HB_GT_LIBS += gtxwc
 endif
 
-# Names of valid RDD libraries
-HB_RDD_LIBS := \
-   rddntx \
-   rddnsx \
-   rddcdx \
-   rddfpt \
-   hbsix \
-   hbhsx \
-   hbusrrdd \
-   hbuddall \
-
-# Names of valid RDD subdirectories
-HB_RDD_DIRS := \
-   dbfntx \
-   dbfnsx \
-   dbfcdx \
-   dbffpt \
-   hbsix \
-   hsx \
-   usrrdd \
-   usrrdd/rdds \
-
-ifneq ($(HB_DB_DRVEXT),)
-   HB_RDD_LIBS += $(HB_DB_DRVEXT)
-   HB_RDD_DIRS += $(HB_DB_DRVEXT)
-endif
-
 ifneq ($(HB_PLATFORM),dos)
    HB_VERSION := $(HB_VER_MAJOR).$(HB_VER_MINOR).$(HB_VER_RELEASE)$(HB_VER_STATUS)
    HB_PKGNAME := harbour-$(HB_VERSION)-$(HB_PLATFORM)-$(HB_COMPILER)

harbour/src/rdd/Makefile

@@ -56,8 +56,16 @@ PRG_SOURCES := \
 
 LIBNAME := hbrdd
 
-# The list of all valid DB drivers is defined in config/global.mk
-DIRS = nulsys $(HB_RDD_DIRS)
+DIRS = \
+   nulsys \
+   dbfntx \
+   dbfnsx \
+   dbfcdx \
+   dbffpt \
+   hbsix \
+   hsx \
+   usrrdd \
+   usrrdd/rdds \
 
 include $(TOP)$(ROOT)config/lib.mk
 include $(TOP)$(ROOT)config/dir.mk