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

Thu Jul 29 14:46:51 1999 Gonzalo A. Diethelm <Gonzalo.Diethelm@jda.cl>

Browse Source
This commit is contained in:
Gonzalo A. Diethelm
1999-07-29 18:59:09 +00:00
parent 24a578e842
commit f2904c0c8f
15 changed files with 103 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
harbour/ChangeLog
View File

@@ -1,3 +1,32 @@
Thu Jul 29 14:46:51 1999 Gonzalo A. Diethelm <Gonzalo.Diethelm@jda.cl>
* source/rdd/Makefile:
* source/rdd/dbfntx/Makefile:
Now there is a subdirectory for each database driver. For now,
only dbfntx/ is supported. The Makefile in rdd/ walks into each
subdirectory.
* source/rdd/dbfntx0.prg:
* source/rdd/dbfntx1.c:
* source/rdd/dbfntx/dbfntx0.prg:
* source/rdd/dbfntx/dbfntx1.c:
Moved these files from rdd/ to rdd/dbfntx/.
* config/bin.cf:
* config/dir.cf:
* config/header.cf:
* config/lib.cf:
* config/test.cf:
* config/dos/djgpp.cf:
* config/linux/gcc.cf:
* config/os2/gcc.cf:
* config/win32/gcc.cf:
* config/win32/msvc.cf:
Added support for the new separate directories for the database
driver. The user must define an environment variable HB_DB_DRIVER
with the appropriate driver he wants to use. For example, defining
it to 'dbfntx' will pick up that driver.
19990729-18:39 CET Victor Szel <info@szelvesz.hu>
- source/rdd/dbcmd.c
now redundant declarations removed. (again)

2
harbour/config/bin.cf
View File

@@ -17,7 +17,7 @@ endif
ALL_OBJS = $(ALL_C_OBJS) $(ALL_PRG_OBJS)
first : dirbase descend
first:: dirbase descend
descend :
@$(MK) -C $(ARCH_DIR) -f $(GRANDP)Makefile 'TOP=$(GRANDP)' $(EXE_NAME)

2
harbour/config/dir.cf
View File

@@ -7,5 +7,5 @@ include $(TOP)$(ROOT)config/$(HB_ARCHITECTURE)/dir.cf
all : first
first clean install ::
first clean install::
$(DIR_RULE)

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

@@ -22,8 +22,17 @@ 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 += -L$(TOP)$(ROOT)source/rdd/$(ARCH)
endif
LINKLIBS = $(foreach lib, $(LIBS), -l$(lib))
# LINKLIBS += -lm
ifneq ($(HB_DB_DRIVER),)
LINKLIBS += -l$(HB_DB_DRIVER)
LINKLIBS += -lrdd
endif
LDFLAGS = $(LINKPATHS)
# Note: The empty line directly before 'endef' HAVE TO exist!

2
harbour/config/header.cf
View File

@@ -9,7 +9,7 @@ EXE_ARCH = $(ARCH_DIR)$(EXE_NAME)
ALL_HEADERS = $(C_HEADERS) $(PRG_HEADERS) $(API_HEADERS)
first :
first::
INSTALL_OBJS = $(ALL_HEADERS)
INSTALL_DIR = $(HB_INC_INSTALL)

2
harbour/config/lib.cf
View File

@@ -19,7 +19,7 @@ endif
ALL_OBJS = $(ALL_C_OBJS) $(ALL_PRG_OBJS)
first : dirbase descend
first:: dirbase descend
descend :
@$(MK) -C $(ARCH_DIR) -f $(GRANDP)Makefile 'TOP=$(GRANDP)' $(LIB_NAME)

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

@@ -22,8 +22,18 @@ 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 += -L$(TOP)$(ROOT)source/rdd/$(ARCH)
endif
LINKLIBS = $(foreach lib, $(LIBS), -l$(lib))
ifneq ($(HB_DB_DRIVER),)
LINKLIBS += -l$(HB_DB_DRIVER)
LINKLIBS += -lrdd
endif
LINKLIBS += -lm
LDFLAGS = $(LINKPATHS)
AR = ar

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

@@ -22,8 +22,17 @@ 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 += -L$(TOP)$(ROOT)source/rdd/$(ARCH)
endif
LINKLIBS = $(foreach lib, $(LIBS), -l$(lib))
# LINKLIBS += -lm
ifneq ($(HB_DB_DRIVER),)
LINKLIBS += -l$(HB_DB_DRIVER)
LINKLIBS += -lrdd
endif
LDFLAGS = $(LINKPATHS)
AR = ar

2
harbour/config/test.cf
View File

@@ -5,7 +5,7 @@
include $(TOP)$(ROOT)config/global.cf
include $(TOP)$(ROOT)config/prg.cf
first : dirbase ^^^d^e^s^c^e^n^d^^^
first:: dirbase ^^^d^e^s^c^e^n^d^^^
^^^d^e^s^c^e^n^d^^^ :
@$(MK) -C $(ARCH_DIR) -f $(GRANDP)Makefile 'TOP=$(GRANDP)' $(PRG_EXES)

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

@@ -22,8 +22,17 @@ 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 += -L$(TOP)$(ROOT)source/rdd/$(ARCH)
endif
LINKLIBS = $(foreach lib, $(LIBS), -l$(lib))
# LINKLIBS += -lm
ifneq ($(HB_DB_DRIVER),)
LINKLIBS += -l$(HB_DB_DRIVER)
LINKLIBS += -lrdd
endif
LDFLAGS = $(LINKPATHS)
AR = ar

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

@@ -22,8 +22,17 @@ LINKPATHS = -link $(foreach lib, $(LIBS), -LIBPATH:$(TOP)$(ROOT)source/$(lib)/$(
else
LINKPATHS = -link -LIBPATH:$(HB_LIB_COMPILE)
endif
ifneq ($(HB_DB_DRIVER),)
LINKPATHS += -LIBPATH:$(TOP)$(ROOT)source/rdd/$(HB_DB_DRIVER)/$(ARCH)
LINKPATHS += -LIBPATH:$(TOP)$(ROOT)source/rdd/$(ARCH)
endif
LINKLIBS = $(foreach lib, $(LIBS), $(lib)$(LIB_EXT))
# LINKLIBS += -lm
ifneq ($(HB_DB_DRIVER),)
LINKLIBS += $(HB_DB_DRIVER)$(LIB_EXT)
LINKLIBS += rdd$(LIB_EXT)
endif
LDFLAGS = $(LINKPATHS)
AR = lib.exe

6
harbour/source/rdd/Makefile
View File

@@ -7,13 +7,15 @@ ROOT = ../../
C_SOURCES=\
dbcmd.c \
dbf1.c \
dbfntx1.c \
PRG_SOURCES=\
dbf0.prg \
dbfntx0.prg \
rddsys.prg \
LIB=rdd
DIRS=\
dbfntx \
include $(TOP)$(ROOT)config/lib.cf
include $(TOP)$(ROOT)config/dir.cf

15
harbour/source/rdd/dbfntx/Makefile Normal file
View File

@@ -0,0 +1,15 @@
#
# $Id$
#
ROOT = ../../../
C_SOURCES=\
dbfntx1.c \
PRG_SOURCES=\
dbfntx0.prg \
LIB=dbfntx
include $(TOP)$(ROOT)config/lib.cf

0
harbour/source/rdd/dbfntx0.prg → harbour/source/rdd/dbfntx/dbfntx0.prg
View File

0
harbour/source/rdd/dbfntx1.c → harbour/source/rdd/dbfntx/dbfntx1.c
View File