2009-11-15 16:55 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)

* contrib/hbqt/hbqt_misc.prg ! Added missing common.ch. * config/beos/gcc.mk * config/global.mk * config/bsd/gcc.mk * config/bin.mk * config/wce/mingwarm.mk * config/wce/poccarm.mk * config/wce/msvcarm.mk * config/darwin/gcc.mk * config/darwin/icc.mk * config/darwin/clang.mk * config/hpux/gcc.mk * config/dos/watcom.mk * config/dos/djgpp.mk * config/win/xcc.mk * config/win/mingw.mk * config/win/pocc.mk * config/win/bcc.mk * config/win/watcom.mk * config/win/icc.mk * config/win/cygwin.mk * config/win/msvc.mk * config/linux/watcom.mk * config/linux/gcc.mk * config/linux/icc.mk * config/linux/sunpro.mk * config/os2/watcom.mk * config/os2/gcc.mk * config/sunos/gcc.mk * config/sunos/sunpro.mk * Changed build system to add HB_USER_LIBS to the beginning of the lib list, just like in hbmk2. Please test, I didn't restest this feature in all targets.
2009-11-15 15:56:19 +00:00
parent a40afd16e8
commit 41fdd8e051
31 changed files with 76 additions and 30 deletions
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,43 @@
   past entries belonging to author(s): Viktor Szakats.
 */

+2009-11-15 16:55 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/hbqt/hbqt_misc.prg
+    ! Added missing common.ch.
+
+  * config/beos/gcc.mk
+  * config/global.mk
+  * config/bsd/gcc.mk
+  * config/bin.mk
+  * config/wce/mingwarm.mk
+  * config/wce/poccarm.mk
+  * config/wce/msvcarm.mk
+  * config/darwin/gcc.mk
+  * config/darwin/icc.mk
+  * config/darwin/clang.mk
+  * config/hpux/gcc.mk
+  * config/dos/watcom.mk
+  * config/dos/djgpp.mk
+  * config/win/xcc.mk
+  * config/win/mingw.mk
+  * config/win/pocc.mk
+  * config/win/bcc.mk
+  * config/win/watcom.mk
+  * config/win/icc.mk
+  * config/win/cygwin.mk
+  * config/win/msvc.mk
+  * config/linux/watcom.mk
+  * config/linux/gcc.mk
+  * config/linux/icc.mk
+  * config/linux/sunpro.mk
+  * config/os2/watcom.mk
+  * config/os2/gcc.mk
+  * config/sunos/gcc.mk
+  * config/sunos/sunpro.mk
+    * Changed build system to add HB_USER_LIBS to the beginning of the 
+      lib list, just like in hbmk2.
+      Please test, I didn't restest this feature in all targets.
+
 2009-11-15 13:35 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
  + contrib/hbqt/hbqt_misc.prg
    + Added missing file from commit.
--- a/harbour/config/beos/gcc.mk
+++ b/harbour/config/beos/gcc.mk
@@ -38,7 +38,7 @@ LD := $(HB_CCACHE) $(HB_CCPREFIX)$(HB_CMP)$(HB_CCPOSTFIX)
 LD_OUT := -o

 LIBPATHS := $(foreach dir,$(LIB_DIR) $(SYSLIBPATHS),-L$(dir))
-LDLIBS := $(foreach lib,$(LIBS) $(SYSLIBS),-l$(lib))
+LDLIBS := $(foreach lib,$(HB_USER_LIBS) $(LIBS) $(SYSLIBS),-l$(lib))

 LDFLAGS += $(LIBPATHS)

--- a/harbour/config/bin.mk
+++ b/harbour/config/bin.mk
@@ -101,11 +101,13 @@ endif

 ifneq ($(HB_PLATFORM_UNIX),)
   ifeq ($(BUILD_SHARED),yes)
-      SYSLIBS := $(HB_USER_LIBS)
+      SYSLIBS :=
      SYSLIBPATHS :=
   endif
 endif

+LIBS := $(HB_USER_LIBS) $(LIBS)
+
 include $(TOP)$(ROOT)config/$(HB_PLATFORM)/$(HB_COMPILER).mk
 include $(TOP)$(ROOT)config/c.mk
 include $(TOP)$(ROOT)config/prg.mk
--- a/harbour/config/bsd/gcc.mk
+++ b/harbour/config/bsd/gcc.mk
@@ -36,7 +36,7 @@ LD := $(HB_CCACHE) $(HB_CCPREFIX)$(HB_CMP)$(HB_CCPOSTFIX)
 LD_OUT := -o

 LIBPATHS := $(foreach dir,$(LIB_DIR) $(SYSLIBPATHS),-L$(dir))
-LDLIBS := $(foreach lib,$(LIBS) $(SYSLIBS),-l$(lib))
+LDLIBS := $(foreach lib,$(HB_USER_LIBS) $(LIBS) $(SYSLIBS),-l$(lib))

 LDFLAGS += $(LIBPATHS)

--- a/harbour/config/darwin/clang.mk
+++ b/harbour/config/darwin/clang.mk
@@ -49,7 +49,7 @@ LD := $(HB_CCACHE) $(HB_CCPREFIX)$(HB_CMP)$(HB_CCPOSTFIX)
 LD_OUT := -o$(subst x,x, )

 LIBPATHS := $(foreach dir,$(LIB_DIR) $(SYSLIBPATHS),-L$(dir))
-LDLIBS := $(foreach lib,$(LIBS) $(SYSLIBS),-l$(lib))
+LDLIBS := $(foreach lib,$(HB_USER_LIBS) $(LIBS) $(SYSLIBS),-l$(lib))

 LDFLAGS += $(LIBPATHS)

--- a/harbour/config/darwin/gcc.mk
+++ b/harbour/config/darwin/gcc.mk
@@ -49,7 +49,7 @@ LD := $(HB_CCACHE) $(HB_CCPREFIX)$(HB_CMP)$(HB_CCPOSTFIX)
 LD_OUT := -o$(subst x,x, )

 LIBPATHS := $(foreach dir,$(LIB_DIR) $(SYSLIBPATHS),-L$(dir))
-LDLIBS := $(foreach lib,$(LIBS) $(SYSLIBS),-l$(lib))
+LDLIBS := $(foreach lib,$(HB_USER_LIBS) $(LIBS) $(SYSLIBS),-l$(lib))

 LDFLAGS += $(LIBPATHS)

--- a/harbour/config/darwin/icc.mk
+++ b/harbour/config/darwin/icc.mk
@@ -38,7 +38,7 @@ LD := $(HB_CCACHE) $(HB_CMP)
 LD_OUT := -o

 LIBPATHS := $(foreach dir,$(LIB_DIR) $(SYSLIBPATHS),-L$(dir))
-LDLIBS := $(foreach lib,$(LIBS) $(SYSLIBS),-l$(lib))
+LDLIBS := $(foreach lib,$(HB_USER_LIBS) $(LIBS) $(SYSLIBS),-l$(lib))

 LDFLAGS += $(LIBPATHS)

--- a/harbour/config/dos/djgpp.mk
+++ b/harbour/config/dos/djgpp.mk
@@ -63,7 +63,7 @@ LD := $(HB_CCPATH)$(HB_CCPREFIX)$(HB_CMP)$(HB_CCPOSTFIX)
 LD_OUT := -o

 LIBPATHS := $(foreach dir,$(LIB_DIR) $(SYSLIBPATHS),-L$(dir))
-LDLIBS := $(foreach lib,$(LIBS) $(SYSLIBS),-l$(lib))
+LDLIBS := $(foreach lib,$(HB_USER_LIBS) $(LIBS) $(SYSLIBS),-l$(lib))

 # NOTE: The empty line directly before 'endef' HAVE TO exist!
 #       It causes that every command will be separated by LF
--- a/harbour/config/dos/watcom.mk
+++ b/harbour/config/dos/watcom.mk
@@ -65,7 +65,8 @@ else
   LDFLAGS += SYS dos4g OP stub=wstubq.exe
 endif

-LDLIBS := $(foreach lib,$(LIBS),$(LIB_DIR)/$(lib))
+LDLIBS := $(HB_USER_LIBS)
+LDLIBS += $(foreach lib,$(LIBS),$(LIB_DIR)/$(lib))

 ifneq ($(HB_LINKING_RTL),)
   ifneq ($(HB_HAS_WATT),)
--- a/harbour/config/global.mk
+++ b/harbour/config/global.mk
@@ -1109,6 +1109,8 @@ endif

 include $(TOP)$(ROOT)config/detect.mk

+SYSLIBS :=
+
 # Names of portable GT drivers
 HB_GT_LIBS := \
   gtcgi \
@@ -1126,8 +1128,6 @@ ifneq ($(HB_HAS_X11),)
   HB_GT_LIBS += gtxwc
 endif

-SYSLIBS := $(HB_USER_LIBS)
-
 # Names of valid RDD libraries
 HB_RDD_LIBS := \
   rddntx \
--- a/harbour/config/hpux/gcc.mk
+++ b/harbour/config/hpux/gcc.mk
@@ -42,7 +42,7 @@ LD := $(HB_CCACHE) $(HB_CCPREFIX)$(HB_CMP)$(HB_CCPOSTFIX)
 LD_OUT := -o

 LIBPATHS := $(foreach dir,$(LIB_DIR) $(SYSLIBPATHS),-L$(dir))
-LDLIBS := $(foreach lib,$(LIBS) $(SYSLIBS),-l$(lib))
+LDLIBS := $(foreach lib,$(HB_USER_LIBS) $(LIBS) $(SYSLIBS),-l$(lib))

 LDFLAGS += $(LIBPATHS)

--- a/harbour/config/linux/gcc.mk
+++ b/harbour/config/linux/gcc.mk
@@ -46,7 +46,7 @@ LD := $(HB_CCACHE) $(HB_CCPREFIX)$(HB_CMP)$(HB_CCPOSTFIX)
 LD_OUT := -o

 LIBPATHS := $(foreach dir,$(LIB_DIR) $(SYSLIBPATHS),-L$(dir))
-LDLIBS := $(foreach lib,$(LIBS) $(SYSLIBS),-l$(lib))
+LDLIBS := $(foreach lib,$(HB_USER_LIBS) $(LIBS) $(SYSLIBS),-l$(lib))

 LDFLAGS += $(LIBPATHS)

--- a/harbour/config/linux/icc.mk
+++ b/harbour/config/linux/icc.mk
@@ -51,7 +51,7 @@ LD := $(HB_CCACHE) $(HB_CMP)
 LD_OUT := -o

 LIBPATHS := $(foreach dir,$(LIB_DIR) $(SYSLIBPATHS),-L$(dir))
-LDLIBS := $(foreach lib,$(LIBS) $(SYSLIBS),-l$(lib))
+LDLIBS := $(foreach lib,$(HB_USER_LIBS) $(LIBS) $(SYSLIBS),-l$(lib))

 LDFLAGS += $(LIBPATHS)

--- a/harbour/config/linux/sunpro.mk
+++ b/harbour/config/linux/sunpro.mk
@@ -66,7 +66,7 @@ LD := $(HB_CCACHE) $(HB_CCPATH)$(HB_CCPREFIX)$(HB_CMP)$(HB_CCPOSTFIX)
 LD_OUT := -o$(subst x,x, )

 LIBPATHS := $(foreach dir,$(LIB_DIR) $(SYSLIBPATHS),-L$(dir))
-LDLIBS := $(foreach lib,$(LIBS) $(SYSLIBS),-l$(lib))
+LDLIBS := $(foreach lib,$(HB_USER_LIBS) $(LIBS) $(SYSLIBS),-l$(lib))

 LDFLAGS += $(LIBPATHS)

--- a/harbour/config/linux/watcom.mk
+++ b/harbour/config/linux/watcom.mk
@@ -61,7 +61,8 @@ ifeq ($(HB_BUILD_DEBUG),yes)
 endif
 LDFLAGS += SYS linux

-LDLIBS := $(foreach lib,$(LIBS),$(LIB_DIR)/$(lib))
+LDLIBS := $(HB_USER_LIBS)
+LDLIBS += $(foreach lib,$(LIBS),$(LIB_DIR)/$(lib))

 DY := $(LD)
 DFLAGS := OP quiet FORM elf dll LIBPATH $(WATCOM)/lib386 LIBPATH $(WATCOM)/lib386/linux OP exportall
--- a/harbour/config/os2/gcc.mk
+++ b/harbour/config/os2/gcc.mk
@@ -62,7 +62,7 @@ LD := $(HB_CCPATH)$(HB_CCPREFIX)$(HB_CMP)$(HB_CCPOSTFIX)
 LD_OUT := -o$(subst x,x, )

 LIBPATHS := $(foreach dir,$(LIB_DIR) $(SYSLIBPATHS),-L$(dir))
-LDLIBS := $(foreach lib,$(LIBS) $(SYSLIBS),-l$(lib))
+LDLIBS := $(foreach lib,$(HB_USER_LIBS) $(LIBS) $(SYSLIBS),-l$(lib))

 LDFLAGS += $(LIBPATHS)

--- a/harbour/config/os2/watcom.mk
+++ b/harbour/config/os2/watcom.mk
@@ -63,7 +63,8 @@ ifeq ($(HB_BUILD_DEBUG),yes)
 endif
 LDFLAGS += SYS os2v2

-LDLIBS := $(foreach lib,$(LIBS),$(LIB_DIR)/$(lib))
+LDLIBS := $(HB_USER_LIBS)
+LDLIBS += $(foreach lib,$(LIBS),$(LIB_DIR)/$(lib))

 DY := $(LD)
 DFLAGS := OP quiet SYS os2v2_dll
--- a/harbour/config/sunos/gcc.mk
+++ b/harbour/config/sunos/gcc.mk
@@ -40,7 +40,7 @@ LD := $(HB_CCACHE) $(HB_CCPREFIX)$(HB_CMP)$(HB_CCPOSTFIX)
 LD_OUT := -o

 LIBPATHS := $(foreach dir,$(LIB_DIR) $(SYSLIBPATHS),-L$(dir))
-LDLIBS := $(foreach lib,$(LIBS) $(SYSLIBS),-l$(lib))
+LDLIBS := $(foreach lib,$(HB_USER_LIBS) $(LIBS) $(SYSLIBS),-l$(lib))

 LDFLAGS += $(LIBPATHS)

--- a/harbour/config/sunos/sunpro.mk
+++ b/harbour/config/sunos/sunpro.mk
@@ -63,7 +63,7 @@ LD := $(HB_CCACHE) $(HB_CCPATH)$(HB_CCPREFIX)$(HB_CMP)$(HB_CCPOSTFIX)
 LD_OUT := -o$(subst x,x, )

 LIBPATHS := $(foreach dir,$(LIB_DIR) $(SYSLIBPATHS),-L$(dir))
-LDLIBS := $(foreach lib,$(LIBS) $(SYSLIBS),-l$(lib))
+LDLIBS := $(foreach lib,$(HB_USER_LIBS) $(LIBS) $(SYSLIBS),-l$(lib))

 LDFLAGS += $(LIBPATHS)

--- a/harbour/config/wce/mingwarm.mk
+++ b/harbour/config/wce/mingwarm.mk
@@ -46,7 +46,7 @@ LD := $(HB_CCPATH)$(HB_CCPREFIX)$(HB_CMP)$(HB_CCPOSTFIX)
 LD_OUT := -o$(subst x,x, )

 LIBPATHS := -L$(LIB_DIR)
-LDLIBS := $(foreach lib,$(LIBS) $(SYSLIBS),-l$(lib))
+LDLIBS := $(foreach lib,$(HB_USER_LIBS) $(LIBS) $(SYSLIBS),-l$(lib))

 LDFLAGS += $(LIBPATHS)

--- a/harbour/config/wce/msvcarm.mk
+++ b/harbour/config/wce/msvcarm.mk
@@ -65,7 +65,7 @@ LD_OUT := -Fe
 SYSLIBS += corelibc

 LIBPATHS := -libpath:$(LIB_DIR)
-LDLIBS := $(foreach lib,$(LIBS) $(SYSLIBS),$(lib)$(LIB_EXT))
+LDLIBS := $(foreach lib,$(HB_USER_LIBS) $(LIBS) $(SYSLIBS),$(lib)$(LIB_EXT))

 LDFLAGS += -nologo -link -subsystem:windowsce -nodefaultlib:oldnames.lib -nodefaultlib:kernel32.lib
 ifeq ($(filter $(HB_COMPILER_VER),600 700 710),)
--- a/harbour/config/wce/poccarm.mk
+++ b/harbour/config/wce/poccarm.mk
@@ -47,7 +47,7 @@ LD_OUT := -out:
 SYSLIBS += corelibc

 LIBPATHS := -libpath:$(LIB_DIR)
-LDLIBS := $(foreach lib,$(LIBS) $(SYSLIBS),$(lib)$(LIB_EXT))
+LDLIBS := $(foreach lib,$(HB_USER_LIBS) $(LIBS) $(SYSLIBS),$(lib)$(LIB_EXT))

 LDFLAGS += -subsystem:windows
 LDFLAGS += $(LIBPATHS)
--- a/harbour/config/win/bcc.mk
+++ b/harbour/config/win/bcc.mk
@@ -54,7 +54,8 @@ LD_RULE = $(LD) $(LDFLAGS) $(HB_LDFLAGS) $(HB_USER_LDFLAGS) c0x32.obj $(^F), $(s
 LIBPATHS := -L$(LIB_DIR)
 # It's probably not necessary in native Windows but I need it
 # for my Linux box because -L<path> seems to not work with WINE
-LDLIBS := $(foreach lib,$(LIBS),$(LIB_DIR)/$(lib)$(LIB_EXT))
+LDLIBS := $(foreach lib,$(HB_USER_LIBS),$(lib)$(LIB_EXT))
+LDLIBS += $(foreach lib,$(LIBS),$(LIB_DIR)/$(lib)$(LIB_EXT))
 LDLIBS += $(foreach lib,$(SYSLIBS),$(lib)$(LIB_EXT))

 AR := tlib.exe
--- a/harbour/config/win/cygwin.mk
+++ b/harbour/config/win/cygwin.mk
@@ -45,7 +45,7 @@ LD := $(HB_CCPATH)$(HB_CCPREFIX)$(HB_CMP)$(HB_CCPOSTFIX)
 LD_OUT := -o

 LIBPATHS := -L$(LIB_DIR)
-LDLIBS := $(foreach lib,$(LIBS) $(SYSLIBS),-l$(lib))
+LDLIBS := $(foreach lib,$(HB_USER_LIBS) $(LIBS) $(SYSLIBS),-l$(lib))

 LDFLAGS += $(LIBPATHS)

--- a/harbour/config/win/icc.mk
+++ b/harbour/config/win/icc.mk
@@ -44,7 +44,7 @@ LD := xilink.exe
 LD_OUT := -out:

 LIBPATHS := -libpath:$(LIB_DIR)
-LDLIBS := $(foreach lib,$(LIBS) $(SYSLIBS),$(lib)$(LIB_EXT))
+LDLIBS := $(foreach lib,$(HB_USER_LIBS) $(LIBS) $(SYSLIBS),$(lib)$(LIB_EXT))

 LDFLAGS += -nologo $(LIBPATHS)

--- a/harbour/config/win/mingw.mk
+++ b/harbour/config/win/mingw.mk
@@ -48,7 +48,7 @@ LD := $(HB_CCPATH)$(HB_CCPREFIX)$(HB_CMP)$(HB_CCPOSTFIX)
 LD_OUT := -o$(subst x,x, )

 LIBPATHS := -L$(LIB_DIR)
-LDLIBS := $(foreach lib,$(LIBS) $(SYSLIBS),-l$(lib))
+LDLIBS := $(foreach lib,$(HB_USER_LIBS) $(LIBS) $(SYSLIBS),-l$(lib))

 # Add the standard C main() entry
 ifeq ($(HB_MAIN),std)
--- a/harbour/config/win/msvc.mk
+++ b/harbour/config/win/msvc.mk
@@ -63,7 +63,7 @@ LD := link.exe
 LD_OUT := -out:

 LIBPATHS := -libpath:$(LIB_DIR)
-LDLIBS := $(foreach lib,$(LIBS) $(SYSLIBS),$(lib)$(LIB_EXT))
+LDLIBS := $(foreach lib,$(HB_USER_LIBS) $(LIBS) $(SYSLIBS),$(lib)$(LIB_EXT))

 LDFLAGS += -nologo $(LIBPATHS)

--- a/harbour/config/win/pocc.mk
+++ b/harbour/config/win/pocc.mk
@@ -42,7 +42,7 @@ LD := polink.exe
 LD_OUT := -out:

 LIBPATHS := -libpath:$(LIB_DIR)
-LDLIBS := $(foreach lib,$(LIBS) $(SYSLIBS),$(lib)$(LIB_EXT))
+LDLIBS := $(foreach lib,$(HB_USER_LIBS) $(LIBS) $(SYSLIBS),$(lib)$(LIB_EXT))

 LDFLAGS += -subsystem:console
 LDFLAGS += $(LIBPATHS)
--- a/harbour/config/win/watcom.mk
+++ b/harbour/config/win/watcom.mk
@@ -63,7 +63,8 @@ ifeq ($(HB_BUILD_DEBUG),yes)
 endif
 LDFLAGS += SYS nt

-LDLIBS := $(foreach lib,$(LIBS),$(LIB_DIR)/$(lib))
+LDLIBS := $(foreach lib,$(HB_USER_LIBS),$(lib))
+LDLIBS += $(foreach lib,$(LIBS),$(LIB_DIR)/$(lib))
 LDLIBS += $(foreach lib,$(SYSLIBS),$(lib))

 DY := $(LD)
--- a/harbour/config/win/xcc.mk
+++ b/harbour/config/win/xcc.mk
@@ -46,7 +46,7 @@ LD := xlink.exe
 LD_OUT := -out:

 LIBPATHS := -libpath:$(LIB_DIR)
-LDLIBS := $(foreach lib,$(LIBS) $(SYSLIBS),$(lib)$(LIB_EXT))
+LDLIBS := $(foreach lib,$(HB_USER_LIBS) $(LIBS) $(SYSLIBS),$(lib)$(LIB_EXT))

 LDFLAGS += $(LIBPATHS)

--- a/harbour/contrib/hbqt/hbqt_misc.prg
+++ b/harbour/contrib/hbqt/hbqt_misc.prg
@@ -50,6 +50,8 @@
 *
 */

+#include "common.ch"
+
 #if defined( __HB_DEBUG__ )

 FUNCTION _HBQT_DEBUG( ... )