fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ChangeLogTag:Thu Jul 29 15:58:44 1999 Gonzalo A. Diethelm <Gonzalo.Diethelm@jda.cl>

Browse Source
This commit is contained in:
Gonzalo A. Diethelm
1999-07-29 20:08:36 +00:00
parent f2904c0c8f
commit fbbbe26521
9 changed files with 61 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
harbour/ChangeLog
View File

@@ -1,3 +1,24 @@
Thu Jul 29 15:58:44 1999 Gonzalo A. Diethelm <Gonzalo.Diethelm@jda.cl>
* 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 <Gonzalo.Diethelm@jda.cl>
* source/rdd/Makefile:

12
harbour/config/dos/djgpp.cf
View File

@@ -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)

4
harbour/config/global.cf
View File

@@ -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

12
harbour/config/linux/gcc.cf
View File

@@ -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)

8
harbour/config/os2/gcc.cf
View File

@@ -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)

14
harbour/config/win32/gcc.cf
View File

@@ -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)

14
harbour/config/win32/msvc.cf
View File

@@ -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)

4
harbour/source/rdd/Makefile
View File

@@ -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

14
harbour/source/rdd/nulsys/Makefile Normal file
View File

@@ -0,0 +1,14 @@
#
# $Id$
#
ROOT = ../../../
C_SOURCES=\
PRG_SOURCES=\
nulsys.prg \
LIB=nulsys
include $(TOP)$(ROOT)config/lib.cf