2009-08-09 19:55 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

* Makefile * tests/Makefile * contrib/hbmisc/Makefile * contrib/hbwin/Makefile * utils/Makefile % Started converting '=' operators to ':=' where applicable. ; TODO: Rest of Makefiles. * contrib/hbwin/Makefile ! Including 'global.cf' directly to make HB_ARCHITECTURE/HB_COMPILER variables work in case we're relying on autodetection. ; TOFIX: Rest of Makefiles. * config/global.cf + Added self-inclusion check to allow adding this .cf file directly to Makefiles in order to force platform detection for cases where this information is needed for local decisions. * config/dos/global.cf - Deleted 'ifndef MK' construct. Purpose unknown, and not found similar for other platforms. * config/global.cf * config/globsh.cf + Added my copyright. * contrib/hbtpathy/tpwin.c * contrib/hbtpathy/tpos2.c % Deleted unnecessary headers.
2009-08-09 17:56:46 +00:00
parent 54a93f83da
commit edf24746e1
11 changed files with 85 additions and 43 deletions
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,14 +17,45 @@
   past entries belonging to author(s): Viktor Szakats.
 */

+2009-08-09 19:55 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * Makefile
+  * tests/Makefile
+  * contrib/hbmisc/Makefile
+  * contrib/hbwin/Makefile
+  * utils/Makefile
+    % Started converting '=' operators to ':=' where applicable.
+    ; TODO: Rest of Makefiles.
+
+  * contrib/hbwin/Makefile
+    ! Including 'global.cf' directly to make HB_ARCHITECTURE/HB_COMPILER
+      variables work in case we're relying on autodetection.
+    ; TOFIX: Rest of Makefiles.
+
+  * config/global.cf
+    + Added self-inclusion check to allow adding this .cf file
+      directly to Makefiles in order to force platform detection
+      for cases where this information is needed for local decisions.
+
+  * config/dos/global.cf
+    - Deleted 'ifndef MK' construct. Purpose unknown, and not
+      found similar for other platforms.
+
+  * config/global.cf
+  * config/globsh.cf
+    + Added my copyright.
+
+  * contrib/hbtpathy/tpwin.c
+  * contrib/hbtpathy/tpos2.c
+    % Deleted unnecessary headers.
+
 2009-08-09 09:42 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
  * contrib/hbxbp/xbpbrowse.prg
    ! Few more tweaks.
  * contrib/hbxbp/xbptreeview.prg
    - Commented out experimental CSS implementation.
    + Made public Harbour extention ::setStyleSheet( cStyleSheet ) method.
-      Now it is possible to fine tune widget's appearnce the way user 
-      can imagine. The supplied style sheet will be applied on top of 
+      Now it is possible to fine tune widget's appearnce the way user
+      can imagine. The supplied style sheet will be applied on top of
      existing one.
    % TODO: extend ::setStyleSheet() functionality the easiest way.

--- a/harbour/Makefile
+++ b/harbour/Makefile
@@ -6,7 +6,7 @@ ROOT := ./

 ifeq ($(HB_HOST_BUILD),yes)

-DIRS :=\
+DIRS := \
 	source \

 else
@@ -17,7 +17,7 @@ else
   HB_UTIL_DIR := utils{source}
 endif

-DIRS :=\
+DIRS := \
 	doc \
 	include \
 	source \
--- a/harbour/config/dos/global.cf
+++ b/harbour/config/dos/global.cf
@@ -2,12 +2,8 @@
 # $Id$
 #

-BIN_EXT := .exe
-
-ifndef MK
-
 all : first

-HB_GT_LIBS += gtdos
+BIN_EXT := .exe

-endif
+HB_GT_LIBS += gtdos
--- a/harbour/config/global.cf
+++ b/harbour/config/global.cf
@@ -2,6 +2,11 @@
 # $Id$
 #

+# ---------------------------------------------------------------
+# Copyright 2009 Viktor Szakats (harbour.01 syenar.hu)
+# See COPYING for licensing terms.
+# ---------------------------------------------------------------
+
 # ---------------------------------------------------------------
 # See GNU make docs here:
 #    http://www.gnu.org/software/make/manual/make.html
@@ -13,6 +18,9 @@
 #    http://www.gnu.org/prep/standards/standards.html
 # ---------------------------------------------------------------

+ifeq ($(GLOBAL_CF_),)
+GLOBAL_CF_ := yes
+
 # This isn't strictly necessary, but it does signficantly reduce
 # the number of rules that make has to evaluate otherwise, which may give
 # a performance boost on a slow system.
@@ -609,13 +617,13 @@ ifeq ($(HB_COMMERCE),yes)
 endif

 # Names of portable GT drivers
-HB_GT_LIBS=\
+HB_GT_LIBS := \
 	gtcgi \
 	gtpca \
 	gtstd \

 # Names of valid RDD libraries
-HB_DB_DRIVERS=\
+HB_DB_DRIVERS := \
 	rddntx \
 	rddnsx \
 	rddcdx \
@@ -626,7 +634,7 @@ HB_DB_DRIVERS=\
 	hbuddall \

 # Names of valid RDD subdirectories
-HB_DB_DIRS=\
+HB_DB_DIRS := \
 	dbfntx \
 	dbfnsx \
 	dbfcdx \
@@ -683,3 +691,5 @@ include $(TOP)$(ROOT)config/globsh.cf
 include $(TOP)$(ROOT)config/$(HB_ARCHITECTURE)/$(HB_COMPILER).cf

 endif
+
+endif # GLOBAL_CF_
--- a/harbour/config/globsh.cf
+++ b/harbour/config/globsh.cf
@@ -2,6 +2,11 @@
 # $Id$
 #

+# ---------------------------------------------------------------
+# Copyright 2009 Viktor Szakats (harbour.01 syenar.hu) (rework)
+# See COPYING for licensing terms.
+# ---------------------------------------------------------------
+
 # ---------------------------------------------------------------
 # See batch docs here:
 #    http://www.computerhope.com/batch.htm
--- a/harbour/contrib/hbmisc/Makefile
+++ b/harbour/contrib/hbmisc/Makefile
@@ -2,18 +2,18 @@
 # $Id$
 #

-ROOT = ../../
+ROOT := ../../

-LIBNAME=hbmisc
+LIBNAME := hbmisc

-C_SOURCES=\
+C_SOURCES := \
 	dates2.c \
 	hb_f.c \
 	spd.c \
 	strfmt.c \
 	stringsx.c \

-PRG_SOURCES=\
+PRG_SOURCES := \
 	fcomma.prg \
 	fileread.prg \
 	nconvert.prg \
--- a/harbour/contrib/hbtpathy/tpos2.c
+++ b/harbour/contrib/hbtpathy/tpos2.c
@@ -66,7 +66,6 @@
 #include "telepath.ch"

 #include <os2.h>
-#include <stdio.h>

 HB_FUNC( __TP_INITPORTSPEED )
 {
--- a/harbour/contrib/hbtpathy/tpwin.c
+++ b/harbour/contrib/hbtpathy/tpwin.c
@@ -62,8 +62,6 @@

 #include "telepath.ch"

-#include <stdio.h>
-
 HB_FUNC( __TP_INITPORTSPEED )
 {
   DCB dcb;
--- a/harbour/contrib/hbwin/Makefile
+++ b/harbour/contrib/hbwin/Makefile
@@ -2,22 +2,24 @@
 # $Id$
 #

-ROOT = ../../
+ROOT := ../../

-LIBNAME=hbwin
+LIBNAME := hbwin
+
+include $(TOP)$(ROOT)config/global.cf

 ifeq ($(HB_WITH_HBWIN),)
 ifeq ($(HB_ARCHITECTURE),win)
-HB_WITH_HBWIN=yes
+HB_WITH_HBWIN := yes
 endif
 ifeq ($(HB_ARCHITECTURE),wce)
-HB_WITH_HBWIN=yes
+HB_WITH_HBWIN := yes
 endif
 endif

 ifeq ($(HB_WITH_HBWIN),yes)

-C_SOURCES = \
+C_SOURCES := \
 	olecore.c \
 	oleinit.c \
 	axcore.c \
@@ -37,7 +39,7 @@ C_SOURCES = \
 	wapi_winbase.c \
 	wapi_winuser.c \

-PRG_SOURCES = \
+PRG_SOURCES := \
 	legacy.prg \
 	oleauto.prg \
 	axfunc.prg \
@@ -47,12 +49,12 @@ PRG_SOURCES = \
 	win_tprn.prg \
 	win_tprt.prg \

-C_HEADERS = \
+C_HEADERS := \
 	hbwapi.h \
 	hbwin.h \
 	hbwinole.h \

-PRG_HEADERS = \
+PRG_HEADERS := \
 	hbwin.ch \

 include $(TOP)$(ROOT)config/header.cf
--- a/harbour/tests/Makefile
+++ b/harbour/tests/Makefile
@@ -6,7 +6,7 @@ ifeq ($(HB_MAIN),)
 HB_MAIN = std
 endif

-ROOT = ../
+ROOT := ../

 LIBS=\
 	hbdebug \
@@ -27,7 +27,7 @@ endif

 ifeq ($(PM),) # PM not defined = build all files

-PRG_SOURCES=\
+PRG_SOURCES := \
 	ac_test.prg \
 	adirtest.prg \
 	ainstest.prg \
@@ -157,13 +157,13 @@ PRG_SOURCES=\
 	newrdd.prg \
 	brwpos.prg \

-PRG_HEADERS=\
+PRG_HEADERS := \
 	db_brows.ch \
 	cgi.ch \
 	keywords.ch \
 	test.ch \

-BAD_PRG_SOURCES=\
+BAD_PRG_SOURCES := \
 	alias.prg \
 	clasinit.prg \
 	dates4.prg \
@@ -193,11 +193,11 @@ BAD_PRG_SOURCES=\
 	tstprag.prg \
 	vec1.prg \

-C_SOURCES=\
+C_SOURCES := \

-C_HEADERS=\
+C_HEADERS := \

-BAD_C_SOURCES=\
+BAD_C_SOURCES := \
 	extend2.c \

 include $(TOP)$(ROOT)config/test.cf
@@ -205,14 +205,15 @@ include $(TOP)$(ROOT)config/test.cf
 else #PM defined = build specified file

 ifneq ($(findstring .prg,$(PM)),)
-  PRG_MAIN := $(PM)
+   PRG_MAIN := $(PM)
 else
-  ifneq ($(findstring .PRG,$(PM)),)
-    PRG_MAIN := $(PM)
-  else
-    PRG_MAIN := $(PM).prg
-  endif
+   ifneq ($(findstring .PRG,$(PM)),)
+      PRG_MAIN := $(PM)
+   else
+      PRG_MAIN := $(PM).prg
+   endif
 endif
+
 include $(TOP)$(ROOT)config/bin.cf

 endif
--- a/harbour/utils/Makefile
+++ b/harbour/utils/Makefile
@@ -2,9 +2,9 @@
 # $Id$
 #

-ROOT = ../
+ROOT := ../

-DIRS=\
+DIRS := \
 	hbrun \
 	hbmk2 \
 	hbi18n \