From ae2273c194557894e44f98ba37b1f01ec48c41e2 Mon Sep 17 00:00:00 2001 From: "David G. Holm" Date: Fri, 9 Feb 2001 17:18:27 +0000 Subject: [PATCH] See ChangeLog entry 2001-02-08 12:15 UTC-0500 David G. Holm --- harbour/ChangeLog | 22 ++++++++++++++++++++++ harbour/config/dos/djgpp.cf | 4 +++- harbour/config/dos/rsx32.cf | 5 +++-- harbour/config/dos/watcom.cf | 2 ++ harbour/config/linux/gcc.cf | 4 +++- harbour/config/os2/gcc.cf | 4 +++- harbour/config/os2/icc.cf | 3 ++- harbour/config/w32/bcc32.cf | 4 +++- harbour/config/w32/gcc.cf | 5 +++-- harbour/config/w32/icc.cf | 3 ++- harbour/config/w32/mingw32.cf | 5 +++-- harbour/config/w32/msvc.cf | 4 +++- harbour/config/w32/rsxnt.cf | 5 +++-- harbour/tests/Makefile | 5 ++++- 14 files changed, 59 insertions(+), 16 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 36f0911714..533b989e5f 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,3 +1,25 @@ +2001-02-08 12:15 UTC-0500 David G. Holm + + * 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 * harbour/source/rtl/gtapi.c + hb_gtColorToN() fixed (?). diff --git a/harbour/config/dos/djgpp.cf b/harbour/config/dos/djgpp.cf index 43986619f8..395c0d9ad3 100644 --- a/harbour/config/dos/djgpp.cf +++ b/harbour/config/dos/djgpp.cf @@ -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. diff --git a/harbour/config/dos/rsx32.cf b/harbour/config/dos/rsx32.cf index b8baefd250..c5b9f0c451 100644 --- a/harbour/config/dos/rsx32.cf +++ b/harbour/config/dos/rsx32.cf @@ -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. diff --git a/harbour/config/dos/watcom.cf b/harbour/config/dos/watcom.cf index 389167a435..98d2ae305a 100644 --- a/harbour/config/dos/watcom.cf +++ b/harbour/config/dos/watcom.cf @@ -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 diff --git a/harbour/config/linux/gcc.cf b/harbour/config/linux/gcc.cf index aa15f77781..533044742f 100644 --- a/harbour/config/linux/gcc.cf +++ b/harbour/config/linux/gcc.cf @@ -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. diff --git a/harbour/config/os2/gcc.cf b/harbour/config/os2/gcc.cf index 207a072222..4ccead37a6 100644 --- a/harbour/config/os2/gcc.cf +++ b/harbour/config/os2/gcc.cf @@ -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. diff --git a/harbour/config/os2/icc.cf b/harbour/config/os2/icc.cf index 781823e42a..9e159d5a86 100644 --- a/harbour/config/os2/icc.cf +++ b/harbour/config/os2/icc.cf @@ -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)) diff --git a/harbour/config/w32/bcc32.cf b/harbour/config/w32/bcc32.cf index 20590edfed..a842297b8e 100644 --- a/harbour/config/w32/bcc32.cf +++ b/harbour/config/w32/bcc32.cf @@ -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 diff --git a/harbour/config/w32/gcc.cf b/harbour/config/w32/gcc.cf index 2e0925877c..f2445a60bf 100644 --- a/harbour/config/w32/gcc.cf +++ b/harbour/config/w32/gcc.cf @@ -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. diff --git a/harbour/config/w32/icc.cf b/harbour/config/w32/icc.cf index b599521af9..5f4c0e5f7a 100644 --- a/harbour/config/w32/icc.cf +++ b/harbour/config/w32/icc.cf @@ -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! diff --git a/harbour/config/w32/mingw32.cf b/harbour/config/w32/mingw32.cf index 563ab2a8ca..32517df7d6 100644 --- a/harbour/config/w32/mingw32.cf +++ b/harbour/config/w32/mingw32.cf @@ -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. diff --git a/harbour/config/w32/msvc.cf b/harbour/config/w32/msvc.cf index cc1e6f0d0d..bd639780f5 100644 --- a/harbour/config/w32/msvc.cf +++ b/harbour/config/w32/msvc.cf @@ -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. diff --git a/harbour/config/w32/rsxnt.cf b/harbour/config/w32/rsxnt.cf index 735e09a31a..3e9dd74fbe 100644 --- a/harbour/config/w32/rsxnt.cf +++ b/harbour/config/w32/rsxnt.cf @@ -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. diff --git a/harbour/tests/Makefile b/harbour/tests/Makefile index 61e6c0b071..201bf1e1bd 100644 --- a/harbour/tests/Makefile +++ b/harbour/tests/Makefile @@ -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 \