2009-08-21 17:33 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

* source/pp/Makefile
    - Deleted just added global.mk. It's not needed.

  * config/globsh.mk
    + Added $(MV) variable with move command.
    + Added $(LN) variable with *nix link command.
    ! Fixed $(RM) in os2 shell rules to use os2-rm.exe 
      instead of shell provided del. Latter show errors 
      if filename doesn't exist, and we're now using 
      clean rules copied from dos shell, which doesn't 
      make extra existance checks. Well, to put it 
      shortly I've synced $(RM) with dos shell solution.

  + config/dj-mv.exe
  * config/readme.txt
    + Added DJGPP mv tool.

  * bin/hb-func.sh
    ! Fixed typo in syslib lone in a recent commit.

harbour/ChangeLog

@@ -17,6 +17,27 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-08-21 17:33 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * source/pp/Makefile
+    - Deleted just added global.mk. It's not needed.
+
+  * config/globsh.mk
+    + Added $(MV) variable with move command.
+    + Added $(LN) variable with *nix link command.
+    ! Fixed $(RM) in os2 shell rules to use os2-rm.exe
+      instead of shell provided del. Latter show errors
+      if filename doesn't exist, and we're now using
+      clean rules copied from dos shell, which doesn't
+      make extra existance checks. Well, to put it
+      shortly I've synced $(RM) with dos shell solution.
+
+  + config/dj-mv.exe
+  * config/readme.txt
+    + Added DJGPP mv tool.
+
+  * bin/hb-func.sh
+    ! Fixed typo in syslib lone in a recent commit.
+
 2009-08-21 17:10 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * source/pp/Makefile
     ! Including global.mk at the top to make sure OBJ_DYN_PREFIX is

harbour/bin/hb-func.sh

@@ -190,7 +190,7 @@ mk_hbtools()
     fi
     if [ "${HB_COMPILER}" = "mingw" ] || \
        [ "${HB_COMPILER}" = "mingw64" ]; then
-        HB_SYS_LIBS="${HB_SYS_LIBS} -luser32 -lwinspool -lgdi32 -lcomctl32  -ladvapi32-lcomdlg32 -lole32 -loleaut32 -luuid -lws2_32"
+        HB_SYS_LIBS="${HB_SYS_LIBS} -luser32 -lwinspool -lgdi32 -lcomctl32 -ladvapi32 -lcomdlg32 -lole32 -loleaut32 -luuid -lws2_32"
         HB_WITHOUT_X11="yes"
     elif [ "${HB_COMPILER}" = "mingwarm" ]; then
         HB_SYS_LIBS="${HB_SYS_LIBS} -lwininet -lws2 -lcommdlg -lcommctrl -luuid -lole32 -loleaut32"

harbour/config/globsh.mk

@@ -35,6 +35,8 @@ MK := $(MAKE)
 RM := rm -f
 RDP := rm -f -r
 CP := cp -f
+MV := mv -f
+LN := ln -sf
 MD := mkdir
 MDP := mkdir -p
 ECHO := echo
@@ -75,6 +77,8 @@ MK := "$(subst \,/,$(MAKE))"
 RM := del /q /f
 RDP := rmdir /q /s
 CP := copy
+MV := move /y
+LN :=
 MD := mkdir
 MDP := mkdir
 ECHO := echo
@@ -110,9 +114,11 @@ ifeq ($(HB_SHELL),os2)
 #       [vszakats]
 
 MK := $(subst \,/,$(MAKE))
-RM := del /n
+RM := $(TOOL_DIR)os2-rm -f
 RDP := $(TOOL_DIR)os2-rm -fr
 CP := copy
+MV := move /y
+LN :=
 MD := mkdir
 MDP := $(TOOL_DIR)os2-mkdir -p
 ECHO := echo
@@ -142,6 +148,8 @@ MK := $(subst \,/,$(MAKE))
 RM := $(TOOL_DIR)dj-rm -f
 RDP := $(TOOL_DIR)dj-rm -fr
 CP := $(TOOL_DIR)dj-cp -f
+MV := $(TOOL_DIR)dj-mv -f
+LN :=
 MD := $(TOOL_DIR)dj-mkdir
 MDP := $(TOOL_DIR)dj-mkdir -p
 ECHO := $(TOOL_DIR)dj-echo

harbour/config/readme.txt

@@ -27,7 +27,7 @@ Included utilities are:
      Licence:
         GPL 2 (see below)
      Links to included binaries + sources:
-        - DJGPP (dj-mkdir.exe, dj-rm.exe, dj-cp.exe, dj-echo.exe)
+        - DJGPP (dj-mkdir.exe, dj-rm.exe, dj-cp.exe, dj-mv.exe, dj-echo.exe)
              ftp://ftp.delorie.com/pub/djgpp/current/v2gnu/
              ftp://ftp.delorie.com/pub/djgpp/current/v2gnu/fil41b.zip
              ftp://ftp.delorie.com/pub/djgpp/current/v2gnu/fil41s.zip

harbour/source/pp/Makefile

@@ -4,8 +4,6 @@
 
 ROOT := ../../
 
-include $(TOP)$(ROOT)config/global.mk
-
 C_SOURCES := \
    pptable.c \
    ppcore.c \