From d12a8aa83ce4b18f42af75d0e77abf13636b5d48 Mon Sep 17 00:00:00 2001 From: Ryszard Glab Date: Thu, 31 Jan 2008 17:44:30 +0000 Subject: [PATCH] 2008-01-31 18:47 UTC+0100 Ryszard Glab * config/hpux/gcc.cf * config/darwin/gcc.cf * config/dos/owatcom.cf * config/dos/watcom.cf * config/dos/bcc16.cf * config/dos/rsx32.cf * config/dos/djgpp.cf * config/linux/owatcom.cf * config/linux/gcc.cf * config/os2/gcc.cf * config/os2/icc.cf * config/sunos/gcc.cf * config/bsd/gcc.cf * config/w32/msvc.cf * config/w32/owatcom.cf * config/w32/watcom.cf * config/w32/bcc32.cf * config/w32/gcc.cf * config/w32/xcc.cf * config/w32/rsxnt.cf * config/w32/cemgw.cf * config/w32/pocc.cf * config/w32/mingw32.cf * fixed to link contrib libraries (all contrib libraries are placed in lib// directory) NOTE: OS/2 users: the names of libraries have 'hbgf' prefix --- harbour/ChangeLog | 29 +++++++++++++++++++++++++++++ harbour/config/bsd/gcc.cf | 1 - harbour/config/darwin/gcc.cf | 8 +++----- harbour/config/dos/bcc16.cf | 2 +- harbour/config/dos/djgpp.cf | 1 - harbour/config/dos/owatcom.cf | 2 +- harbour/config/dos/rsx32.cf | 1 - harbour/config/dos/watcom.cf | 2 +- harbour/config/hpux/gcc.cf | 1 - harbour/config/linux/gcc.cf | 1 - harbour/config/linux/owatcom.cf | 2 +- harbour/config/os2/gcc.cf | 3 +-- harbour/config/os2/icc.cf | 6 +++--- harbour/config/sunos/gcc.cf | 1 - harbour/config/w32/bcc32.cf | 2 +- harbour/config/w32/cemgw.cf | 1 - harbour/config/w32/gcc.cf | 1 - harbour/config/w32/mingw32.cf | 1 - harbour/config/w32/msvc.cf | 1 - harbour/config/w32/owatcom.cf | 2 +- harbour/config/w32/pocc.cf | 1 - harbour/config/w32/rsxnt.cf | 1 - harbour/config/w32/watcom.cf | 2 +- harbour/config/w32/xcc.cf | 1 - 24 files changed, 43 insertions(+), 30 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 3ca620ac7e..a64672e79a 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,35 @@ 2002-12-01 13:30 UTC+0100 Foo Bar */ +2008-01-31 18:47 UTC+0100 Ryszard Glab + * config/hpux/gcc.cf + * config/darwin/gcc.cf + * config/dos/owatcom.cf + * config/dos/watcom.cf + * config/dos/bcc16.cf + * config/dos/rsx32.cf + * config/dos/djgpp.cf + * config/linux/owatcom.cf + * config/linux/gcc.cf + * config/os2/gcc.cf + * config/os2/icc.cf + * config/sunos/gcc.cf + * config/bsd/gcc.cf + * config/w32/msvc.cf + * config/w32/owatcom.cf + * config/w32/watcom.cf + * config/w32/bcc32.cf + * config/w32/gcc.cf + * config/w32/xcc.cf + * config/w32/rsxnt.cf + * config/w32/cemgw.cf + * config/w32/pocc.cf + * config/w32/mingw32.cf + * fixed to link contrib libraries (all contrib libraries are + placed in lib// directory) + NOTE: + OS/2 users: the names of libraries have 'hbgf' prefix + 2008-01-31 18:41 UTC+0100 Marek Paliwoda (mpaliwoda at interia pl) + contrib/mtpl_gcc.mak + Readded to SVN yet another time diff --git a/harbour/config/bsd/gcc.cf b/harbour/config/bsd/gcc.cf index 259460cf40..f7a602cd7a 100644 --- a/harbour/config/bsd/gcc.cf +++ b/harbour/config/bsd/gcc.cf @@ -20,7 +20,6 @@ LD_OUT = -o # Add all libraries specified in CONTRIBS and LIBS. ifeq ($(HB_LIB_COMPILE),) -LINKPATHS += $(foreach lib, $(CONTRIBS), -L$(TOP)$(ROOT)contrib/$(lib)/$(HB_ARCH)) LINKPATHS += -L$(LIB_DIR) else LINKPATHS += -L$(HB_LIB_COMPILE) diff --git a/harbour/config/darwin/gcc.cf b/harbour/config/darwin/gcc.cf index 4d85e92435..5dc09c6f9f 100644 --- a/harbour/config/darwin/gcc.cf +++ b/harbour/config/darwin/gcc.cf @@ -30,18 +30,16 @@ CFLAGS += -DHB_OS_DARWIN LD = cc LD_OUT = -o -# Add all libraries specified in HB_USER_LIBS. -LINKPATHS += $(foreach lib, $(HB_USER_LIBS), -L$(TOP)$(ROOT)source/$(lib)/$(HB_ARCH)) -LINKLIBS += $(foreach lib, $(HB_USER_LIBS), -l$(lib)) - # Add all libraries specified in CONTRIBS and LIBS. ifeq ($(HB_LIB_COMPILE),) -LINKPATHS += $(foreach lib, $(CONTRIBS), -L$(TOP)$(ROOT)contrib/$(lib)/$(HB_ARCH)) LINKPATHS += -L$(LIB_DIR) else LINKPATHS += -L$(HB_LIB_COMPILE) endif +# Add all libraries specified in HB_USER_LIBS. +LINKLIBS += $(foreach lib, $(HB_USER_LIBS), -l$(lib)) + LINKLIBS += $(foreach lib, $(CONTRIBS), -l$(subst lib,,$(lib))) LINKLIBS += $(foreach lib, $(LIBS), -l$(lib)) diff --git a/harbour/config/dos/bcc16.cf b/harbour/config/dos/bcc16.cf index f01af7099c..456260876b 100644 --- a/harbour/config/dos/bcc16.cf +++ b/harbour/config/dos/bcc16.cf @@ -48,7 +48,7 @@ endef LD = bcc LDFLAGS = -i48 -O2 -mh $(L_USR) ifeq ($(HB_LIB_COMPILE),) -LINKLIBS += $(foreach lib, $(CONTRIBS), $(TOP)$(ROOT)contrib/$(lib)/$(HB_ARCH)/$(subst lib,,$(lib))$(LIB_EXT)) +LINKLIBS += $(foreach lib, $(CONTRIBS), $(LIB_DIR)/$(lib)$(LIB_EXT)) LINKLIBS += $(foreach lib, $(LIBS), $(LIB_DIR)/$(lib)$(LIB_EXT)) ifeq ($(findstring rdd,$(LIBS)),rdd) LINKLIBS += $(foreach lib, $(HB_DB_DRIVERS), $(LIB_DIR)$(lib)$(LIB_EXT)) diff --git a/harbour/config/dos/djgpp.cf b/harbour/config/dos/djgpp.cf index 5b0f68ace3..10fa2868c8 100644 --- a/harbour/config/dos/djgpp.cf +++ b/harbour/config/dos/djgpp.cf @@ -24,7 +24,6 @@ LDLIBS = -lm # Add all libraries specified in CONTRIBS and LIBS. ifeq ($(HB_LIB_COMPILE),) -LINKPATHS += $(foreach lib, $(CONTRIBS), -L$(TOP)$(ROOT)contrib/$(lib)/$(HB_ARCH)) LINKPATHS += -L$(LIB_DIR) else LINKPATHS += -L$(HB_LIB_COMPILE) diff --git a/harbour/config/dos/owatcom.cf b/harbour/config/dos/owatcom.cf index 82ae14749b..bb2b0e2ee7 100644 --- a/harbour/config/dos/owatcom.cf +++ b/harbour/config/dos/owatcom.cf @@ -63,7 +63,7 @@ LD = wlink LDFLAGS = debug all OP osn=DOS OP stack=65536 OP CASEEXACT OP stub=cwstub.exe ifeq ($(HB_LIB_COMPILE),) - LINKLIBS := $(foreach lib, $(CONTRIBS), $(subst /,\,$(TOP)$(ROOT)contrib/$(lib)/$(HB_ARCH)/$(subst lib,,$(lib)))) + LINKLIBS := $(foreach lib, $(CONTRIBS), $(subst /,\,$(LIB_DIR)/$(lib))) LINKLIBS += $(foreach lib, $(LIBS), $(subst /,\,$(LIB_DIR)/$(lib))) else LINKLIBS := $(foreach lib, $(CONTRIBS), $(subst /,\,$(HB_LIB_COMPILE)/$(lib))) diff --git a/harbour/config/dos/rsx32.cf b/harbour/config/dos/rsx32.cf index f0001659bd..bd855d9d3e 100644 --- a/harbour/config/dos/rsx32.cf +++ b/harbour/config/dos/rsx32.cf @@ -23,7 +23,6 @@ LD_OUT = -o # Add all libraries specified in CONTRIBS and LIBS. ifeq ($(HB_LIB_COMPILE),) -LINKPATHS += $(foreach lib, $(CONTRIBS), -L$(TOP)$(ROOT)contrib/$(lib)/$(HB_ARCH)) LINKPATHS += -L$(LIB_DIR) else LINKPATHS += -L$(HB_LIB_COMPILE) diff --git a/harbour/config/dos/watcom.cf b/harbour/config/dos/watcom.cf index bd90aeb35a..266927061e 100644 --- a/harbour/config/dos/watcom.cf +++ b/harbour/config/dos/watcom.cf @@ -44,7 +44,7 @@ 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)/$(HB_ARCH)/$(subst lib,,$(lib)))) +LINKLIBS := $(foreach lib, $(CONTRIBS), $(subst /,\,$(LIB_DIR)/$(lib))) LINKLIBS += $(foreach lib, $(LIBS), $(subst /,\,$(LIB_DIR)/$(lib))) else LINKLIBS := $(foreach lib, $(CONTRIBS), $(subst /,\,$(HB_LIB_COMPILE)/$(lib))) diff --git a/harbour/config/hpux/gcc.cf b/harbour/config/hpux/gcc.cf index 4ddffb36e5..0059ad09cd 100644 --- a/harbour/config/hpux/gcc.cf +++ b/harbour/config/hpux/gcc.cf @@ -30,7 +30,6 @@ LD_OUT = -o # Add all libraries specified in CONTRIBS and LIBS. ifeq ($(HB_LIB_COMPILE),) -LINKPATHS += $(foreach lib, $(CONTRIBS), -L$(TOP)$(ROOT)contrib/$(lib)/$(HB_ARCH)) LINKPATHS += -L$(LIB_DIR) else LINKPATHS += -L$(HB_LIB_COMPILE) diff --git a/harbour/config/linux/gcc.cf b/harbour/config/linux/gcc.cf index c8879361cc..bae1a8ae76 100644 --- a/harbour/config/linux/gcc.cf +++ b/harbour/config/linux/gcc.cf @@ -32,7 +32,6 @@ LD_OUT = -o # Add all libraries specified in CONTRIBS and LIBS. ifeq ($(HB_LIB_COMPILE),) -LINKPATHS += $(foreach lib, $(CONTRIBS), -L$(TOP)$(ROOT)contrib/$(lib)/$(HB_ARCH)) LINKPATHS += -L$(LIB_DIR) else LINKPATHS += -L$(HB_LIB_COMPILE) diff --git a/harbour/config/linux/owatcom.cf b/harbour/config/linux/owatcom.cf index 06c63df23f..b89758c8fb 100644 --- a/harbour/config/linux/owatcom.cf +++ b/harbour/config/linux/owatcom.cf @@ -38,7 +38,7 @@ LD = wlink LDFLAGS = debug all sys Linux OP CASEEXACT ifeq ($(HB_LIB_COMPILE),) - LINKLIBS := $(foreach lib, $(CONTRIBS), $(TOP)$(ROOT)contrib/$(lib)/$(HB_ARCH)/$(subst lib,,$(lib))) + LINKLIBS := $(foreach lib, $(CONTRIBS), $(LIB_DIR)/$(lib)) LINKLIBS += $(foreach lib, $(LIBS), $(LIB_DIR)/$(lib)) else LINKLIBS := $(foreach lib, $(CONTRIBS), $(HB_LIB_COMPILE)/$(lib)) diff --git a/harbour/config/os2/gcc.cf b/harbour/config/os2/gcc.cf index e49505f14e..e5c8230c6a 100644 --- a/harbour/config/os2/gcc.cf +++ b/harbour/config/os2/gcc.cf @@ -34,7 +34,6 @@ endif # Add all libraries specified in CONTRIBS and LIBS. ifeq ($(HB_LIB_COMPILE),) -LINKPATHS += $(foreach lib, $(CONTRIBS), -L$(TOP)$(ROOT)contrib/$(lib)/$(HB_ARCH)) LINKPATHS += -L$(LIB_DIR) else LINKPATHS += -L$(HB_LIB_COMPILE) @@ -53,7 +52,7 @@ endif # Add the specified GT driver library ifeq ($(findstring rtl,$(LIBS)),rtl) ifeq ($(C_MAIN),) -ifeq ($(HB_GT_LIB),os2pm) +ifeq ($(findstring os2pm,$(HB_GT_LIB)),os2pm) # Special handling for PM mode LINKLIBS += -l$(HB_GT_LIB) LINKLIBS += -lgtos2 diff --git a/harbour/config/os2/icc.cf b/harbour/config/os2/icc.cf index fa4939248b..df2feefb7b 100644 --- a/harbour/config/os2/icc.cf +++ b/harbour/config/os2/icc.cf @@ -30,7 +30,7 @@ endif endif endif ifeq ($(HB_LIB_COMPILE),) -LINKLIBS = $(foreach lib, $(CONTRIBS), $(TOP)$(ROOT)contrib/$(lib)/$(HB_ARCH)/$(subst lib,,$(lib))$(LIB_EXT)) +LINKLIBS = $(foreach lib, $(CONTRIBS), $(LIB_DIR)/$(lib)$(LIB_EXT)) LINKLIBS += $(foreach lib, $(LIBS), $(LIB_DIR)/$(lib)$(LIB_EXT)) # If LIBS specifies the rdd library, add all DB drivers. ifeq ($(findstring rdd,$(LIBS)),rdd) @@ -47,9 +47,9 @@ endif # Add the specified GT driver library ifeq ($(C_MAIN),) ifeq ($(findstring rtl,$(LIBS)),rtl) -ifeq ($(HB_GT_LIB),os2pm) +ifeq ($(HB_GT_LIB),hbgfos2pm) # Special handling for PM mode -LINKLIBS += $(TOP)$(ROOT)contrib/hgf/$(HB_GT_LIB)/$(HB_ARCH)/$(HB_GT_LIB)$(LIB_EXT) +LINKLIBS += $(LIB_DIR)/hbgfos2pm.lib LINKLIBS += $(LIB_DIR)/gtos2.lib else ifeq ($(HB_LIB_COMPILE),) diff --git a/harbour/config/sunos/gcc.cf b/harbour/config/sunos/gcc.cf index 86262cac10..b50b143e87 100644 --- a/harbour/config/sunos/gcc.cf +++ b/harbour/config/sunos/gcc.cf @@ -26,7 +26,6 @@ LD_OUT = -o # Add all libraries specified in CONTRIBS and LIBS. ifeq ($(HB_LIB_COMPILE),) -LINKPATHS += $(foreach lib, $(CONTRIBS), -L$(TOP)$(ROOT)contrib/$(lib)/$(HB_ARCH)) LINKPATHS += -L$(LIB_DIR) else LINKPATHS += -L$(HB_LIB_COMPILE) diff --git a/harbour/config/w32/bcc32.cf b/harbour/config/w32/bcc32.cf index 47a9c878ab..feff3d7835 100644 --- a/harbour/config/w32/bcc32.cf +++ b/harbour/config/w32/bcc32.cf @@ -27,7 +27,7 @@ LD_OUT = -e # Add all libraries specified in CONTRIBS and LIBS. ifeq ($(HB_LIB_COMPILE),) -LINKLIBS += $(foreach lib, $(CONTRIBS), $(TOP)$(ROOT)/contrib/$(lib)/$(HB_ARCH)/$(subst lib,,$(lib))$(LIB_EXT)) +LINKLIBS += $(foreach lib, $(CONTRIBS), $(LIB_DIR)/$(lib)$(LIB_EXT)) LINKLIBS += $(foreach lib, $(LIBS), $(LIB_DIR)/$(lib)$(LIB_EXT)) else LINKPATHS += -L$(HB_LIB_COMPILE) diff --git a/harbour/config/w32/cemgw.cf b/harbour/config/w32/cemgw.cf index 45f57bc53f..0f38da0f72 100644 --- a/harbour/config/w32/cemgw.cf +++ b/harbour/config/w32/cemgw.cf @@ -22,7 +22,6 @@ LDLIBS = # Add all libraries specified in CONTRIBS and LIBS. ifeq ($(HB_LIB_COMPILE),) -LINKPATHS += $(foreach lib, $(CONTRIBS), -L$(TOP)$(ROOT)contrib/$(lib)/$(HB_ARCH)) LINKPATHS += -L$(LIB_DIR) else LINKPATHS += -L$(HB_LIB_COMPILE) diff --git a/harbour/config/w32/gcc.cf b/harbour/config/w32/gcc.cf index 938acbd35a..c4c4ec6876 100644 --- a/harbour/config/w32/gcc.cf +++ b/harbour/config/w32/gcc.cf @@ -20,7 +20,6 @@ LD_OUT = -o # Add all libraries specified in CONTRIBS and LIBS. ifeq ($(HB_LIB_COMPILE),) -LINKPATHS += $(foreach lib, $(CONTRIBS), -L$(TOP)$(ROOT)contrib/$(lib)/$(HB_ARCH)) LINKPATHS += -L$(LIB_DIR) else LINKPATHS += -L$(HB_LIB_COMPILE) diff --git a/harbour/config/w32/mingw32.cf b/harbour/config/w32/mingw32.cf index 3594f389db..715f2d270f 100644 --- a/harbour/config/w32/mingw32.cf +++ b/harbour/config/w32/mingw32.cf @@ -22,7 +22,6 @@ LDLIBS = # Add all libraries specified in CONTRIBS and LIBS. ifeq ($(HB_LIB_COMPILE),) -LINKPATHS += $(foreach lib, $(CONTRIBS), -L$(TOP)$(ROOT)contrib/$(lib)/$(HB_ARCH)) LINKPATHS += -L$(LIB_DIR) else LINKPATHS += -L$(HB_LIB_COMPILE) diff --git a/harbour/config/w32/msvc.cf b/harbour/config/w32/msvc.cf index 3c50e55b80..b644270c07 100644 --- a/harbour/config/w32/msvc.cf +++ b/harbour/config/w32/msvc.cf @@ -20,7 +20,6 @@ LD_OUT = -Fe # Add all libraries specified in CONTRIBS and LIBS. ifeq ($(HB_LIB_COMPILE),) -LINKPATHS += -link $(foreach lib, $(CONTRIBS), -LIBPATH:$(TOP)$(ROOT)contrib/$(lib)/$(HB_ARCH)) LINKPATHS += -link -LIBPATH:$(LIB_DIR) else LINKPATHS += -link -LIBPATH:$(HB_LIB_COMPILE) diff --git a/harbour/config/w32/owatcom.cf b/harbour/config/w32/owatcom.cf index 8a9a7d8399..349a10b53c 100644 --- a/harbour/config/w32/owatcom.cf +++ b/harbour/config/w32/owatcom.cf @@ -62,7 +62,7 @@ LD = wlink LDFLAGS = debug all OP osn=NT OP stack=65536 OP CASEEXACT ifeq ($(HB_LIB_COMPILE),) - LINKLIBS := $(foreach lib, $(CONTRIBS), $(TOP)$(ROOT)contrib/$(lib)/$(HB_ARCH)/$(subst lib,,$(lib))) + LINKLIBS := $(foreach lib, $(CONTRIBS), $(LIB_DIR)/$(lib)) LINKLIBS += $(foreach lib, $(LIBS), $(LIB_DIR)/$(lib)) else LINKLIBS := $(foreach lib, $(CONTRIBS), $(HB_LIB_COMPILE)/$(lib)) diff --git a/harbour/config/w32/pocc.cf b/harbour/config/w32/pocc.cf index fc3139620c..86f52f56d2 100644 --- a/harbour/config/w32/pocc.cf +++ b/harbour/config/w32/pocc.cf @@ -38,7 +38,6 @@ LD_OUT = -OUT: # Add all libraries specified in CONTRIBS and LIBS. ifeq ($(HB_LIB_COMPILE),) -LINKPATHS += $(foreach lib, $(CONTRIBS), -LIBPATH:$(TOP)$(ROOT)contrib/$(lib)/$(HB_ARCH)) LINKPATHS += -LIBPATH:$(LIB_DIR) else LINKPATHS += -LIBPATH:$(HB_LIB_COMPILE) diff --git a/harbour/config/w32/rsxnt.cf b/harbour/config/w32/rsxnt.cf index 3ba0e2c664..1f2248baae 100644 --- a/harbour/config/w32/rsxnt.cf +++ b/harbour/config/w32/rsxnt.cf @@ -22,7 +22,6 @@ LD_OUT = -o # Add all libraries specified in CONTRIBS and LIBS. ifeq ($(HB_LIB_COMPILE),) -LINKPATHS += $(foreach lib, $(CONTRIBS), -L$(TOP)$(ROOT)contrib/$(lib)/$(HB_ARCH)) LINKPATHS += -L$(LIB_DIR) else LINKPATHS += -L$(HB_LIB_COMPILE) diff --git a/harbour/config/w32/watcom.cf b/harbour/config/w32/watcom.cf index 938022cbc3..547d656c61 100644 --- a/harbour/config/w32/watcom.cf +++ b/harbour/config/w32/watcom.cf @@ -63,7 +63,7 @@ LD = wlink LDFLAGS = debug all OP osn=NT OP stack=65536 OP CASEEXACT ifeq ($(HB_LIB_COMPILE),) - LINKLIBS := $(foreach lib, $(CONTRIBS), $(subst /,\,$(TOP)$(ROOT)contrib/$(lib)/$(HB_ARCH)/$(subst lib,,$(lib)))) + LINKLIBS := $(foreach lib, $(CONTRIBS), $(subst /,\,$(LIB_DIR)/$(lib))) LINKLIBS += $(foreach lib, $(LIBS), $(subst /,\,$(LIB_DIR)/$(lib))) else LINKLIBS := $(foreach lib, $(CONTRIBS), $(subst /,\,$(HB_LIB_COMPILE)/$(lib))) diff --git a/harbour/config/w32/xcc.cf b/harbour/config/w32/xcc.cf index 3f443d8dbf..a754a25620 100644 --- a/harbour/config/w32/xcc.cf +++ b/harbour/config/w32/xcc.cf @@ -32,7 +32,6 @@ LD_OUT = -OUT: # Add all libraries specified in CONTRIBS and LIBS. ifeq ($(HB_LIB_COMPILE),) -LINKPATHS += $(foreach lib, $(CONTRIBS), -LIBPATH:$(TOP)$(ROOT)contrib/$(lib)/$(HB_ARCH)) LINKPATHS += -LIBPATH:$(LIB_DIR) else LINKPATHS += -LIBPATH:$(HB_LIB_COMPILE)