From 97e239dc739a7b8547b338ee73cd68f769a49f45 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Mon, 10 Aug 2009 22:45:34 +0000 Subject: [PATCH] 2009-08-11 00:45 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * source/rdd/Makefile * config/global.cf * config/bin.cf * Simple rename of two internal vars: HB_DB_DRIVERS -> HB_RDD_LIBS HB_DB_DIRS -> HB_RDD_DIRS + Added some names to non-standard build configuration setting collection. --- harbour/ChangeLog | 10 ++++++++++ harbour/config/bin.cf | 2 +- harbour/config/global.cf | 11 ++++++----- harbour/source/rdd/Makefile | 2 +- 4 files changed, 18 insertions(+), 7 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 6a9076df16..55e8639feb 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,16 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-08-11 00:45 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * source/rdd/Makefile + * config/global.cf + * config/bin.cf + * Simple rename of two internal vars: + HB_DB_DRIVERS -> HB_RDD_LIBS + HB_DB_DIRS -> HB_RDD_DIRS + + Added some names to non-standard build configuration setting + collection. + 2009-08-11 00:41 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * config/bin.cf * Minor formatting to liblist template. diff --git a/harbour/config/bin.cf b/harbour/config/bin.cf index 2c6f130945..543ea84807 100644 --- a/harbour/config/bin.cf +++ b/harbour/config/bin.cf @@ -36,7 +36,7 @@ ifeq ($(findstring -DHB_EXT_ZLIB, $(HB_USER_CFLAGS)),) endif # Create a few common core lib lists -_HB_RDD := hbrdd $(HB_DB_DRIVERS) +_HB_RDD := hbrdd $(HB_RDD_LIBS) _HB_VM := hbvm HB_LIBS_ST_RDD := $(HB_LIBS_TPL) _HB_VM := hbvmmt diff --git a/harbour/config/global.cf b/harbour/config/global.cf index b3e6266cbc..5d74de49b1 100644 --- a/harbour/config/global.cf +++ b/harbour/config/global.cf @@ -175,7 +175,8 @@ ifeq ($(HB_CONFIG_SHOWN),) ifneq ($(MAKE_381),) # Some additional ones to be given a standard name: - # HB_HOST_BUILD, HB_XBUILD, HB_WITHOUT_*, HB_REBUILD_PARSER + # HB_HOST_BUILD, HB_XBUILD, HB_WITHOUT_*, HB_REBUILD_PARSER, HB_DB_DRVEXT + # HB_COMMERCE, HB_CRS_LIB ifeq ($(HB_DYNLIB),yes) $(info ! Dynamic library creation phase) @@ -635,7 +636,7 @@ HB_GT_LIBS := \ gtstd \ # Names of valid RDD libraries -HB_DB_DRIVERS := \ +HB_RDD_LIBS := \ rddntx \ rddnsx \ rddcdx \ @@ -646,7 +647,7 @@ HB_DB_DRIVERS := \ hbuddall \ # Names of valid RDD subdirectories -HB_DB_DIRS := \ +HB_RDD_DIRS := \ dbfntx \ dbfnsx \ dbfcdx \ @@ -657,8 +658,8 @@ HB_DB_DIRS := \ usrrdd/rdds \ ifneq ($(HB_DB_DRVEXT),) - HB_DB_DRIVERS += $(HB_DB_DRVEXT) - HB_DB_DIRS += $(HB_DB_DRVEXT) + HB_RDD_LIBS += $(HB_DB_DRVEXT) + HB_RDD_DIRS += $(HB_DB_DRVEXT) endif ifneq ($(HB_INSTALL_PREFIX),) diff --git a/harbour/source/rdd/Makefile b/harbour/source/rdd/Makefile index ad664e9255..661630e3d5 100644 --- a/harbour/source/rdd/Makefile +++ b/harbour/source/rdd/Makefile @@ -56,7 +56,7 @@ PRG_SOURCES := \ LIBNAME := hbrdd # The list of all valid DB drivers is defined in config/global.cf. -DIRS = nulsys $(HB_DB_DIRS) +DIRS = nulsys $(HB_RDD_DIRS) include $(TOP)$(ROOT)config/lib.cf include $(TOP)$(ROOT)config/dir.cf