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

+ config/Makefile
    + Added Makefile to show an error with simple one-liner
      instruction to guide users who want to start provided
      GNU Make executables right in the config dir.
      This is wrong, they should be started in root.
      Anyhow maybe I'll move these make executables to root,
      with these names:
         dos-make.exe
         os2-make.exe
         win-make.exe
      This will avoid above problem, it simply cannot be
      [messed] up anymore. Well, so I imagine.
      These names also won't collide with original names
      of these tools, so users who want to stick with external
      tools, can continue to do so.
      The other option is that I delete them from SVN.

  * config/global.mk
    + Showing warning to user if she's using DOS shell
      (which probably means DOS based GNU Make) on Windows system.
      It should also work for most features, but not recommended
      and there is little reason to do this in production
      environment.

  * contrib/hbqt/Makefile
  * contrib/hbqt/generator/hbqtgen.prg
  + contrib/hbqt/filelist.mk
  - contrib/hbqt/Makefile_gen
    * Renamed Makefile to filelist.mk to stick
      with known short filenames and extensions.

  * INSTALL
    * Minor.

harbour/ChangeLog

@@ -17,6 +17,41 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-08-22 21:46 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  + config/Makefile
+    + Added Makefile to show an error with simple one-liner
+      instruction to guide users who want to start provided
+      GNU Make executables right in the config dir.
+      This is wrong, they should be started in root.
+      Anyhow maybe I'll move these make executables to root,
+      with these names:
+         dos-make.exe
+         os2-make.exe
+         win-make.exe
+      This will avoid above problem, it simply cannot be
+      [messed] up anymore. Well, so I imagine.
+      These names also won't collide with original names
+      of these tools, so users who want to stick with external
+      tools, can continue to do so.
+      The other option is that I delete them from SVN.
+
+  * config/global.mk
+    + Showing warning to user if she's using DOS shell
+      (which probably means DOS based GNU Make) on Windows system.
+      It should also work for most features, but not recommended
+      and there is little reason to do this in production
+      environment.
+
+  * contrib/hbqt/Makefile
+  * contrib/hbqt/generator/hbqtgen.prg
+  + contrib/hbqt/filelist.mk
+  - contrib/hbqt/Makefile_gen
+    * Renamed Makefile to filelist.mk to stick
+      with known short filenames and extensions.
+
+  * INSTALL
+    * Minor.
+
 2009-08-22 16:54 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * config/rules.mk
   * config/dyn.mk

harbour/INSTALL

@@ -69,7 +69,8 @@ HOW TO BUILD AND INSTALL HARBOUR FROM SOURCE
              http://sourceforge.net/projects/mingw/files/GNU%20Make/Current%20Release_%20mingw32-make-3.81-20080326/mingw32-make-3.81-20080326-3.tar.gz/download
           Unpack it to your PATH or Harbour source root directory.
           If you use MinGW compiler, you already have GNU Make.
-          For convenience you may also use included config/mingw32-make.exe instead.
+          For convenience you may also use included config/mingw32-make.exe
+          instead.
 
     [ > set HB_COMPILER=<mingw|msvc|watcom|bcc|pocc|cygwin|...> ]
       > mingw32-make install
@@ -119,7 +120,8 @@ HOW TO BUILD AND INSTALL HARBOUR FROM SOURCE
       2.) You need to get GNU Make. We recommend this link:
              ftp://ftp.delorie.com/pub/djgpp/beta/v2gnu/mak381b.zip
           Unpack it to your PATH or Harbour source root directory.
-          For convenience you may also use included config/dj-make.exe instead.
+          For convenience you may also use included config/dj-make.exe
+          instead.
 
     [ > set HB_COMPILER=<djgpp|watcom> ]
       > make install
@@ -141,7 +143,8 @@ HOW TO BUILD AND INSTALL HARBOUR FROM SOURCE
              ftp://hobbes.nmsu.edu/pub/os2/dev/util/make-3.81-r2-bin-static.zip
           If you use other host, please refer to other platform instructions
           in this section.
-          For convenience you may also use included config/os2-make.exe instead.
+          For convenience you may also use included config/os2-make.exe
+          instead.
 
     [ > set HB_COMPILER=<gcc|watcom> ]
       > make install

harbour/config/Makefile

@@ -0,0 +1,5 @@
+#
+# $Id$
+#
+
+all: ; $(error ! Error: GNU Make must be run from the Harbour root directory)

harbour/config/global.mk

@@ -220,7 +220,7 @@ ifeq ($(HB_INIT_DONE),)
       endif
 
       ifeq ($(HB_BUILD_PKG),no)
-         $(warning ! Warning: Use 'clean install' from Harbour root directory to create a release package)
+         $(warning ! Warning: Use 'clean install' from Harbour root directory to create a release package.)
       endif
 
       # Enforce some basic setting for release packages
@@ -469,6 +469,12 @@ ifeq ($(HB_INIT_DONE),)
    ifneq ($(MAKE_381),)
       $(info ! HB_HOST_ARCH: $(HB_HOST_ARCH)$(if $(HB_HOST_CPU), ($(HB_HOST_CPU)),)  HB_SHELL: $(HB_SHELL))
    endif
+
+   ifeq ($(HB_HOST_ARCH)-$(HB_SHELL),win-dos)
+      $(warning ! Warning: You're using DOS GNU Make executable (or DOS shell) on Windows host.)
+      $(warning !          Not recommended combination. Some features will be disabled.)
+      $(warning !          Please use the Windows build of GNU Make.)
+   endif
 endif
 
 HB_ARCH_AUTO :=
@@ -828,7 +834,7 @@ ifneq ($(HB_HOST_ARCH)$(HB_HOST_CPU),$(HB_ARCHITECTURE)$(HB_CPU))
                HB_BIN_COMPILE := $(realpath $(HB_BIN_COMPILE))
             endif
             ifeq ($(HB_BIN_COMPILE),)
-               $(warning ! Warning: HB_BIN_COMPILE not specified. Couldn't find native build)
+               $(warning ! Warning: HB_BIN_COMPILE not specified. Couldn't find native build.)
             else
                ifneq ($(MAKE_381),)
                   $(info ! HB_BIN_COMPILE not specified. Automatically set to: $(HB_BIN_COMPILE))

harbour/contrib/hbqt/Makefile

@@ -68,7 +68,7 @@ ifneq ($(strip $(HB_INC_QT_OK)),spec)
    HB_CFLAGS += $(foreach d,$(HB_INC_QT_OK),-I$(d) -I$(d)/Qt -I$(d)/QtCore -I$(d)/QtGui -I$(d)/QtNetwork -I$(d)/QtWebKit)
 endif
 
-include $(TOP)$(ROOT)contrib/hbqt/Makefile_gen
+include $(TOP)$(ROOT)contrib/hbqt/filelist.mk
 
 PRG_HEADERS := \
    hbqt.ch \

harbour/contrib/hbqt/generator/hbqtgen.prg

@@ -1361,7 +1361,7 @@ STATIC FUNCTION Build_Class( cWidget, cls_, doc_, cPathOut, subCls_ )
 /*----------------------------------------------------------------------*/
 
 STATIC FUNCTION Build_MakeFile( cpp_, prg_, cPathOut )
-   LOCAL cFile := cPathOut + s_PathSep + "Makefile_gen"
+   LOCAL cFile := cPathOut + s_PathSep + "filelist.mk"
    LOCAL txt_ := {}
    LOCAL s