From fbbbe2652131b10059177445867cc0f41ad62381 Mon Sep 17 00:00:00 2001 From: "Gonzalo A. Diethelm" Date: Thu, 29 Jul 1999 20:08:36 +0000 Subject: [PATCH] ChangeLogTag:Thu Jul 29 15:58:44 1999 Gonzalo A. Diethelm --- harbour/ChangeLog | 21 +++++++++++++++++++++ harbour/config/dos/djgpp.cf | 12 ++++-------- harbour/config/global.cf | 4 ++++ harbour/config/linux/gcc.cf | 12 ++++-------- harbour/config/os2/gcc.cf | 8 ++------ harbour/config/win32/gcc.cf | 14 +++++--------- harbour/config/win32/msvc.cf | 14 +++++--------- harbour/source/rdd/Makefile | 4 ++-- harbour/source/rdd/nulsys/Makefile | 14 ++++++++++++++ 9 files changed, 61 insertions(+), 42 deletions(-) create mode 100644 harbour/source/rdd/nulsys/Makefile diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 42bcf9ede2..02766ac045 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,3 +1,24 @@ +Thu Jul 29 15:58:44 1999 Gonzalo A. Diethelm + + * source/rdd/Makefile: + * source/rdd/nulsys/Makefile: + Bruno Cantero pointed out that a user may use all of the DB + drivers simultaneously, so I got rid of the environment variable + and made sure all of the valid DB drivers are linked against the + application. On of the valid drivers is nulsys. + + * config/global.cf: + Now a list of all the valid DB drivers is stored in + HB_DB_DRIVERS. + + * config/dos/djgpp.cf: + * config/linux/gcc.cf: + * config/os2/gcc.cf: + * config/win32/gcc.cf: + * config/win32/msvc.cf: + Deleted support for environment variable HB_DB_DRIVER. + Added support for make variable HB_DB_DRIVERS. + Thu Jul 29 14:46:51 1999 Gonzalo A. Diethelm * source/rdd/Makefile: diff --git a/harbour/config/dos/djgpp.cf b/harbour/config/dos/djgpp.cf index b27efd531d..851bb2c028 100644 --- a/harbour/config/dos/djgpp.cf +++ b/harbour/config/dos/djgpp.cf @@ -18,20 +18,16 @@ CFLAGS = -Wall -g LD = gcc LD_OUT = -o ifeq ($(HB_LIB_COMPILE),) -LINKPATHS = $(foreach lib, $(LIBS), -L$(TOP)$(ROOT)source/$(lib)/$(ARCH)) +LINKPATHS += $(foreach lib, $(LIBS), -L$(TOP)$(ROOT)source/$(lib)/$(ARCH)) else -LINKPATHS = -L$(HB_LIB_COMPILE) +LINKPATHS += -L$(HB_LIB_COMPILE) endif -ifneq ($(HB_DB_DRIVER),) -LINKPATHS += -L$(TOP)$(ROOT)source/rdd/$(HB_DB_DRIVER)/$(ARCH) +LINKPATHS += $(foreach drv, $(HB_DB_DRIVERS), -L$(TOP)$(ROOT)source/rdd/$(drv)/$(ARCH)) LINKPATHS += -L$(TOP)$(ROOT)source/rdd/$(ARCH) -endif LINKLIBS = $(foreach lib, $(LIBS), -l$(lib)) -ifneq ($(HB_DB_DRIVER),) -LINKLIBS += -l$(HB_DB_DRIVER) +LINKLIBS += $(foreach drv, $(HB_DB_DRIVERS), -l$(drv)) LINKLIBS += -lrdd -endif LDFLAGS = $(LINKPATHS) diff --git a/harbour/config/global.cf b/harbour/config/global.cf index d364b18d4b..3617905e36 100644 --- a/harbour/config/global.cf +++ b/harbour/config/global.cf @@ -5,6 +5,10 @@ GRANDP = ../../ ARCH := $(HB_ARCHITECTURE)/$(HB_COMPILER) +HB_DB_DRIVERS=\ + nulsys \ + dbfntx \ + ifeq ($(HB_BIN_COMPILE),) HB_BIN_COMPILE := $(TOP)$(ROOT)source/compiler/$(ARCH) endif diff --git a/harbour/config/linux/gcc.cf b/harbour/config/linux/gcc.cf index 8774e58bc3..1adcfbae89 100644 --- a/harbour/config/linux/gcc.cf +++ b/harbour/config/linux/gcc.cf @@ -18,20 +18,16 @@ CFLAGS = -Wall -g LD = gcc LD_OUT = -o ifeq ($(HB_LIB_COMPILE),) -LINKPATHS = $(foreach lib, $(LIBS), -L$(TOP)$(ROOT)source/$(lib)/$(ARCH)) +LINKPATHS += $(foreach lib, $(LIBS), -L$(TOP)$(ROOT)source/$(lib)/$(ARCH)) else -LINKPATHS = -L$(HB_LIB_COMPILE) +LINKPATHS += -L$(HB_LIB_COMPILE) endif -ifneq ($(HB_DB_DRIVER),) -LINKPATHS += -L$(TOP)$(ROOT)source/rdd/$(HB_DB_DRIVER)/$(ARCH) +LINKPATHS += $(foreach drv, $(HB_DB_DRIVERS), -L$(TOP)$(ROOT)source/rdd/$(drv)/$(ARCH)) LINKPATHS += -L$(TOP)$(ROOT)source/rdd/$(ARCH) -endif LINKLIBS = $(foreach lib, $(LIBS), -l$(lib)) -ifneq ($(HB_DB_DRIVER),) -LINKLIBS += -l$(HB_DB_DRIVER) +LINKLIBS += $(foreach drv, $(HB_DB_DRIVERS), -l$(drv)) LINKLIBS += -lrdd -endif LINKLIBS += -lm LDFLAGS = $(LINKPATHS) diff --git a/harbour/config/os2/gcc.cf b/harbour/config/os2/gcc.cf index 78ad12281c..6cc01c881d 100644 --- a/harbour/config/os2/gcc.cf +++ b/harbour/config/os2/gcc.cf @@ -22,16 +22,12 @@ LINKPATHS = $(foreach lib, $(LIBS), -L$(TOP)$(ROOT)source/$(lib)/$(ARCH)) else LINKPATHS = -L$(HB_LIB_COMPILE) endif -ifneq ($(HB_DB_DRIVER),) -LINKPATHS += -L$(TOP)$(ROOT)source/rdd/$(HB_DB_DRIVER)/$(ARCH) +LINKPATHS += $(foreach drv, $(HB_DB_DRIVERS), -L$(TOP)$(ROOT)source/rdd/$(drv)/$(ARCH)) LINKPATHS += -L$(TOP)$(ROOT)source/rdd/$(ARCH) -endif LINKLIBS = $(foreach lib, $(LIBS), -l$(lib)) -ifneq ($(HB_DB_DRIVER),) -LINKLIBS += -l$(HB_DB_DRIVER) +LINKLIBS += $(foreach drv, $(HB_DB_DRIVERS), -l$(drv)) LINKLIBS += -lrdd -endif LDFLAGS = $(LINKPATHS) diff --git a/harbour/config/win32/gcc.cf b/harbour/config/win32/gcc.cf index 72c53ad6b0..fd5ffce71b 100644 --- a/harbour/config/win32/gcc.cf +++ b/harbour/config/win32/gcc.cf @@ -18,20 +18,16 @@ CFLAGS = -Wall -g LD = gcc LD_OUT = -o ifeq ($(HB_LIB_COMPILE),) -LINKPATHS = $(foreach lib, $(LIBS), -L$(TOP)$(ROOT)source/$(lib)/$(ARCH)) +LINKPATHS += $(foreach lib, $(LIBS), -L$(TOP)$(ROOT)source/$(lib)/$(ARCH)) else -LINKPATHS = -L$(HB_LIB_COMPILE) +LINKPATHS += -L$(HB_LIB_COMPILE) endif -ifneq ($(HB_DB_DRIVER),) -LINKPATHS += -L$(TOP)$(ROOT)source/rdd/$(HB_DB_DRIVER)/$(ARCH) +LINKPATHS += $(foreach drv, $(HB_DB_DRIVERS), -L$(TOP)$(ROOT)source/rdd/$(drv)/$(ARCH)) LINKPATHS += -L$(TOP)$(ROOT)source/rdd/$(ARCH) -endif -LINKLIBS = $(foreach lib, $(LIBS), -l$(lib)) -ifneq ($(HB_DB_DRIVER),) -LINKLIBS += -l$(HB_DB_DRIVER) +LINKLIBS += $(foreach lib, $(LIBS), -l$(lib)) +LINKLIBS += $(foreach drv, $(HB_DB_DRIVERS), -l$(drv)) LINKLIBS += -lrdd -endif LDFLAGS = $(LINKPATHS) diff --git a/harbour/config/win32/msvc.cf b/harbour/config/win32/msvc.cf index 8d11a9009e..83d3d1edb5 100644 --- a/harbour/config/win32/msvc.cf +++ b/harbour/config/win32/msvc.cf @@ -18,20 +18,16 @@ CFLAGS = -W0 -Zi # -W4 for max warnings LD = cl.exe LD_OUT = -Fe ifeq ($(HB_LIB_COMPILE),) -LINKPATHS = -link $(foreach lib, $(LIBS), -LIBPATH:$(TOP)$(ROOT)source/$(lib)/$(ARCH)) +LINKPATHS += -link $(foreach lib, $(LIBS), -LIBPATH:$(TOP)$(ROOT)source/$(lib)/$(ARCH)) else -LINKPATHS = -link -LIBPATH:$(HB_LIB_COMPILE) +LINKPATHS += -link -LIBPATH:$(HB_LIB_COMPILE) endif -ifneq ($(HB_DB_DRIVER),) -LINKPATHS += -LIBPATH:$(TOP)$(ROOT)source/rdd/$(HB_DB_DRIVER)/$(ARCH) +LINKPATHS += $(foreach drv, $(HB_DB_DRIVERS), -LIBPATH:$(TOP)$(ROOT)source/rdd/$(drv)/$(ARCH)) LINKPATHS += -LIBPATH:$(TOP)$(ROOT)source/rdd/$(ARCH) -endif -LINKLIBS = $(foreach lib, $(LIBS), $(lib)$(LIB_EXT)) -ifneq ($(HB_DB_DRIVER),) -LINKLIBS += $(HB_DB_DRIVER)$(LIB_EXT) +LINKLIBS += $(foreach lib, $(LIBS), $(lib)$(LIB_EXT)) +LINKLIBS += $(foreach drv, $(HB_DB_DRIVERS), $(drv)$(LIB_EXT)) LINKLIBS += rdd$(LIB_EXT) -endif LDFLAGS = $(LINKPATHS) diff --git a/harbour/source/rdd/Makefile b/harbour/source/rdd/Makefile index 45574d73e7..49759b9b6d 100644 --- a/harbour/source/rdd/Makefile +++ b/harbour/source/rdd/Makefile @@ -14,8 +14,8 @@ PRG_SOURCES=\ LIB=rdd -DIRS=\ - dbfntx \ +# The list of all valid DB drivers is defined in config/global.cf. +DIRS=$(HB_DB_DRIVERS) include $(TOP)$(ROOT)config/lib.cf include $(TOP)$(ROOT)config/dir.cf diff --git a/harbour/source/rdd/nulsys/Makefile b/harbour/source/rdd/nulsys/Makefile new file mode 100644 index 0000000000..ee3bf4867a --- /dev/null +++ b/harbour/source/rdd/nulsys/Makefile @@ -0,0 +1,14 @@ +# +# $Id$ +# + +ROOT = ../../../ + +C_SOURCES=\ + +PRG_SOURCES=\ + nulsys.prg \ + +LIB=nulsys + +include $(TOP)$(ROOT)config/lib.cf