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

See ChangeLog entry 2001-02-08 12:15 UTC-0500 David G. Holm <dholm@jsd-llc.com>

Browse Source
This commit is contained in:
David G. Holm
2001-02-09 17:18:27 +00:00
parent 45700a0950
commit ae2273c194
14 changed files with 59 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
harbour/ChangeLog
View File

@@ -1,3 +1,25 @@
2001-02-08 12:15 UTC-0500 David G. Holm <dholm@jsd-llc.com>
* config/dos/djgpp.cf
* config/dos/rsx32.cf
* config/dos/watcom.cf
* config/linux/gcc.cf
* config/os2/gcc.cf
* config/os2/icc.cf
* config/w32/bcc32.cf
* config/w32/gcc.cf
* config/w32/icc.cf
* config/w32/mingw32.cf
* config/w32/msvc.cf
* config/w32/rsxnt.cf
+ Added the ability to include contrib libraries by setting
CONTRIBS to a list of contrib libraries in the Makefile.
* tests/Makefile
+ Added CONTRIBS=libmisc
* Moved program modules that use the contrib\libmisc library
from BAD_PRG_SOURCES to PRG_SOURCES.
2001-02-09 17:01 GMT+1 Antonio Linares <alinares@fivetech.com>
* harbour/source/rtl/gtapi.c
+ hb_gtColorToN() fixed (?).

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

@@ -22,12 +22,14 @@ endif
LD = gcc
LD_OUT = -o
# Add all libraries specified in LIBS.
# Add all libraries specified in CONTRIBS and LIBS.
ifeq ($(HB_LIB_COMPILE),)
LINKPATHS += $(foreach lib, $(CONTRIBS), -L$(TOP)$(ROOT)contrib/$(lib)/$(ARCH))
LINKPATHS += $(foreach lib, $(LIBS), -L$(TOP)$(ROOT)source/$(lib)/$(ARCH))
else
LINKPATHS += -L$(HB_LIB_COMPILE)
endif
LINKLIBS += $(foreach lib, $(CONTRIBS), -l$(lib))
LINKLIBS += $(foreach lib, $(LIBS), -l$(lib))
# If LIBS specifies the rdd library, add all DB drivers.

5
harbour/config/dos/rsx32.cf
View File

@@ -21,8 +21,9 @@ LDFLAGS = -Zrsx32
# Note the space after -o
LD_OUT = -o
# Add all libraries specified in LIBS.
# Add all libraries specified in CONTRIBS and LIBS.
ifeq ($(HB_LIB_COMPILE),)
LINKPATHS += $(foreach lib, $(CONTRIBS), -L$(TOP)$(ROOT)contrib/$(lib)/$(ARCH))
LINKPATHS += $(foreach lib, $(LIBS), -L$(TOP)$(ROOT)source/$(lib)/$(ARCH))
else
LINKPATHS += -L$(HB_LIB_COMPILE)
@@ -32,7 +33,7 @@ endif
# cyclic dependencies, but I think it is not really necessary if the
# libraries are kept in proper order.
# LINKLIBS += -Wl,-(
LINKLIBS += $(foreach lib, $(CONTRIBS), -l$(lib))
LINKLIBS += $(foreach lib, $(LIBS), -l$(lib))
# If LIBS specifies the rdd library, add all DB drivers.

2
harbour/config/dos/watcom.cf
View File

@@ -44,8 +44,10 @@ endef
LD = wlink
LDFLAGS = debug all OP osn=DOS4G OP stack=65536 OP CASEEXACT
ifeq ($(HB_LIB_COMPILE),)
LINKLIBS := $(foreach lib, $(CONTRIBS), $(subst /,\,$(TOP)$(ROOT)contrib/$(lib)/$(ARCH)/$(lib)))
LINKLIBS := $(foreach lib, $(LIBS), $(subst /,\,$(TOP)$(ROOT)source/$(lib)/$(ARCH)/$(lib)))
else
LINKLIBS := $(foreach lib, $(CONTRIBS), $(subst /,\,$(HB_LIB_COMPILE)/$(lib)))
LINKLIBS := $(foreach lib, $(LIBS), $(subst /,\,$(HB_LIB_COMPILE)/$(lib)))
endif

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

@@ -22,13 +22,15 @@ endif
LD = gcc
LD_OUT = -o
# Add all libraries specified in LIBS.
# Add all libraries specified in CONTRIBS and LIBS.
ifeq ($(HB_LIB_COMPILE),)
LINKPATHS += $(foreach lib, $(CONTRIBS), -L$(TOP)$(ROOT)contrib/$(lib)/$(ARCH))
LINKPATHS += $(foreach lib, $(LIBS), -L$(TOP)$(ROOT)source/$(lib)/$(ARCH))
else
LINKPATHS += -L$(HB_LIB_COMPILE)
endif
LINKLIBS += -Wl,--start-group
LINKLIBS += $(foreach lib, $(CONTRIBS), -l$(lib))
LINKLIBS += $(foreach lib, $(LIBS), -l$(lib))
# If LIBS specifies the rdd library, add all DB drivers.

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

@@ -23,13 +23,15 @@ LD = gcc
LDFLAGS =
LD_OUT = -o $(SPACE)
# Add all libraries specified in LIBS.
# Add all libraries specified in CONTRIBS and LIBS.
ifeq ($(HB_LIB_COMPILE),)
LINKPATHS += $(foreach lib, $(CONTRIBS), -L$(TOP)$(ROOT)contrib/$(lib)/$(ARCH))
LINKPATHS += $(foreach lib, $(LIBS), -L$(TOP)$(ROOT)source/$(lib)/$(ARCH))
else
LINKPATHS += -L$(HB_LIB_COMPILE)
endif
#LINKLIBS += -Wl,-(
LINKLIBS += $(foreach lib, $(CONTRIBS), -l$(lib))
LINKLIBS += $(foreach lib, $(LIBS), -l$(lib))
# If LIBS specifies the rdd library, add all DB drivers.

3
harbour/config/os2/icc.cf
View File

@@ -24,7 +24,8 @@ else
LDFLAGS += $(TOP)$(ROOT)source/vm/$(ARCH)/main.obj
endif
ifeq ($(HB_LIB_COMPILE),)
LINKLIBS = $(foreach lib, $(LIBS), $(TOP)$(ROOT)source/$(lib)/$(ARCH)/$(lib)$(LIB_EXT))
LINKLIBS = $(foreach lib, $(CONTRIBS), $(TOP)$(ROOT)contrib/$(lib)/$(ARCH)/$(lib)$(LIB_EXT))
LINKLIBS += $(foreach lib, $(LIBS), $(TOP)$(ROOT)source/$(lib)/$(ARCH)/$(lib)$(LIB_EXT))
# If LIBS specifies the rdd library, add all DB drivers.
ifeq ($(findstring rdd,$(LIBS)),rdd)
LINKLIBS += $(foreach lib, $(HB_DB_DRIVERS), $(TOP)$(ROOT)source/rdd/$(lib)/$(ARCH)/$(lib)$(LIB_EXT))

4
harbour/config/w32/bcc32.cf
View File

@@ -34,11 +34,13 @@ LD = bcc32
LDFLAGS = -O2
LD_OUT = -e
# Add all libraries specified in LIBS.
# Add all libraries specified in CONTRIBS and LIBS.
ifeq ($(HB_LIB_COMPILE),)
LINKLIBS += $(foreach lib, $(CONTRIBS), $(TOP)$(ROOT)/contrib/$(lib)/$(ARCH)/$(lib)$(LIB_EXT))
LINKLIBS += $(foreach lib, $(LIBS), $(TOP)$(ROOT)/source/$(lib)/$(ARCH)/$(lib)$(LIB_EXT))
else
LINKPATHS += -L$(HB_LIB_COMPILE)
LINKLIBS += $(foreach lib, $(CONTRIBS), $(lib)$(LIB_EXT))
LINKLIBS += $(foreach lib, $(LIBS), $(lib)$(LIB_EXT))
endif

5
harbour/config/w32/gcc.cf
View File

@@ -22,8 +22,9 @@ endif
LD = gcc
LD_OUT = -o
# Add all libraries specified in LIBS.
# Add all libraries specified in CONTRIBS and LIBS.
ifeq ($(HB_LIB_COMPILE),)
LINKPATHS += $(foreach lib, $(CONTRIBS), -L$(TOP)$(ROOT)contrib/$(lib)/$(ARCH))
LINKPATHS += $(foreach lib, $(LIBS), -L$(TOP)$(ROOT)source/$(lib)/$(ARCH))
else
LINKPATHS += -L$(HB_LIB_COMPILE)
@@ -33,7 +34,7 @@ endif
# cyclic dependencies, but I think it is not really necessary if the
# libraries are kept in proper order.
# LINKLIBS += -Wl,-(
LINKLIBS += $(foreach lib, $(CONTRIBS), -l$(lib))
LINKLIBS += $(foreach lib, $(LIBS), -l$(lib))
# This library is needed for CharToOemBuff() and OemToCharBuff() support.

3
harbour/config/w32/icc.cf
View File

@@ -45,7 +45,8 @@ endef
LD = icc
LDFLAGS = $(CFLAGS)
LINKLIBS = $(foreach lib, $(LIBS), $(_HB_LIB_COMPILE)$(lib))
LINKLIBS += $(foreach lib, $(CONTRIBS), $(_HB_LIB_COMPILE)$(lib))
LINKLIBS += $(foreach lib, $(LIBS), $(_HB_LIB_COMPILE)$(lib))
LD_RULE = $(link_exe_file)
#Note: The empty line below HAVE TO exist!

5
harbour/config/w32/mingw32.cf
View File

@@ -18,8 +18,9 @@ CFLAGS = -Wall
LD = gcc
LD_OUT = -o
# Add all libraries specified in LIBS.
# Add all libraries specified in CONTRIBS and LIBS.
ifeq ($(HB_LIB_COMPILE),)
LINKPATHS += $(foreach lib, $(CONTRIBS), -L$(TOP)$(ROOT)contrib/$(lib)/$(ARCH))
LINKPATHS += $(foreach lib, $(LIBS), -L$(TOP)$(ROOT)source/$(lib)/$(ARCH))
else
LINKPATHS += -L$(HB_LIB_COMPILE)
@@ -29,7 +30,7 @@ endif
# cyclic dependencies, but I think it is not really necessary if the
# libraries are kept in proper order.
# LINKLIBS += -Wl,-(
LINKLIBS += $(foreach lib, $(CONTRIBS), -l$(lib))
LINKLIBS += $(foreach lib, $(LIBS), -l$(lib))
# This library is needed for CharToOemBuff() and OemToCharBuff() support.

4
harbour/config/w32/msvc.cf
View File

@@ -18,12 +18,14 @@ CFLAGS = -W0 -Zi # -W4 for max warnings
LD = cl.exe
LD_OUT = -Fe
# Add all libraries specified in LIBS.
# Add all libraries specified in CONTRIBS and LIBS.
ifeq ($(HB_LIB_COMPILE),)
LINKPATHS += -link $(foreach lib, $(CONTRIBS), -LIBPATH:$(TOP)$(ROOT)contrib/$(lib)/$(ARCH))
LINKPATHS += -link $(foreach lib, $(LIBS), -LIBPATH:$(TOP)$(ROOT)source/$(lib)/$(ARCH))
else
LINKPATHS += -link -LIBPATH:$(HB_LIB_COMPILE)
endif
LINKLIBS += $(foreach lib, $(CONTRIBS), $(lib)$(LIB_EXT))
LINKLIBS += $(foreach lib, $(LIBS), $(lib)$(LIB_EXT))
# If LIBS specifies the rdd library, add all DB drivers.

5
harbour/config/w32/rsxnt.cf
View File

@@ -20,8 +20,9 @@ LDFLAGS = -Zwin32
# Note the space after -o
LD_OUT = -o
# Add all libraries specified in LIBS.
# Add all libraries specified in CONTRIBS and LIBS.
ifeq ($(HB_LIB_COMPILE),)
LINKPATHS += $(foreach lib, $(CONTRIBS), -L$(TOP)$(ROOT)contrib/$(lib)/$(ARCH))
LINKPATHS += $(foreach lib, $(LIBS), -L$(TOP)$(ROOT)source/$(lib)/$(ARCH))
else
LINKPATHS += -L$(HB_LIB_COMPILE)
@@ -31,7 +32,7 @@ endif
# cyclic dependencies, but I think it is not really necessary if the
# libraries are kept in proper order.
# LINKLIBS += -Wl,-(
LINKLIBS += $(foreach lib, $(CONTRIBS), -l$(lib))
LINKLIBS += $(foreach lib, $(LIBS), -l$(lib))
# This library is needed for CharToOemBuff() and OemToCharBuff() support.

5
harbour/tests/Makefile
View File

@@ -8,6 +8,9 @@ endif
ROOT = ../
CONTRIBS=\
libmisc\
LIBS=\
debug \
vm \
@@ -99,6 +102,7 @@ PRG_SOURCES=\
procline.prg \
procname.prg \
readhrb.prg \
readfile.prg \
recursiv.prg \
returns.prg \
round.prg \
@@ -166,7 +170,6 @@ BAD_PRG_SOURCES=\
mathtest.prg \
objarr.prg \
objasign.prg \
readfile.prg \
rtfclass.prg \
spawn.prg \
spawn2.prg \