2009-07-14 22:06 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* config/hpux/gcc.cf
* config/darwin/gcc.cf
* config/dos/watcom.cf
* config/dos/djgpp.cf
* config/win/watcom.cf
* config/win/icc.cf
* config/win/cygwin.cf
* config/win/msvc.cf
* config/win/xcc.cf
* config/win/mingw.cf
* config/win/pocc.cf
* config/win/bcc.cf
* config/linux/watcom.cf
* config/linux/gcc.cf
* config/linux/icc.cf
* config/os2/watcom.cf
* config/os2/gcc.cf
* config/sunos/gcc.cf
* config/bsd/gcc.cf
* config/wce/msvcarm.cf
* config/wce/mingwarm.cf
* config/wce/poccarm.cf
% Deleted CONTRIBS settings which could add extra libs to the
Harbour build process. Harbour build process shouldn't
rely on extra libs, so this is not necessary.
This commit is contained in:
@@ -17,6 +17,33 @@
|
||||
past entries belonging to author(s): Viktor Szakats.
|
||||
*/
|
||||
|
||||
2009-07-14 22:06 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
|
||||
* config/hpux/gcc.cf
|
||||
* config/darwin/gcc.cf
|
||||
* config/dos/watcom.cf
|
||||
* config/dos/djgpp.cf
|
||||
* config/win/watcom.cf
|
||||
* config/win/icc.cf
|
||||
* config/win/cygwin.cf
|
||||
* config/win/msvc.cf
|
||||
* config/win/xcc.cf
|
||||
* config/win/mingw.cf
|
||||
* config/win/pocc.cf
|
||||
* config/win/bcc.cf
|
||||
* config/linux/watcom.cf
|
||||
* config/linux/gcc.cf
|
||||
* config/linux/icc.cf
|
||||
* config/os2/watcom.cf
|
||||
* config/os2/gcc.cf
|
||||
* config/sunos/gcc.cf
|
||||
* config/bsd/gcc.cf
|
||||
* config/wce/msvcarm.cf
|
||||
* config/wce/mingwarm.cf
|
||||
* config/wce/poccarm.cf
|
||||
% Deleted CONTRIBS settings which could add extra libs to the
|
||||
Harbour build process. Harbour build process shouldn't
|
||||
rely on extra libs, so this is not necessary.
|
||||
|
||||
2009-07-14 21:58 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
|
||||
* config/darwin/gcc.cf
|
||||
* config/dos/watcom.cf
|
||||
|
||||
@@ -34,7 +34,7 @@ endif
|
||||
LD = $(HB_CCACHE) $(HB_CMP)
|
||||
LD_OUT = -o
|
||||
|
||||
# Add all libraries specified in CONTRIBS and LIBS.
|
||||
# Add all libraries specified in LIBS.
|
||||
ifeq ($(HB_LIB_COMPILE),)
|
||||
LINKPATHS += -L$(LIB_DIR)
|
||||
else
|
||||
@@ -43,7 +43,6 @@ endif
|
||||
|
||||
LINKLIBS += -Wl,--start-group
|
||||
|
||||
LINKLIBS += $(foreach lib, $(CONTRIBS), -l$(subst lib,,$(lib)))
|
||||
LINKLIBS += $(foreach lib, $(LIBS), -l$(lib))
|
||||
|
||||
# If LIBS specifies the rdd library, add all DB drivers.
|
||||
|
||||
@@ -48,14 +48,13 @@ endif
|
||||
LD = $(HB_CCPREFIX)$(HB_CMP)$(HB_CCPOSTFIX)
|
||||
LD_OUT = -o
|
||||
|
||||
# Add all libraries specified in CONTRIBS and LIBS.
|
||||
# Add all libraries specified in LIBS.
|
||||
ifeq ($(HB_LIB_COMPILE),)
|
||||
LINKPATHS += -L$(LIB_DIR)
|
||||
else
|
||||
LINKPATHS += -L$(HB_LIB_COMPILE)
|
||||
endif
|
||||
|
||||
LINKLIBS += $(foreach lib, $(CONTRIBS), -l$(subst lib,,$(lib)))
|
||||
LINKLIBS += $(foreach lib, $(LIBS), -l$(lib))
|
||||
|
||||
# If LIBS specifies the rdd library, add all DB drivers.
|
||||
|
||||
@@ -35,13 +35,12 @@ LD = $(HB_CMP)
|
||||
LD_OUT = -o
|
||||
LDLIBS = -lm
|
||||
|
||||
# Add all libraries specified in CONTRIBS and LIBS.
|
||||
# Add all libraries specified in LIBS.
|
||||
ifeq ($(HB_LIB_COMPILE),)
|
||||
LINKPATHS += -L$(LIB_DIR)
|
||||
else
|
||||
LINKPATHS += -L$(HB_LIB_COMPILE)
|
||||
endif
|
||||
LINKLIBS += $(foreach lib, $(CONTRIBS), -l$(subst lib,,$(lib)))
|
||||
LINKLIBS += $(foreach lib, $(LIBS), -l$(lib))
|
||||
|
||||
# If LIBS specifies the rdd library, add all DB drivers.
|
||||
|
||||
@@ -108,10 +108,8 @@ LDFLAGS := debug all $(LDFLAGS)
|
||||
endif
|
||||
|
||||
ifeq ($(HB_LIB_COMPILE),)
|
||||
LINKLIBS = $(foreach lib, $(CONTRIBS), $(LIB_DIR)/$(lib))
|
||||
LINKLIBS += $(foreach lib, $(LIBS), $(LIB_DIR)/$(lib))
|
||||
else
|
||||
LINKLIBS = $(foreach lib, $(CONTRIBS), $(HB_LIB_COMPILE)/$(lib))
|
||||
LINKLIBS += $(foreach lib, $(LIBS), $(HB_LIB_COMPILE)/$(lib))
|
||||
endif
|
||||
|
||||
|
||||
@@ -42,13 +42,12 @@ endif
|
||||
LD = $(HB_CCACHE) $(HB_CMP)
|
||||
LD_OUT = -o
|
||||
|
||||
# Add all libraries specified in CONTRIBS and LIBS.
|
||||
# Add all libraries specified in LIBS.
|
||||
ifeq ($(HB_LIB_COMPILE),)
|
||||
LINKPATHS += -L$(LIB_DIR)
|
||||
else
|
||||
LINKPATHS += -L$(HB_LIB_COMPILE)
|
||||
endif
|
||||
LINKLIBS += $(foreach lib, $(CONTRIBS), -l$(subst lib,,$(lib)))
|
||||
LINKLIBS += $(foreach lib, $(LIBS), -l$(lib))
|
||||
|
||||
# If LIBS specifies the rdd library, add all DB drivers.
|
||||
|
||||
@@ -49,7 +49,7 @@ endif
|
||||
LD = $(HB_CCACHE) $(HB_CCPREFIX)$(HB_CMP)
|
||||
LD_OUT = -o
|
||||
|
||||
# Add all libraries specified in CONTRIBS and LIBS.
|
||||
# Add all libraries specified in LIBS.
|
||||
ifeq ($(HB_LIB_COMPILE),)
|
||||
LINKPATHS += -L$(LIB_DIR)
|
||||
else
|
||||
@@ -60,7 +60,6 @@ endif
|
||||
# untill we don't clean them
|
||||
LINKLIBS += -Wl,--start-group
|
||||
|
||||
LINKLIBS += $(foreach lib, $(CONTRIBS), -l$(subst lib,,$(lib)))
|
||||
LINKLIBS += $(foreach lib, $(LIBS), -l$(lib))
|
||||
|
||||
# If LIBS specifies the rdd library, add all DB drivers.
|
||||
|
||||
@@ -43,7 +43,7 @@ endif
|
||||
LD = $(HB_CCACHE) $(HB_CMP)
|
||||
LD_OUT = -o
|
||||
|
||||
# Add all libraries specified in CONTRIBS and LIBS.
|
||||
# Add all libraries specified in LIBS.
|
||||
ifeq ($(HB_LIB_COMPILE),)
|
||||
LINKPATHS += -L$(LIB_DIR)
|
||||
else
|
||||
@@ -54,7 +54,6 @@ endif
|
||||
# untill we don't clean them
|
||||
LINKLIBS += -Wl,--start-group
|
||||
|
||||
LINKLIBS += $(foreach lib, $(CONTRIBS), -l$(subst lib,,$(lib)))
|
||||
LINKLIBS += $(foreach lib, $(LIBS), -l$(lib))
|
||||
|
||||
# If LIBS specifies the rdd library, add all DB drivers.
|
||||
|
||||
@@ -73,10 +73,8 @@ LDFLAGS := debug all $(LDFLAGS)
|
||||
endif
|
||||
|
||||
ifeq ($(HB_LIB_COMPILE),)
|
||||
LINKLIBS = $(foreach lib, $(CONTRIBS), $(LIB_DIR)/$(lib))
|
||||
LINKLIBS += $(foreach lib, $(LIBS), $(LIB_DIR)/$(lib))
|
||||
else
|
||||
LINKLIBS = $(foreach lib, $(CONTRIBS), $(HB_LIB_COMPILE)/$(lib))
|
||||
LINKLIBS += $(foreach lib, $(LIBS), $(HB_LIB_COMPILE)/$(lib))
|
||||
endif
|
||||
|
||||
|
||||
@@ -44,14 +44,13 @@ LDFLAGS +=$(TOP)$(ROOT)source/vm/$(ARCH_COMP)/mainpm.o
|
||||
endif
|
||||
endif
|
||||
|
||||
# Add all libraries specified in CONTRIBS and LIBS.
|
||||
# Add all libraries specified in LIBS.
|
||||
ifeq ($(HB_LIB_COMPILE),)
|
||||
LINKPATHS += -L$(LIB_DIR)
|
||||
else
|
||||
LINKPATHS += -L$(HB_LIB_COMPILE)
|
||||
endif
|
||||
#LINKLIBS += -Wl,-(
|
||||
LINKLIBS += $(foreach lib, $(CONTRIBS), -l$(subst lib,,$(lib)))
|
||||
LINKLIBS += $(foreach lib, $(LIBS), -l$(lib))
|
||||
|
||||
# If LIBS specifies the rdd library, add all DB drivers.
|
||||
|
||||
@@ -94,10 +94,8 @@ LDFLAGS := debug all $(LDFLAGS)
|
||||
endif
|
||||
|
||||
ifeq ($(HB_LIB_COMPILE),)
|
||||
LINKLIBS = $(foreach lib, $(CONTRIBS), $(LIB_DIR)/$(lib))
|
||||
LINKLIBS += $(foreach lib, $(LIBS), $(LIB_DIR)/$(lib))
|
||||
else
|
||||
LINKLIBS = $(foreach lib, $(CONTRIBS), $(HB_LIB_COMPILE)/$(lib))
|
||||
LINKLIBS += $(foreach lib, $(LIBS), $(HB_LIB_COMPILE)/$(lib))
|
||||
endif
|
||||
|
||||
|
||||
@@ -38,13 +38,12 @@ endif
|
||||
LD = $(HB_CCACHE) $(HB_CMP)
|
||||
LD_OUT = -o
|
||||
|
||||
# Add all libraries specified in CONTRIBS and LIBS.
|
||||
# Add all libraries specified in LIBS.
|
||||
ifeq ($(HB_LIB_COMPILE),)
|
||||
LINKPATHS += -L$(LIB_DIR)
|
||||
else
|
||||
LINKPATHS += -L$(HB_LIB_COMPILE)
|
||||
endif
|
||||
LINKLIBS += $(foreach lib, $(CONTRIBS), -l$(subst lib,,$(lib)))
|
||||
LINKLIBS += $(foreach lib, $(LIBS), -l$(lib))
|
||||
|
||||
# If LIBS specifies the rdd library, add all DB drivers.
|
||||
|
||||
@@ -38,14 +38,13 @@ LD_OUT = -o
|
||||
LINKPATHS =
|
||||
LDLIBS =
|
||||
|
||||
# Add all libraries specified in CONTRIBS and LIBS.
|
||||
# Add all libraries specified in LIBS.
|
||||
ifeq ($(HB_LIB_COMPILE),)
|
||||
LINKPATHS += -L$(LIB_DIR)
|
||||
else
|
||||
LINKPATHS += -L$(HB_LIB_COMPILE)
|
||||
endif
|
||||
|
||||
LDLIBS += $(foreach lib, $(CONTRIBS), -l$(subst lib,,$(lib)))
|
||||
LDLIBS += $(foreach lib, $(LIBS), -l$(lib))
|
||||
|
||||
# If LIBS specifies the rdd library, add all DB drivers.
|
||||
|
||||
@@ -60,8 +60,7 @@ LINKPATHS += /libpath:$(LIB_DIR)
|
||||
else
|
||||
LINKPATHS += /libpath:$(HB_LIB_COMPILE)
|
||||
endif
|
||||
# Add all libraries specified in CONTRIBS and LIBS.
|
||||
LINKLIBS += $(foreach lib, $(CONTRIBS), $(subst lib,,$(lib))$(LIB_EXT))
|
||||
# Add all libraries specified in LIBS.
|
||||
LINKLIBS += $(foreach lib, $(LIBS), $(lib)$(LIB_EXT))
|
||||
|
||||
# If LIBS specifies the rdd library, add all DB drivers.
|
||||
|
||||
@@ -42,13 +42,12 @@ CFLAGS =
|
||||
LD = polink.exe
|
||||
LD_OUT = -OUT:
|
||||
|
||||
# Add all libraries specified in CONTRIBS and LIBS.
|
||||
# Add all libraries specified in LIBS.
|
||||
ifeq ($(HB_LIB_COMPILE),)
|
||||
LINKPATHS += -LIBPATH:$(LIB_DIR)
|
||||
else
|
||||
LINKPATHS += -LIBPATH:$(HB_LIB_COMPILE)
|
||||
endif
|
||||
LINKLIBS += $(foreach lib, $(CONTRIBS), $(subst lib,,$(lib))$(LIB_EXT))
|
||||
LINKLIBS += $(foreach lib, $(LIBS), $(lib)$(LIB_EXT))
|
||||
|
||||
# If LIBS specifies the rdd library, add all DB drivers.
|
||||
|
||||
@@ -41,13 +41,12 @@ LD = bcc32.exe
|
||||
LDFLAGS = -O2
|
||||
LD_OUT = -e
|
||||
|
||||
# Add all libraries specified in CONTRIBS and LIBS.
|
||||
# Add all libraries specified in LIBS.
|
||||
ifeq ($(HB_LIB_COMPILE),)
|
||||
LINKPATHS += -L$(LIB_DIR)
|
||||
else
|
||||
LINKPATHS += -L$(HB_LIB_COMPILE)
|
||||
endif
|
||||
LIBLIST = $(foreach lib, $(CONTRIBS), $(lib)$(LIB_EXT))
|
||||
LIBLIST += $(foreach lib, $(LIBS), $(lib)$(LIB_EXT))
|
||||
|
||||
# If LIBS specifies the rdd library, add all DB drivers.
|
||||
|
||||
@@ -35,7 +35,7 @@ endif
|
||||
LD = $(HB_CMP)
|
||||
LD_OUT = -o
|
||||
|
||||
# Add all libraries specified in CONTRIBS and LIBS.
|
||||
# Add all libraries specified in LIBS.
|
||||
ifeq ($(HB_LIB_COMPILE),)
|
||||
LINKPATHS += -L$(LIB_DIR)
|
||||
else
|
||||
@@ -46,7 +46,6 @@ 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$(subst lib,,$(lib)))
|
||||
LINKLIBS += $(foreach lib, $(LIBS), -l$(lib))
|
||||
|
||||
# This library is needed for CharToOemBuff() and OemToCharBuff() support.
|
||||
|
||||
@@ -40,13 +40,12 @@ endif
|
||||
LD = icl.exe
|
||||
LD_OUT = -Fe
|
||||
|
||||
# Add all libraries specified in CONTRIBS and LIBS.
|
||||
# Add all libraries specified in LIBS.
|
||||
ifeq ($(HB_LIB_COMPILE),)
|
||||
LINKPATHS += /link /libpath:$(LIB_DIR)
|
||||
else
|
||||
LINKPATHS += /link /libpath:$(HB_LIB_COMPILE)
|
||||
endif
|
||||
LINKLIBS += $(foreach lib, $(CONTRIBS), $(subst lib,,$(lib))$(LIB_EXT))
|
||||
LINKLIBS += $(foreach lib, $(LIBS), $(lib)$(LIB_EXT))
|
||||
|
||||
# If LIBS specifies the rdd library, add all DB drivers.
|
||||
|
||||
@@ -40,14 +40,13 @@ LD_OUT = -o
|
||||
LINKPATHS =
|
||||
LDLIBS =
|
||||
|
||||
# Add all libraries specified in CONTRIBS and LIBS.
|
||||
# Add all libraries specified in LIBS.
|
||||
ifeq ($(HB_LIB_COMPILE),)
|
||||
LINKPATHS += -L$(LIB_DIR)
|
||||
else
|
||||
LINKPATHS += -L$(HB_LIB_COMPILE)
|
||||
endif
|
||||
|
||||
LDLIBS += $(foreach lib, $(CONTRIBS), -l$(subst lib,,$(lib)))
|
||||
LDLIBS += $(foreach lib, $(LIBS), -l$(lib))
|
||||
|
||||
# If LIBS specifies the rdd library, add all DB drivers.
|
||||
|
||||
@@ -50,13 +50,12 @@ endif
|
||||
LD = link.exe
|
||||
LD_OUT = /out:
|
||||
|
||||
# Add all libraries specified in CONTRIBS and LIBS.
|
||||
# Add all libraries specified in LIBS.
|
||||
ifeq ($(HB_LIB_COMPILE),)
|
||||
LINKPATHS += /libpath:$(LIB_DIR)
|
||||
else
|
||||
LINKPATHS += /libpath:$(HB_LIB_COMPILE)
|
||||
endif
|
||||
LINKLIBS += $(foreach lib, $(CONTRIBS), $(subst lib,,$(lib))$(LIB_EXT))
|
||||
LINKLIBS += $(foreach lib, $(LIBS), $(lib)$(LIB_EXT))
|
||||
|
||||
# If LIBS specifies the rdd library, add all DB drivers.
|
||||
|
||||
@@ -39,13 +39,12 @@ CFLAGS =
|
||||
LD = polink.exe
|
||||
LD_OUT = -OUT:
|
||||
|
||||
# Add all libraries specified in CONTRIBS and LIBS.
|
||||
# Add all libraries specified in LIBS.
|
||||
ifeq ($(HB_LIB_COMPILE),)
|
||||
LINKPATHS += -LIBPATH:$(LIB_DIR)
|
||||
else
|
||||
LINKPATHS += -LIBPATH:$(HB_LIB_COMPILE)
|
||||
endif
|
||||
LINKLIBS += $(foreach lib, $(CONTRIBS), $(subst lib,,$(lib))$(LIB_EXT))
|
||||
LINKLIBS += $(foreach lib, $(LIBS), $(lib)$(LIB_EXT))
|
||||
|
||||
# If LIBS specifies the rdd library, add all DB drivers.
|
||||
|
||||
@@ -97,10 +97,8 @@ LDFLAGS := debug all $(LDFLAGS)
|
||||
endif
|
||||
|
||||
ifeq ($(HB_LIB_COMPILE),)
|
||||
LINKLIBS = $(foreach lib, $(CONTRIBS), $(LIB_DIR)/$(lib))
|
||||
LINKLIBS += $(foreach lib, $(LIBS), $(LIB_DIR)/$(lib))
|
||||
else
|
||||
LINKLIBS = $(foreach lib, $(CONTRIBS), $(HB_LIB_COMPILE)/$(lib))
|
||||
LINKLIBS += $(foreach lib, $(LIBS), $(HB_LIB_COMPILE)/$(lib))
|
||||
endif
|
||||
|
||||
|
||||
@@ -33,13 +33,12 @@ endif
|
||||
LD = xlink.exe
|
||||
LD_OUT = -OUT:
|
||||
|
||||
# Add all libraries specified in CONTRIBS and LIBS.
|
||||
# Add all libraries specified in LIBS.
|
||||
ifeq ($(HB_LIB_COMPILE),)
|
||||
LINKPATHS += -LIBPATH:$(LIB_DIR)
|
||||
else
|
||||
LINKPATHS += -LIBPATH:$(HB_LIB_COMPILE)
|
||||
endif
|
||||
LINKLIBS += $(foreach lib, $(CONTRIBS), $(subst lib,,$(lib))$(LIB_EXT))
|
||||
LINKLIBS += $(foreach lib, $(LIBS), $(lib)$(LIB_EXT))
|
||||
|
||||
# If LIBS specifies the rdd library, add all DB drivers.
|
||||
|
||||
Reference in New Issue
Block a user