From fa09ec5d16807a51954d1421c8d11febb84f24fe Mon Sep 17 00:00:00 2001 From: "Gonzalo A. Diethelm" Date: Fri, 15 Oct 1999 19:56:09 +0000 Subject: [PATCH] ChangeLogTag:Fri Oct 15 16:42:30 1999 Gonzalo A. Diethelm --- harbour/ChangeLog | 19 +++++++++++++++++++ harbour/config/lib.cf | 2 +- harbour/source/debug/Makefile | 2 +- harbour/source/pp/Makefile | 2 +- harbour/source/rdd/Makefile | 2 +- harbour/source/rdd/dbfcdx/Makefile | 2 +- harbour/source/rdd/dbfntx/Makefile | 2 +- harbour/source/rdd/nulsys/Makefile | 2 +- harbour/source/rtl/Makefile | 2 +- harbour/source/runner/Makefile | 2 +- harbour/source/tools/Makefile | 2 +- harbour/source/vm/Makefile | 2 +- 12 files changed, 30 insertions(+), 11 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 0c607475e7..ec0a6f66ec 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,3 +1,22 @@ +Fri Oct 15 16:42:30 1999 Gonzalo A. Diethelm + + * config/lib.cf: + * source/debug/Makefile: + * source/pp/Makefile: + * source/rdd/Makefile: + * source/rdd/dbfcdx/Makefile: + * source/rdd/dbfntx/Makefile: + * source/rdd/nulsys/Makefile: + * source/rtl/Makefile: + * source/runner/Makefile: + * source/tools/Makefile: + * source/vm/Makefile: + Now Makefiles that will create a library use LIBNAME for the + library's name; the LIB variable is not used anymore, so it will + not conflict with the widely used environment variable with that + name. Thanks to Paul Tucker for pointing + this out. + 19991015-18:45 GMT+1 Bruno Cantero * source/rdd/dbcmd.c * Bug removed, default alias work if not alias and extension is specified. diff --git a/harbour/config/lib.cf b/harbour/config/lib.cf index 630ff4410f..0ac7a5530c 100644 --- a/harbour/config/lib.cf +++ b/harbour/config/lib.cf @@ -6,7 +6,7 @@ include $(TOP)$(ROOT)config/global.cf include $(TOP)$(ROOT)config/c.cf include $(TOP)$(ROOT)config/prg.cf -LIB_NAME := $(LIB_PREF)$(LIB)$(LIB_EXT) +LIB_NAME := $(LIB_PREF)$(LIBNAME)$(LIB_EXT) LIB_ARCH := $(notdir $(ARCH_DIR)) ifeq ($(LIB_ARCH),) diff --git a/harbour/source/debug/Makefile b/harbour/source/debug/Makefile index 365b61670b..9b7acfd90a 100644 --- a/harbour/source/debug/Makefile +++ b/harbour/source/debug/Makefile @@ -8,6 +8,6 @@ PRG_SOURCES=\ debugger.prg \ tbrwtext.prg -LIB=debug +LIBNAME=debug include $(TOP)$(ROOT)config/lib.cf diff --git a/harbour/source/pp/Makefile b/harbour/source/pp/Makefile index b6aef3767c..62adfd2b35 100644 --- a/harbour/source/pp/Makefile +++ b/harbour/source/pp/Makefile @@ -10,7 +10,7 @@ C_SOURCES=\ hbpplib.c \ table.c \ -LIB=pp +LIBNAME=pp DIRS=\ stdalone \ diff --git a/harbour/source/rdd/Makefile b/harbour/source/rdd/Makefile index dac1a9870d..cb55bca271 100644 --- a/harbour/source/rdd/Makefile +++ b/harbour/source/rdd/Makefile @@ -16,7 +16,7 @@ PRG_SOURCES=\ delim0.prg \ rddsys.prg \ -LIB=rdd +LIBNAME=rdd # The list of all valid DB drivers is defined in config/global.cf. DIRS=$(HB_DB_DRIVERS) diff --git a/harbour/source/rdd/dbfcdx/Makefile b/harbour/source/rdd/dbfcdx/Makefile index 9538e3dd69..b089207922 100644 --- a/harbour/source/rdd/dbfcdx/Makefile +++ b/harbour/source/rdd/dbfcdx/Makefile @@ -10,6 +10,6 @@ C_SOURCES=\ PRG_SOURCES=\ dbfcdx0.prg \ -LIB=dbfcdx +LIBNAME=dbfcdx include $(TOP)$(ROOT)config/lib.cf diff --git a/harbour/source/rdd/dbfntx/Makefile b/harbour/source/rdd/dbfntx/Makefile index 0a42d4a41b..ce7f7ef235 100644 --- a/harbour/source/rdd/dbfntx/Makefile +++ b/harbour/source/rdd/dbfntx/Makefile @@ -10,6 +10,6 @@ C_SOURCES=\ PRG_SOURCES=\ dbfntx0.prg \ -LIB=dbfntx +LIBNAME=dbfntx include $(TOP)$(ROOT)config/lib.cf diff --git a/harbour/source/rdd/nulsys/Makefile b/harbour/source/rdd/nulsys/Makefile index ee3bf4867a..4d69b71cb0 100644 --- a/harbour/source/rdd/nulsys/Makefile +++ b/harbour/source/rdd/nulsys/Makefile @@ -9,6 +9,6 @@ C_SOURCES=\ PRG_SOURCES=\ nulsys.prg \ -LIB=nulsys +LIBNAME=nulsys include $(TOP)$(ROOT)config/lib.cf diff --git a/harbour/source/rtl/Makefile b/harbour/source/rtl/Makefile index 686d65de4b..08b98f8e4f 100644 --- a/harbour/source/rtl/Makefile +++ b/harbour/source/rtl/Makefile @@ -74,6 +74,6 @@ PRG_SOURCES=\ wait.prg \ xsavescr.prg \ -LIB=rtl +LIBNAME=rtl include $(TOP)$(ROOT)config/lib.cf diff --git a/harbour/source/runner/Makefile b/harbour/source/runner/Makefile index c2eccc8c18..7837744d22 100644 --- a/harbour/source/runner/Makefile +++ b/harbour/source/runner/Makefile @@ -7,7 +7,7 @@ ROOT = ../../ C_SOURCES=\ runlib.c \ -LIB=runner +LIBNAME=runner DIRS=\ stdalone \ diff --git a/harbour/source/tools/Makefile b/harbour/source/tools/Makefile index 04b3360b38..074bb0bc2c 100644 --- a/harbour/source/tools/Makefile +++ b/harbour/source/tools/Makefile @@ -37,6 +37,6 @@ PRG_SOURCES=\ numtxten.prg \ stringp.prg \ -LIB=tools +LIBNAME=tools include $(TOP)$(ROOT)config/lib.cf diff --git a/harbour/source/vm/Makefile b/harbour/source/vm/Makefile index 2302195d2c..77e022a384 100644 --- a/harbour/source/vm/Makefile +++ b/harbour/source/vm/Makefile @@ -12,6 +12,6 @@ C_SOURCES=\ initsymb.c \ main.c \ -LIB=vm +LIBNAME=vm include $(TOP)$(ROOT)config/lib.cf