diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 5a7e1fddcc..a2790643db 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,35 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-07-14 22:42 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/global.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/install.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 HB_LIB_COMPILE support. With this setting it was + possible to override default internal lib path for the builds. + Not needed in practice. + 2009-07-14 22:06 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * config/hpux/gcc.cf * config/darwin/gcc.cf diff --git a/harbour/config/bsd/gcc.cf b/harbour/config/bsd/gcc.cf index 2787411147..8ae07c9a1e 100644 --- a/harbour/config/bsd/gcc.cf +++ b/harbour/config/bsd/gcc.cf @@ -34,12 +34,7 @@ endif LD = $(HB_CCACHE) $(HB_CMP) LD_OUT = -o -# Add all libraries specified in LIBS. -ifeq ($(HB_LIB_COMPILE),) LINKPATHS += -L$(LIB_DIR) -else -LINKPATHS += -L$(HB_LIB_COMPILE) -endif LINKLIBS += -Wl,--start-group diff --git a/harbour/config/darwin/gcc.cf b/harbour/config/darwin/gcc.cf index 5ccaf14ea4..ff1bbeaeb8 100644 --- a/harbour/config/darwin/gcc.cf +++ b/harbour/config/darwin/gcc.cf @@ -48,12 +48,7 @@ endif LD = $(HB_CCPREFIX)$(HB_CMP)$(HB_CCPOSTFIX) LD_OUT = -o -# Add all libraries specified in LIBS. -ifeq ($(HB_LIB_COMPILE),) LINKPATHS += -L$(LIB_DIR) -else -LINKPATHS += -L$(HB_LIB_COMPILE) -endif LINKLIBS += $(foreach lib, $(LIBS), -l$(lib)) diff --git a/harbour/config/dos/djgpp.cf b/harbour/config/dos/djgpp.cf index ffe19acc71..6f24e41a79 100644 --- a/harbour/config/dos/djgpp.cf +++ b/harbour/config/dos/djgpp.cf @@ -35,12 +35,8 @@ LD = $(HB_CMP) LD_OUT = -o LDLIBS = -lm -# Add all libraries specified in LIBS. -ifeq ($(HB_LIB_COMPILE),) LINKPATHS += -L$(LIB_DIR) -else -LINKPATHS += -L$(HB_LIB_COMPILE) -endif + 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 db3424371d..fdd5913f9e 100644 --- a/harbour/config/dos/watcom.cf +++ b/harbour/config/dos/watcom.cf @@ -50,9 +50,6 @@ endif endif CPPFLAGS += -i. -i$(TOP)$(ROOT)include -ifneq ($(HB_LIB_COMPILE),) -CPPFLAGS += -i$(HB_INC_COMPILE) -endif ifeq ($(HB_BUILD_DEBUG),yes) CPPFLAGS += -d2 @@ -107,27 +104,15 @@ ifeq ($(HB_BUILD_DEBUG),yes) LDFLAGS := debug all $(LDFLAGS) endif -ifeq ($(HB_LIB_COMPILE),) - LINKLIBS += $(foreach lib, $(LIBS), $(LIB_DIR)/$(lib)) -else - LINKLIBS += $(foreach lib, $(LIBS), $(HB_LIB_COMPILE)/$(lib)) -endif +LINKLIBS += $(foreach lib, $(LIBS), $(LIB_DIR)/$(lib)) # If LIBS specifies the rdd library, add all DB drivers. ifeq ($(findstring rdd,$(LIBS)),rdd) - ifeq ($(HB_LIB_COMPILE),) - RDDLIBS = $(foreach drv, $(HB_DB_DRIVERS), $(LIB_DIR)/$(drv)) - else - RDDLIBS = $(foreach drv, $(HB_DB_DRIVERS), $(HB_LIB_COMPILE)/$(drv)) - endif + RDDLIBS = $(foreach drv, $(HB_DB_DRIVERS), $(LIB_DIR)/$(drv)) endif ifeq ($(findstring rtl,$(LIBS)),rtl) - ifeq ($(HB_LIB_COMPILE),) - GTLIBS = $(foreach gt, $(HB_GT_LIBS), $(LIB_DIR)/$(gt)) - else - GTLIBS = $(foreach gt, $(HB_GT_LIBS), $(HB_LIB_COMPILE)/$(gt)) - endif + GTLIBS = $(foreach gt, $(HB_GT_LIBS), $(LIB_DIR)/$(gt)) endif LD_RULE = $(link_exe_file) $(HB_USER_LDFLAGS) diff --git a/harbour/config/global.cf b/harbour/config/global.cf index e701707ded..4e6948acca 100644 --- a/harbour/config/global.cf +++ b/harbour/config/global.cf @@ -61,10 +61,6 @@ ifeq ($(HB_INC_COMPILE),) HB_INC_COMPILE := $(TOP)$(ROOT)include endif -ifeq ($(HB_LIB_COMPILE),) -HB_LIB_COMPILE := -endif - include $(TOP)$(ROOT)config/$(HB_ARCHITECTURE)/global.cf include $(TOP)$(ROOT)config/$(ARCH_COMP).cf diff --git a/harbour/config/hpux/gcc.cf b/harbour/config/hpux/gcc.cf index 90be5ded73..f53679765d 100644 --- a/harbour/config/hpux/gcc.cf +++ b/harbour/config/hpux/gcc.cf @@ -43,11 +43,7 @@ LD = $(HB_CCACHE) $(HB_CMP) LD_OUT = -o # Add all libraries specified in LIBS. -ifeq ($(HB_LIB_COMPILE),) LINKPATHS += -L$(LIB_DIR) -else -LINKPATHS += -L$(HB_LIB_COMPILE) -endif LINKLIBS += $(foreach lib, $(LIBS), -l$(lib)) # If LIBS specifies the rdd library, add all DB drivers. diff --git a/harbour/config/install.cf b/harbour/config/install.cf index d40d54a05f..a162a9ecc9 100644 --- a/harbour/config/install.cf +++ b/harbour/config/install.cf @@ -2,9 +2,11 @@ # $Id$ # +ifneq ($(HB_INSTALL_DEF),yes) + include $(TOP)$(ROOT)config/$(HB_ARCHITECTURE)/install.cf -ifneq ($(HB_INSTALL_DEF),yes) install:: first $(INSTALL_RULE) + endif diff --git a/harbour/config/linux/gcc.cf b/harbour/config/linux/gcc.cf index c2901125f8..1678c4b6f2 100644 --- a/harbour/config/linux/gcc.cf +++ b/harbour/config/linux/gcc.cf @@ -50,11 +50,7 @@ LD = $(HB_CCACHE) $(HB_CCPREFIX)$(HB_CMP) LD_OUT = -o # Add all libraries specified in LIBS. -ifeq ($(HB_LIB_COMPILE),) LINKPATHS += -L$(LIB_DIR) -else -LINKPATHS += -L$(HB_LIB_COMPILE) -endif # our libs have a lot of cross referenced now and we have to group them # untill we don't clean them diff --git a/harbour/config/linux/icc.cf b/harbour/config/linux/icc.cf index 9f5cf26cbf..9ed47038db 100644 --- a/harbour/config/linux/icc.cf +++ b/harbour/config/linux/icc.cf @@ -44,11 +44,7 @@ LD = $(HB_CCACHE) $(HB_CMP) LD_OUT = -o # Add all libraries specified in LIBS. -ifeq ($(HB_LIB_COMPILE),) LINKPATHS += -L$(LIB_DIR) -else -LINKPATHS += -L$(HB_LIB_COMPILE) -endif # our libs have a lot of cross referenced now and we have to group them # untill we don't clean them diff --git a/harbour/config/linux/watcom.cf b/harbour/config/linux/watcom.cf index d111735c05..6ec4e8bd07 100644 --- a/harbour/config/linux/watcom.cf +++ b/harbour/config/linux/watcom.cf @@ -54,9 +54,6 @@ endif CPPFLAGS += -i. -i$(TOP)$(ROOT)include -ifneq ($(HB_LIB_COMPILE),) - CPPFLAGS += -i$(HB_INC_COMPILE) -endif ifeq ($(HB_BUILD_DEBUG),yes) CPPFLAGS += -d2 @@ -72,27 +69,15 @@ ifeq ($(HB_BUILD_DEBUG),yes) LDFLAGS := debug all $(LDFLAGS) endif -ifeq ($(HB_LIB_COMPILE),) - LINKLIBS += $(foreach lib, $(LIBS), $(LIB_DIR)/$(lib)) -else - LINKLIBS += $(foreach lib, $(LIBS), $(HB_LIB_COMPILE)/$(lib)) -endif +LINKLIBS += $(foreach lib, $(LIBS), $(LIB_DIR)/$(lib)) # If LIBS specifies the rdd library, add all DB drivers. ifeq ($(findstring rdd,$(LIBS)),rdd) - ifeq ($(HB_LIB_COMPILE),) - RDDLIBS = $(foreach drv, $(HB_DB_DRIVERS), $(LIB_DIR)/$(drv)) - else - RDDLIBS = $(foreach drv, $(HB_DB_DRIVERS), $(HB_LIB_COMPILE)/$(drv)) - endif + RDDLIBS = $(foreach drv, $(HB_DB_DRIVERS), $(LIB_DIR)/$(drv)) endif ifeq ($(findstring rtl,$(LIBS)),rtl) - ifeq ($(HB_LIB_COMPILE),) - GTLIBS = $(foreach gt, $(HB_GT_LIBS), $(LIB_DIR)/$(gt)) - else - GTLIBS = $(foreach gt, $(HB_GT_LIBS), $(HB_LIB_COMPILE)/$(gt)) - endif + GTLIBS = $(foreach gt, $(HB_GT_LIBS), $(LIB_DIR)/$(gt)) endif LDFILES = $(subst $(space),$(comma) ,$(^F)) diff --git a/harbour/config/os2/gcc.cf b/harbour/config/os2/gcc.cf index 7deff089b7..ce2f403981 100644 --- a/harbour/config/os2/gcc.cf +++ b/harbour/config/os2/gcc.cf @@ -45,11 +45,7 @@ endif endif # 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, $(LIBS), -l$(lib)) diff --git a/harbour/config/os2/watcom.cf b/harbour/config/os2/watcom.cf index e34c6786a4..5778b84ba6 100644 --- a/harbour/config/os2/watcom.cf +++ b/harbour/config/os2/watcom.cf @@ -50,9 +50,6 @@ endif endif CPPFLAGS += -i. -i$(TOP)$(ROOT)include -ifneq ($(HB_LIB_COMPILE),) -CPPFLAGS += -i$(HB_INC_COMPILE) -endif ifeq ($(HB_BUILD_DEBUG),yes) CPPFLAGS += -d2 @@ -93,27 +90,15 @@ ifeq ($(HB_BUILD_DEBUG),yes) LDFLAGS := debug all $(LDFLAGS) endif -ifeq ($(HB_LIB_COMPILE),) - LINKLIBS += $(foreach lib, $(LIBS), $(LIB_DIR)/$(lib)) -else - LINKLIBS += $(foreach lib, $(LIBS), $(HB_LIB_COMPILE)/$(lib)) -endif +LINKLIBS += $(foreach lib, $(LIBS), $(LIB_DIR)/$(lib)) # If LIBS specifies the rdd library, add all DB drivers. ifeq ($(findstring rdd,$(LIBS)),rdd) - ifeq ($(HB_LIB_COMPILE),) - RDDLIBS = $(foreach drv, $(HB_DB_DRIVERS), $(LIB_DIR)/$(drv)) - else - RDDLIBS = $(foreach drv, $(HB_DB_DRIVERS), $(HB_LIB_COMPILE)/$(drv)) - endif + RDDLIBS = $(foreach drv, $(HB_DB_DRIVERS), $(LIB_DIR)/$(drv)) endif ifeq ($(findstring rtl,$(LIBS)),rtl) - ifeq ($(HB_LIB_COMPILE),) - GTLIBS = $(foreach gt, $(HB_GT_LIBS), $(LIB_DIR)/$(gt)) - else - GTLIBS = $(foreach gt, $(HB_GT_LIBS), $(HB_LIB_COMPILE)/$(gt)) - endif + GTLIBS = $(foreach gt, $(HB_GT_LIBS), $(LIB_DIR)/$(gt)) endif LD_RULE = $(link_exe_file) $(HB_USER_LDFLAGS) diff --git a/harbour/config/sunos/gcc.cf b/harbour/config/sunos/gcc.cf index d64b2ae14f..c41480a308 100644 --- a/harbour/config/sunos/gcc.cf +++ b/harbour/config/sunos/gcc.cf @@ -39,11 +39,7 @@ LD = $(HB_CCACHE) $(HB_CMP) LD_OUT = -o # Add all libraries specified in LIBS. -ifeq ($(HB_LIB_COMPILE),) LINKPATHS += -L$(LIB_DIR) -else -LINKPATHS += -L$(HB_LIB_COMPILE) -endif LINKLIBS += $(foreach lib, $(LIBS), -l$(lib)) # If LIBS specifies the rdd library, add all DB drivers. diff --git a/harbour/config/wce/mingwarm.cf b/harbour/config/wce/mingwarm.cf index e887740768..b4300883be 100644 --- a/harbour/config/wce/mingwarm.cf +++ b/harbour/config/wce/mingwarm.cf @@ -39,11 +39,7 @@ LINKPATHS = LDLIBS = # Add all libraries specified in LIBS. -ifeq ($(HB_LIB_COMPILE),) LINKPATHS += -L$(LIB_DIR) -else -LINKPATHS += -L$(HB_LIB_COMPILE) -endif LDLIBS += $(foreach lib, $(LIBS), -l$(lib)) diff --git a/harbour/config/wce/msvcarm.cf b/harbour/config/wce/msvcarm.cf index ff1d8ac759..afc06a61ae 100644 --- a/harbour/config/wce/msvcarm.cf +++ b/harbour/config/wce/msvcarm.cf @@ -55,11 +55,7 @@ LINKPATHS += /nodefaultlib:"kernel32.lib" /align:4096 /opt:ref /opt:icf ifeq ($(HB_VISUALC_VER_PRE80),) LINKPATHS += /manifest:no endif -ifeq ($(HB_LIB_COMPILE),) LINKPATHS += /libpath:$(LIB_DIR) -else -LINKPATHS += /libpath:$(HB_LIB_COMPILE) -endif # Add all libraries specified in LIBS. LINKLIBS += $(foreach lib, $(LIBS), $(lib)$(LIB_EXT)) diff --git a/harbour/config/wce/poccarm.cf b/harbour/config/wce/poccarm.cf index f6ed511cc3..c56fc3643b 100644 --- a/harbour/config/wce/poccarm.cf +++ b/harbour/config/wce/poccarm.cf @@ -43,11 +43,7 @@ LD = polink.exe LD_OUT = -OUT: # Add all libraries specified in LIBS. -ifeq ($(HB_LIB_COMPILE),) LINKPATHS += -LIBPATH:$(LIB_DIR) -else -LINKPATHS += -LIBPATH:$(HB_LIB_COMPILE) -endif LINKLIBS += $(foreach lib, $(LIBS), $(lib)$(LIB_EXT)) # If LIBS specifies the rdd library, add all DB drivers. diff --git a/harbour/config/win/bcc.cf b/harbour/config/win/bcc.cf index a0669ec224..6edb1d34b3 100644 --- a/harbour/config/win/bcc.cf +++ b/harbour/config/win/bcc.cf @@ -42,11 +42,7 @@ LDFLAGS = -O2 LD_OUT = -e # Add all libraries specified in LIBS. -ifeq ($(HB_LIB_COMPILE),) LINKPATHS += -L$(LIB_DIR) -else -LINKPATHS += -L$(HB_LIB_COMPILE) -endif LIBLIST += $(foreach lib, $(LIBS), $(lib)$(LIB_EXT)) # If LIBS specifies the rdd library, add all DB drivers. @@ -61,11 +57,7 @@ endif # It's probably not necessary in native Windows but I need it # for my Linux box because -L seems to not work with WINE -ifeq ($(HB_LIB_COMPILE),) LINKLIBS += $(foreach lib, $(LIBLIST), $(LIB_DIR)/$(lib)) -else -LINKLIBS += $(foreach lib, $(LIBLIST), $(HB_LIB_COMPILE)/$(lib)) -endif LDFLAGS = $(LINKPATHS) diff --git a/harbour/config/win/cygwin.cf b/harbour/config/win/cygwin.cf index d8cae26f31..065e7ebb0e 100644 --- a/harbour/config/win/cygwin.cf +++ b/harbour/config/win/cygwin.cf @@ -36,11 +36,7 @@ LD = $(HB_CMP) LD_OUT = -o # Add all libraries specified in LIBS. -ifeq ($(HB_LIB_COMPILE),) LINKPATHS += -L$(LIB_DIR) -else -LINKPATHS += -L$(HB_LIB_COMPILE) -endif # The -( option could be appropriate to link against libraries with # cyclic dependencies, but I think it is not really necessary if the diff --git a/harbour/config/win/icc.cf b/harbour/config/win/icc.cf index 743180b864..168a068130 100644 --- a/harbour/config/win/icc.cf +++ b/harbour/config/win/icc.cf @@ -41,11 +41,7 @@ LD = icl.exe LD_OUT = -Fe # 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, $(LIBS), $(lib)$(LIB_EXT)) # If LIBS specifies the rdd library, add all DB drivers. diff --git a/harbour/config/win/mingw.cf b/harbour/config/win/mingw.cf index 03e340a70d..723e56564f 100644 --- a/harbour/config/win/mingw.cf +++ b/harbour/config/win/mingw.cf @@ -41,11 +41,7 @@ LINKPATHS = LDLIBS = # Add all libraries specified in LIBS. -ifeq ($(HB_LIB_COMPILE),) LINKPATHS += -L$(LIB_DIR) -else -LINKPATHS += -L$(HB_LIB_COMPILE) -endif LDLIBS += $(foreach lib, $(LIBS), -l$(lib)) diff --git a/harbour/config/win/msvc.cf b/harbour/config/win/msvc.cf index ed4b965e0d..74fc0168b0 100644 --- a/harbour/config/win/msvc.cf +++ b/harbour/config/win/msvc.cf @@ -51,11 +51,7 @@ LD = link.exe LD_OUT = /out: # Add all libraries specified in LIBS. -ifeq ($(HB_LIB_COMPILE),) LINKPATHS += /libpath:$(LIB_DIR) -else -LINKPATHS += /libpath:$(HB_LIB_COMPILE) -endif LINKLIBS += $(foreach lib, $(LIBS), $(lib)$(LIB_EXT)) # If LIBS specifies the rdd library, add all DB drivers. diff --git a/harbour/config/win/pocc.cf b/harbour/config/win/pocc.cf index 9a69339251..5f0afd5507 100644 --- a/harbour/config/win/pocc.cf +++ b/harbour/config/win/pocc.cf @@ -40,11 +40,7 @@ LD = polink.exe LD_OUT = -OUT: # Add all libraries specified in LIBS. -ifeq ($(HB_LIB_COMPILE),) LINKPATHS += -LIBPATH:$(LIB_DIR) -else -LINKPATHS += -LIBPATH:$(HB_LIB_COMPILE) -endif LINKLIBS += $(foreach lib, $(LIBS), $(lib)$(LIB_EXT)) # If LIBS specifies the rdd library, add all DB drivers. diff --git a/harbour/config/win/watcom.cf b/harbour/config/win/watcom.cf index f095337d8d..87146d52cf 100644 --- a/harbour/config/win/watcom.cf +++ b/harbour/config/win/watcom.cf @@ -52,9 +52,6 @@ CPPFLAGS += -3s endif CPPFLAGS += -i. -i$(TOP)$(ROOT)include -ifneq ($(HB_LIB_COMPILE),) -CPPFLAGS += -i$(HB_INC_COMPILE) -endif ifeq ($(HB_BUILD_DEBUG),yes) CPPFLAGS += -d2 @@ -96,27 +93,15 @@ ifeq ($(HB_BUILD_DEBUG),yes) LDFLAGS := debug all $(LDFLAGS) endif -ifeq ($(HB_LIB_COMPILE),) - LINKLIBS += $(foreach lib, $(LIBS), $(LIB_DIR)/$(lib)) -else - LINKLIBS += $(foreach lib, $(LIBS), $(HB_LIB_COMPILE)/$(lib)) -endif +LINKLIBS += $(foreach lib, $(LIBS), $(LIB_DIR)/$(lib)) # If LIBS specifies the rdd library, add all DB drivers. ifeq ($(findstring rdd,$(LIBS)),rdd) - ifeq ($(HB_LIB_COMPILE),) - RDDLIBS = $(foreach drv, $(HB_DB_DRIVERS), $(LIB_DIR)/$(drv)) - else - RDDLIBS = $(foreach drv, $(HB_DB_DRIVERS), $(HB_LIB_COMPILE)/$(drv)) - endif + RDDLIBS = $(foreach drv, $(HB_DB_DRIVERS), $(LIB_DIR)/$(drv)) endif ifeq ($(findstring rtl,$(LIBS)),rtl) - ifeq ($(HB_LIB_COMPILE),) - GTLIBS = $(foreach gt, $(HB_GT_LIBS), $(LIB_DIR)/$(gt)) - else - GTLIBS = $(foreach gt, $(HB_GT_LIBS), $(HB_LIB_COMPILE)/$(gt)) - endif + GTLIBS = $(foreach gt, $(HB_GT_LIBS), $(LIB_DIR)/$(gt)) endif LD_RULE = $(link_exe_file) $(HB_USER_LDFLAGS) diff --git a/harbour/config/win/xcc.cf b/harbour/config/win/xcc.cf index f380555028..7617e5eff4 100644 --- a/harbour/config/win/xcc.cf +++ b/harbour/config/win/xcc.cf @@ -34,11 +34,7 @@ LD = xlink.exe LD_OUT = -OUT: # Add all libraries specified in LIBS. -ifeq ($(HB_LIB_COMPILE),) LINKPATHS += -LIBPATH:$(LIB_DIR) -else -LINKPATHS += -LIBPATH:$(HB_LIB_COMPILE) -endif LINKLIBS += $(foreach lib, $(LIBS), $(lib)$(LIB_EXT)) # If LIBS specifies the rdd library, add all DB drivers.