From f53ae045aab3bc5c8e7345924bd7881388bb3045 Mon Sep 17 00:00:00 2001 From: "Gonzalo A. Diethelm" Date: Thu, 29 Jul 1999 20:24:46 +0000 Subject: [PATCH] ChangeLogTag:Thu Jul 29 16:17:09 1999 Gonzalo A. Diethelm --- harbour/ChangeLog | 12 ++++++++++++ harbour/config/dos/djgpp.cf | 11 +++++++---- harbour/config/linux/gcc.cf | 12 ++++++++---- harbour/config/os2/gcc.cf | 21 ++++++++++++--------- harbour/config/win32/gcc.cf | 11 +++++++---- harbour/config/win32/msvc.cf | 11 +++++++---- 6 files changed, 53 insertions(+), 25 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 02766ac045..0b9b35e871 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,3 +1,15 @@ +Thu Jul 29 16:17:09 1999 Gonzalo A. Diethelm + + * config/dos/djgpp.cf: + * config/linux/gcc.cf: + * config/os2/gcc.cf: + * config/win32/gcc.cf: + * config/win32/msvc.cf: + One more modification: the DB drivers must be linked against only + when the Makefile specifies linking against the rdd + library. Otherwise, other binaries such as the Harbour compiler + would try to link against the DB drivers. + Thu Jul 29 15:58:44 1999 Gonzalo A. Diethelm * source/rdd/Makefile: diff --git a/harbour/config/dos/djgpp.cf b/harbour/config/dos/djgpp.cf index 851bb2c028..785a675ab9 100644 --- a/harbour/config/dos/djgpp.cf +++ b/harbour/config/dos/djgpp.cf @@ -17,17 +17,20 @@ CFLAGS = -Wall -g LD = gcc LD_OUT = -o + +# Add all libraries specified in LIBS. ifeq ($(HB_LIB_COMPILE),) LINKPATHS += $(foreach lib, $(LIBS), -L$(TOP)$(ROOT)source/$(lib)/$(ARCH)) else LINKPATHS += -L$(HB_LIB_COMPILE) endif -LINKPATHS += $(foreach drv, $(HB_DB_DRIVERS), -L$(TOP)$(ROOT)source/rdd/$(drv)/$(ARCH)) -LINKPATHS += -L$(TOP)$(ROOT)source/rdd/$(ARCH) +LINKLIBS += $(foreach lib, $(LIBS), -l$(lib)) -LINKLIBS = $(foreach lib, $(LIBS), -l$(lib)) +# If LIBS specifies the rdd library, add all DB drivers. +ifeq ($(findstring rdd,$(LIBS)),rdd) +LINKPATHS += $(foreach drv, $(HB_DB_DRIVERS), -L$(TOP)$(ROOT)source/rdd/$(drv)/$(ARCH)) LINKLIBS += $(foreach drv, $(HB_DB_DRIVERS), -l$(drv)) -LINKLIBS += -lrdd +endif LDFLAGS = $(LINKPATHS) diff --git a/harbour/config/linux/gcc.cf b/harbour/config/linux/gcc.cf index 1adcfbae89..8cbdb168f9 100644 --- a/harbour/config/linux/gcc.cf +++ b/harbour/config/linux/gcc.cf @@ -17,17 +17,21 @@ CFLAGS = -Wall -g LD = gcc LD_OUT = -o + +# Add all libraries specified in LIBS. ifeq ($(HB_LIB_COMPILE),) LINKPATHS += $(foreach lib, $(LIBS), -L$(TOP)$(ROOT)source/$(lib)/$(ARCH)) else LINKPATHS += -L$(HB_LIB_COMPILE) endif -LINKPATHS += $(foreach drv, $(HB_DB_DRIVERS), -L$(TOP)$(ROOT)source/rdd/$(drv)/$(ARCH)) -LINKPATHS += -L$(TOP)$(ROOT)source/rdd/$(ARCH) +LINKLIBS += $(foreach lib, $(LIBS), -l$(lib)) -LINKLIBS = $(foreach lib, $(LIBS), -l$(lib)) +# If LIBS specifies the rdd library, add all DB drivers. +ifeq ($(findstring rdd,$(LIBS)),rdd) +LINKPATHS += $(foreach drv, $(HB_DB_DRIVERS), -L$(TOP)$(ROOT)source/rdd/$(drv)/$(ARCH)) 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 6cc01c881d..1cadc48f0f 100644 --- a/harbour/config/os2/gcc.cf +++ b/harbour/config/os2/gcc.cf @@ -17,17 +17,20 @@ CFLAGS = -Wall -g LD = gcc LD_OUT = -o $(SPACE) -ifeq ($(HB_LIB_COMPILE),) -LINKPATHS = $(foreach lib, $(LIBS), -L$(TOP)$(ROOT)source/$(lib)/$(ARCH)) -else -LINKPATHS = -L$(HB_LIB_COMPILE) -endif -LINKPATHS += $(foreach drv, $(HB_DB_DRIVERS), -L$(TOP)$(ROOT)source/rdd/$(drv)/$(ARCH)) -LINKPATHS += -L$(TOP)$(ROOT)source/rdd/$(ARCH) -LINKLIBS = $(foreach lib, $(LIBS), -l$(lib)) +# Add all libraries specified in LIBS. +ifeq ($(HB_LIB_COMPILE),) +LINKPATHS += $(foreach lib, $(LIBS), -L$(TOP)$(ROOT)source/$(lib)/$(ARCH)) +else +LINKPATHS += -L$(HB_LIB_COMPILE) +endif +LINKLIBS += $(foreach lib, $(LIBS), -l$(lib)) + +# If LIBS specifies the rdd library, add all DB drivers. +ifeq ($(findstring rdd,$(LIBS)),rdd) +LINKPATHS += $(foreach drv, $(HB_DB_DRIVERS), -L$(TOP)$(ROOT)source/rdd/$(drv)/$(ARCH)) 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 fd5ffce71b..2a978ac60e 100644 --- a/harbour/config/win32/gcc.cf +++ b/harbour/config/win32/gcc.cf @@ -17,17 +17,20 @@ CFLAGS = -Wall -g LD = gcc LD_OUT = -o + +# Add all libraries specified in LIBS. ifeq ($(HB_LIB_COMPILE),) LINKPATHS += $(foreach lib, $(LIBS), -L$(TOP)$(ROOT)source/$(lib)/$(ARCH)) else LINKPATHS += -L$(HB_LIB_COMPILE) endif -LINKPATHS += $(foreach drv, $(HB_DB_DRIVERS), -L$(TOP)$(ROOT)source/rdd/$(drv)/$(ARCH)) -LINKPATHS += -L$(TOP)$(ROOT)source/rdd/$(ARCH) - LINKLIBS += $(foreach lib, $(LIBS), -l$(lib)) + +# If LIBS specifies the rdd library, add all DB drivers. +ifeq ($(findstring rdd,$(LIBS)),rdd) +LINKPATHS += $(foreach drv, $(HB_DB_DRIVERS), -L$(TOP)$(ROOT)source/rdd/$(drv)/$(ARCH)) 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 83d3d1edb5..0613970a7e 100644 --- a/harbour/config/win32/msvc.cf +++ b/harbour/config/win32/msvc.cf @@ -17,17 +17,20 @@ CFLAGS = -W0 -Zi # -W4 for max warnings LD = cl.exe LD_OUT = -Fe + +# Add all libraries specified in LIBS. ifeq ($(HB_LIB_COMPILE),) LINKPATHS += -link $(foreach lib, $(LIBS), -LIBPATH:$(TOP)$(ROOT)source/$(lib)/$(ARCH)) else LINKPATHS += -link -LIBPATH:$(HB_LIB_COMPILE) endif -LINKPATHS += $(foreach drv, $(HB_DB_DRIVERS), -LIBPATH:$(TOP)$(ROOT)source/rdd/$(drv)/$(ARCH)) -LINKPATHS += -LIBPATH:$(TOP)$(ROOT)source/rdd/$(ARCH) - LINKLIBS += $(foreach lib, $(LIBS), $(lib)$(LIB_EXT)) + +# If LIBS specifies the rdd library, add all DB drivers. +ifeq ($(findstring rdd,$(LIBS)),rdd) +LINKPATHS += $(foreach drv, $(HB_DB_DRIVERS), -LIBPATH:$(TOP)$(ROOT)source/rdd/$(drv)/$(ARCH)) LINKLIBS += $(foreach drv, $(HB_DB_DRIVERS), $(drv)$(LIB_EXT)) -LINKLIBS += rdd$(LIB_EXT) +endif LDFLAGS = $(LINKPATHS)