2009-08-15 00:40 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

* INSTALL
  * make_gnu.sh
  * config/global.cf
  * config/lib.cf
  * config/bin.cf
    % Deleted HB_USER_MAKEFLAGS envvar.
      Simply pass these flags to make executable (or .sh scripts)

  * config/global.cf
    + Added some TODO/NOTE/TOFIX about GNU Make version compatibility
      of some feature we're using.
    + Showing MAKEFLAGS.
    % Using MAKEFLAGS for --no-print-directory trick.

harbour/ChangeLog

@@ -17,6 +17,21 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-08-15 00:40 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * INSTALL
+  * make_gnu.sh
+  * config/global.cf
+  * config/lib.cf
+  * config/bin.cf
+    % Deleted HB_USER_MAKEFLAGS envvar.
+      Simply pass these flags to make executable (or .sh scripts)
+
+  * config/global.cf
+    + Added some TODO/NOTE/TOFIX about GNU Make version compatibility
+      of some feature we're using.
+    + Showing MAKEFLAGS.
+    % Using MAKEFLAGS for --no-print-directory trick.
+
 2009-08-14 23:55 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * INSTALL
     + Separated instructions for linux/darwin and rest of *nixes.

harbour/INSTALL

@@ -303,7 +303,6 @@ OPTIONS AVAILABLE WHEN BUILDING HARBOUR
    - HB_USER_CFLAGS            User C compiler options
    - HB_USER_LDFLAGS           User linker options for executables
    - HB_USER_AFLAGS            User linker options for libraries
-   - HB_USER_MAKEFLAGS         User GNU Make options
 
    - HB_INSTALL_PREFIX         Target root directory to install Harbour files.
                                This will default to Harbour source tree.

harbour/config/bin.cf

@@ -79,7 +79,7 @@ ALL_OBJS = $(ALL_C_OBJS) $(ALL_PRG_OBJS)
 first:: dirbase descend
 
 descend:: dirbase
-	+@$(MK) $(MKFLAGS) -C $(OBJ_DIR) -f $(GRANDP)Makefile TOP=$(GRANDP) $(BIN_NAME) $(HB_USER_MAKEFLAGS)
+	+@$(MK) $(MKFLAGS) -C $(OBJ_DIR) -f $(GRANDP)Makefile TOP=$(GRANDP) $(BIN_NAME)
 
 vpath $(BIN_NAME) $(BIN_DIR)
 $(BIN_NAME) : $(ALL_OBJS)

harbour/config/global.cf

@@ -20,6 +20,11 @@
 #    http://www.gnu.org/prep/standards/standards.html
 # ---------------------------------------------------------------
 
+# TOFIX: $(realpath/abspath) need GNU Make 3.81 or upper
+# TOFIX: $(eval) needs GNU Make 3.80 or upper
+# NOTE: $(error/warning/call/if) need GNU Make 3.78 or upper
+# NOTE: $(wordlist/basename/suffix) need GNU Make 3.76 or upper
+
 ifeq ($(GLOBAL_CF_),)
 GLOBAL_CF_ := yes
 
@@ -224,7 +229,7 @@ ifeq ($(HB_INIT_DONE),)
       # Macros:
       #   -DHB_PCRE_REGEX, -DHB_POSIX_REGEX, -DHB_EXT_ZLIB, -DHB_HAS_GPM
 
-      $(info ! MAKE: $(MAKE) $(MAKE_VERSION) $(HB_MAKECMDGOALS) $(SHELL))
+      $(info ! MAKE: $(MAKE) $(MAKE_VERSION) $(HB_MAKECMDGOALS) $(MAKEFLAGS) $(SHELL))
       ifneq ($(HB_USER_PRGFLAGS),)
          $(info ! HB_USER_PRGFLAGS: $(HB_USER_PRGFLAGS))
       endif
@@ -237,9 +242,6 @@ ifeq ($(HB_INIT_DONE),)
       ifneq ($(HB_USER_AFLAGS),)
          $(info ! HB_USER_AFLAGS: $(HB_USER_AFLAGS))
       endif
-      ifneq ($(HB_USER_MAKEFLAGS),)
-         $(info ! HB_USER_MAKEFLAGS: $(HB_USER_MAKEFLAGS))
-      endif
       ifneq ($(HB_INSTALL_PREFIX),)
          $(info ! HB_INSTALL_PREFIX: $(HB_INSTALL_PREFIX))
       endif
@@ -926,7 +928,7 @@ export CLIPPER :=
 export CLIPPERCMD :=
 
 # relevant only on non-*nix hosts where --print-directory is on by default
-ifeq ($(findstring -w,$(HB_USER_MAKEFLAGS))$(findstring --print-directory,$(HB_USER_MAKEFLAGS)),)
+ifeq ($(findstring w,$(MAKEFLAGS)),)
    MKFLAGS := --no-print-directory
 endif
 

harbour/config/lib.cf

@@ -22,7 +22,7 @@ ALL_OBJS = $(ALL_C_OBJS) $(ALL_PRG_OBJS)
 first:: dirbase descend
 
 descend:: dirbase
-	+@$(MK) $(MKFLAGS) -C $(OBJ_DIR) -f $(GRANDP)Makefile TOP=$(GRANDP) $(LIB_NAME) $(HB_USER_MAKEFLAGS)
+	+@$(MK) $(MKFLAGS) -C $(OBJ_DIR) -f $(GRANDP)Makefile TOP=$(GRANDP) $(LIB_NAME)
 
 vpath $(LIB_NAME) $(LIB_DIR)
 $(LIB_NAME) : $(ALL_OBJS)

harbour/make_gnu.sh

@@ -149,10 +149,10 @@ else
 
     case "$HB_ARCHITECTURE" in
         bsd|hpux|sunos)
-            gmake $HB_USER_MAKEFLAGS $*
+            gmake $*
             ;;
         *)
-            make $HB_USER_MAKEFLAGS $*
+            make $*
             ;;
     esac