From 8106523a599a4a4ebed02bfbaf824229d2f5522e Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sun, 9 Aug 2009 19:52:17 +0000 Subject: [PATCH] 2009-08-09 21:42 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * config/global.cf ! Fixed 'sh' HB_SHELL detection. Problem experienced with Cygwin GNU Make, where SHLVL isn't defined on the first level. Now also checking for SHELL=/bin/sh to detect sh shell. * tests/multifnc/Makefile * external/sqlite3/Makefile * external/libhpdf/Makefile * external/libpng/Makefile * contrib/gtalleg/Makefile * contrib/hbodbc/Makefile * contrib/hbtpathy/Makefile * contrib/hbsqlit3/Makefile * contrib/hbblat/Makefile * contrib/hbqt/Makefile * contrib/hbfbird/Makefile * contrib/hbxbp/Makefile * contrib/hbcurl/Makefile * contrib/gtqtc/Makefile * contrib/rddsql/sddfb/Makefile * contrib/rddsql/sddodbc/Makefile * contrib/rddado/Makefile * contrib/gtwvg/Makefile * contrib/rddads/Makefile * contrib/hbfimage/Makefile * contrib/hbtip/Makefile * contrib/hbwin/Makefile * contrib/hbssl/Makefile * source/vm/Makefile * source/vm/vmmt/Makefile * source/rtl/gtdos/Makefile * source/rtl/gtwin/Makefile * source/rtl/gtxwc/Makefile * source/rtl/gtcrs/Makefile * source/rtl/gttrm/Makefile * source/rtl/Makefile * source/rtl/gtos2/Makefile * source/rtl/gtsln/Makefile * source/rtl/gtgui/Makefile * source/rtl/gtwvt/Makefile * source/rdd/Makefile * source/rdd/dbffpt/Makefile ! Including 'global.cf' directly to make HB_ARCHITECTURE/HB_COMPILER/HB_COMMERCE variables work in case we're relying on autodetection. ; TODO: May need to do this for a few other cases where detection is relying on some additional variables. Like HB_XBUILD, which needs to be cleaned further, maybe autodetection added. ; NOTE: Above changes mean that from now on for basic build usage it's enough to have the compiler in PATH and to issue a simple 'make' or 'mingw32-make' (or whatever GNU Make is called in that environment), and make process should just work. IOW, no need to go through "starter" scripts in root (make_gnu.*). --- harbour/ChangeLog | 57 ++++++++++++++++++++++++- harbour/config/global.cf | 39 ++++++++++------- harbour/contrib/gtalleg/Makefile | 2 + harbour/contrib/gtqtc/Makefile | 2 + harbour/contrib/gtwvg/Makefile | 6 ++- harbour/contrib/hbblat/Makefile | 2 + harbour/contrib/hbcurl/Makefile | 2 + harbour/contrib/hbfbird/Makefile | 2 + harbour/contrib/hbfimage/Makefile | 2 + harbour/contrib/hbodbc/Makefile | 2 + harbour/contrib/hbqt/Makefile | 2 + harbour/contrib/hbsqlit3/Makefile | 2 + harbour/contrib/hbssl/Makefile | 2 + harbour/contrib/hbtip/Makefile | 2 + harbour/contrib/hbtpathy/Makefile | 2 + harbour/contrib/hbwin/Makefile | 4 +- harbour/contrib/hbxbp/Makefile | 6 ++- harbour/contrib/rddado/Makefile | 2 + harbour/contrib/rddads/Makefile | 2 + harbour/contrib/rddsql/sddfb/Makefile | 2 + harbour/contrib/rddsql/sddodbc/Makefile | 2 + harbour/external/libhpdf/Makefile | 6 ++- harbour/external/libpng/Makefile | 6 ++- harbour/external/sqlite3/Makefile | 6 ++- harbour/source/rdd/Makefile | 2 + harbour/source/rdd/dbffpt/Makefile | 6 ++- harbour/source/rtl/Makefile | 2 + harbour/source/rtl/gtcrs/Makefile | 2 + harbour/source/rtl/gtdos/Makefile | 2 + harbour/source/rtl/gtgui/Makefile | 2 + harbour/source/rtl/gtos2/Makefile | 2 + harbour/source/rtl/gtsln/Makefile | 2 + harbour/source/rtl/gttrm/Makefile | 2 + harbour/source/rtl/gtwin/Makefile | 2 + harbour/source/rtl/gtwvt/Makefile | 2 + harbour/source/rtl/gtxwc/Makefile | 2 + harbour/source/vm/Makefile | 2 + harbour/source/vm/vmmt/Makefile | 2 + harbour/tests/multifnc/Makefile | 14 +++--- 39 files changed, 171 insertions(+), 37 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 5dcf8c96ec..2f7db2a845 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,61 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-08-09 21:42 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * config/global.cf + ! Fixed 'sh' HB_SHELL detection. Problem experienced with + Cygwin GNU Make, where SHLVL isn't defined on the first + level. Now also checking for SHELL=/bin/sh to detect sh + shell. + + * tests/multifnc/Makefile + * external/sqlite3/Makefile + * external/libhpdf/Makefile + * external/libpng/Makefile + * contrib/gtalleg/Makefile + * contrib/hbodbc/Makefile + * contrib/hbtpathy/Makefile + * contrib/hbsqlit3/Makefile + * contrib/hbblat/Makefile + * contrib/hbqt/Makefile + * contrib/hbfbird/Makefile + * contrib/hbxbp/Makefile + * contrib/hbcurl/Makefile + * contrib/gtqtc/Makefile + * contrib/rddsql/sddfb/Makefile + * contrib/rddsql/sddodbc/Makefile + * contrib/rddado/Makefile + * contrib/gtwvg/Makefile + * contrib/rddads/Makefile + * contrib/hbfimage/Makefile + * contrib/hbtip/Makefile + * contrib/hbwin/Makefile + * contrib/hbssl/Makefile + * source/vm/Makefile + * source/vm/vmmt/Makefile + * source/rtl/gtdos/Makefile + * source/rtl/gtwin/Makefile + * source/rtl/gtxwc/Makefile + * source/rtl/gtcrs/Makefile + * source/rtl/gttrm/Makefile + * source/rtl/Makefile + * source/rtl/gtos2/Makefile + * source/rtl/gtsln/Makefile + * source/rtl/gtgui/Makefile + * source/rtl/gtwvt/Makefile + * source/rdd/Makefile + * source/rdd/dbffpt/Makefile + ! Including 'global.cf' directly to make HB_ARCHITECTURE/HB_COMPILER/HB_COMMERCE + variables work in case we're relying on autodetection. + ; TODO: May need to do this for a few other cases where detection is relying + on some additional variables. Like HB_XBUILD, which needs to be + cleaned further, maybe autodetection added. + ; NOTE: Above changes mean that from now on for basic build usage it's + enough to have the compiler in PATH and to issue a simple 'make' + or 'mingw32-make' (or whatever GNU Make is called in that environment), + and make process should just work. IOW, no need to go through + "starter" scripts in root (make_gnu.*). + 2009-08-09 21:18 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * tests/hbpptest/Makefile * tests/bldtest/Makefile @@ -177,7 +232,7 @@ * 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. + ; TOFIX: Rest of Makefiles. [DONE] * config/global.cf + Added self-inclusion check to allow adding this .cf file diff --git a/harbour/config/global.cf b/harbour/config/global.cf index da4a57aae1..dd3bca4c9f 100644 --- a/harbour/config/global.cf +++ b/harbour/config/global.cf @@ -247,31 +247,38 @@ endif ifneq ($(SHLVL),) HB_SHELL := sh else - ifneq ($(OS2_SHELL),) - HB_SHELL := os2 + ifeq ($(SHELL),/bin/sh) + HB_SHELL := sh else - ifneq ($(ComSpec),) - COMSPEC := $(ComSpec) - endif - ifeq ($(COMSPEC),) - ifeq ($(OS),Windows_NT) - COMSPEC := cmd.exe - else - COMSPEC := command.com - endif - endif - ifneq ($(findstring COMMAND,$(COMSPEC)),) - HB_SHELL := dos + ifneq ($(OS2_SHELL),) + HB_SHELL := os2 else - ifneq ($(findstring command,$(COMSPEC)),) + ifneq ($(ComSpec),) + COMSPEC := $(ComSpec) + endif + ifeq ($(COMSPEC),) + ifeq ($(OS),Windows_NT) + COMSPEC := cmd.exe + else + COMSPEC := command.com + endif + endif + ifneq ($(findstring COMMAND,$(COMSPEC)),) HB_SHELL := dos else - HB_SHELL := nt + ifneq ($(findstring command,$(COMSPEC)),) + HB_SHELL := dos + else + HB_SHELL := nt + endif endif endif endif endif +$(info Harbour GNU Make: Detected shell: $(SHELL)) +$(info Harbour GNU Make: Detected shell: $(HB_SHELL)) + CMDPREF := ifneq ($(HB_SHELL),sh) ifneq ($(COMSPEC),) diff --git a/harbour/contrib/gtalleg/Makefile b/harbour/contrib/gtalleg/Makefile index 1b5e2d12a6..ad48920beb 100644 --- a/harbour/contrib/gtalleg/Makefile +++ b/harbour/contrib/gtalleg/Makefile @@ -4,6 +4,8 @@ ROOT := ../../ +include $(TOP)$(ROOT)config/global.cf + LIBNAME := gtalleg ifneq ($(HB_COMPILER),pocc) diff --git a/harbour/contrib/gtqtc/Makefile b/harbour/contrib/gtqtc/Makefile index 2820091f9b..058887a5ae 100644 --- a/harbour/contrib/gtqtc/Makefile +++ b/harbour/contrib/gtqtc/Makefile @@ -4,6 +4,8 @@ ROOT := ../../ +include $(TOP)$(ROOT)config/global.cf + LIBNAME := gtqtc ifeq ($(HB_WITH_QT),) diff --git a/harbour/contrib/gtwvg/Makefile b/harbour/contrib/gtwvg/Makefile index e9d57a975d..2849d188e4 100644 --- a/harbour/contrib/gtwvg/Makefile +++ b/harbour/contrib/gtwvg/Makefile @@ -2,10 +2,12 @@ # $Id$ # -HB_USER_CFLAGS += -I$(TOP)$(ROOT)contrib/hbwin - ROOT := ../../ +include $(TOP)$(ROOT)config/global.cf + +HB_USER_CFLAGS += -I$(TOP)$(ROOT)contrib/hbwin + LIBNAME := gtwvg ifeq ($(HB_WITH_GTWVG),) diff --git a/harbour/contrib/hbblat/Makefile b/harbour/contrib/hbblat/Makefile index 161d401972..2fe66dd8d9 100644 --- a/harbour/contrib/hbblat/Makefile +++ b/harbour/contrib/hbblat/Makefile @@ -4,6 +4,8 @@ ROOT := ../../ +include $(TOP)$(ROOT)config/global.cf + LIBNAME := hbblat ifeq ($(HB_ARCHITECTURE),win) diff --git a/harbour/contrib/hbcurl/Makefile b/harbour/contrib/hbcurl/Makefile index 39e3cd2cf3..7e8e395db7 100644 --- a/harbour/contrib/hbcurl/Makefile +++ b/harbour/contrib/hbcurl/Makefile @@ -4,6 +4,8 @@ ROOT := ../../ +include $(TOP)$(ROOT)config/global.cf + LIBNAME := hbcurl HB_INC_CURL_OK := diff --git a/harbour/contrib/hbfbird/Makefile b/harbour/contrib/hbfbird/Makefile index 053f2eea8b..639269349b 100644 --- a/harbour/contrib/hbfbird/Makefile +++ b/harbour/contrib/hbfbird/Makefile @@ -4,6 +4,8 @@ ROOT := ../../ +include $(TOP)$(ROOT)config/global.cf + LIBNAME := hbfbird ifneq ($(HB_COMPILER),pocc64) diff --git a/harbour/contrib/hbfimage/Makefile b/harbour/contrib/hbfimage/Makefile index 7d386b9fbd..9eee3e101b 100644 --- a/harbour/contrib/hbfimage/Makefile +++ b/harbour/contrib/hbfimage/Makefile @@ -4,6 +4,8 @@ ROOT := ../../ +include $(TOP)$(ROOT)config/global.cf + LIBNAME := hbfimage HB_INC_FREEIMAGE_OK := diff --git a/harbour/contrib/hbodbc/Makefile b/harbour/contrib/hbodbc/Makefile index c8699ba52e..4772d59e9e 100644 --- a/harbour/contrib/hbodbc/Makefile +++ b/harbour/contrib/hbodbc/Makefile @@ -4,6 +4,8 @@ ROOT := ../../ +include $(TOP)$(ROOT)config/global.cf + LIBNAME := hbodbc ifeq ($(HB_COMPILER),rsxnt) diff --git a/harbour/contrib/hbqt/Makefile b/harbour/contrib/hbqt/Makefile index 1dc654d8f1..8b73a7575a 100644 --- a/harbour/contrib/hbqt/Makefile +++ b/harbour/contrib/hbqt/Makefile @@ -4,6 +4,8 @@ ROOT := ../../ +include $(TOP)$(ROOT)config/global.cf + LIBNAME := hbqt ifeq ($(HB_WITH_QT),) diff --git a/harbour/contrib/hbsqlit3/Makefile b/harbour/contrib/hbsqlit3/Makefile index b76f978875..3674ab9d3c 100644 --- a/harbour/contrib/hbsqlit3/Makefile +++ b/harbour/contrib/hbsqlit3/Makefile @@ -4,6 +4,8 @@ ROOT := ../../ +include $(TOP)$(ROOT)config/global.cf + LIBNAME := hbsqlit3 ifeq ($(HB_INC_SQLITE3),) diff --git a/harbour/contrib/hbssl/Makefile b/harbour/contrib/hbssl/Makefile index b8254c15a4..e0bd2c4222 100644 --- a/harbour/contrib/hbssl/Makefile +++ b/harbour/contrib/hbssl/Makefile @@ -4,6 +4,8 @@ ROOT := ../../ +include $(TOP)$(ROOT)config/global.cf + LIBNAME := hbssl HB_INC_OPENSSL_OK := diff --git a/harbour/contrib/hbtip/Makefile b/harbour/contrib/hbtip/Makefile index c68949e4e5..3145dd86e4 100644 --- a/harbour/contrib/hbtip/Makefile +++ b/harbour/contrib/hbtip/Makefile @@ -4,6 +4,8 @@ ROOT := ../../ +include $(TOP)$(ROOT)config/global.cf + LIBNAME := hbtip ifneq ($(HB_ARCHITECTURE),dos) diff --git a/harbour/contrib/hbtpathy/Makefile b/harbour/contrib/hbtpathy/Makefile index 2d5a2147bf..acf6798b1b 100644 --- a/harbour/contrib/hbtpathy/Makefile +++ b/harbour/contrib/hbtpathy/Makefile @@ -4,6 +4,8 @@ ROOT := ../../ +include $(TOP)$(ROOT)config/global.cf + LIBNAME := hbtpathy C_SOURCES := \ diff --git a/harbour/contrib/hbwin/Makefile b/harbour/contrib/hbwin/Makefile index f195b25a08..0acea7c854 100644 --- a/harbour/contrib/hbwin/Makefile +++ b/harbour/contrib/hbwin/Makefile @@ -4,10 +4,10 @@ ROOT := ../../ -LIBNAME := hbwin - include $(TOP)$(ROOT)config/global.cf +LIBNAME := hbwin + ifeq ($(HB_WITH_HBWIN),) ifeq ($(HB_ARCHITECTURE),win) HB_WITH_HBWIN := yes diff --git a/harbour/contrib/hbxbp/Makefile b/harbour/contrib/hbxbp/Makefile index 8deb5e9486..9694834e82 100644 --- a/harbour/contrib/hbxbp/Makefile +++ b/harbour/contrib/hbxbp/Makefile @@ -2,10 +2,12 @@ # $Id$ # -HB_USER_PRGFLAGS += -I$(TOP)$(ROOT)contrib/hbqt - ROOT := ../../ +include $(TOP)$(ROOT)config/global.cf + +HB_USER_PRGFLAGS += -I$(TOP)$(ROOT)contrib/hbqt + LIBNAME := hbxbp ifeq ($(HB_WITH_QT),) diff --git a/harbour/contrib/rddado/Makefile b/harbour/contrib/rddado/Makefile index f215d7b7a6..7476fb33de 100644 --- a/harbour/contrib/rddado/Makefile +++ b/harbour/contrib/rddado/Makefile @@ -4,6 +4,8 @@ ROOT := ../../ +include $(TOP)$(ROOT)config/global.cf + LIBNAME := rddado ifneq ($(HB_ARCHITECTURE),os2) diff --git a/harbour/contrib/rddads/Makefile b/harbour/contrib/rddads/Makefile index 2007d2fb84..f5ba6e0164 100644 --- a/harbour/contrib/rddads/Makefile +++ b/harbour/contrib/rddads/Makefile @@ -4,6 +4,8 @@ ROOT := ../../ +include $(TOP)$(ROOT)config/global.cf + LIBNAME := rddads ifneq ($(HB_ARCHITECTURE),dos) diff --git a/harbour/contrib/rddsql/sddfb/Makefile b/harbour/contrib/rddsql/sddfb/Makefile index 4cdeeda023..62b279ea31 100644 --- a/harbour/contrib/rddsql/sddfb/Makefile +++ b/harbour/contrib/rddsql/sddfb/Makefile @@ -4,6 +4,8 @@ ROOT := ../../../ +include $(TOP)$(ROOT)config/global.cf + LIBNAME := sddfb ifneq ($(HB_COMPILER),pocc64) diff --git a/harbour/contrib/rddsql/sddodbc/Makefile b/harbour/contrib/rddsql/sddodbc/Makefile index 780e14aae7..0ff6abbfa9 100644 --- a/harbour/contrib/rddsql/sddodbc/Makefile +++ b/harbour/contrib/rddsql/sddodbc/Makefile @@ -4,6 +4,8 @@ ROOT := ../../../ +include $(TOP)$(ROOT)config/global.cf + LIBNAME := sddodbc ifeq ($(HB_COMPILER),rsxnt) diff --git a/harbour/external/libhpdf/Makefile b/harbour/external/libhpdf/Makefile index 7bff3349b0..172e20de79 100644 --- a/harbour/external/libhpdf/Makefile +++ b/harbour/external/libhpdf/Makefile @@ -2,12 +2,14 @@ # $Id$ # +ROOT := ../../ + +include $(TOP)$(ROOT)config/global.cf + HB_BUILD_WARN := no HB_BUILD_MODE := c HB_USER_CFLAGS += -I$(TOP)$(ROOT)source/hbzlib -ROOT := ../../ - LIBNAME := libhpdf ifeq ($(HB_WITH_LIBHPDF),) diff --git a/harbour/external/libpng/Makefile b/harbour/external/libpng/Makefile index b6dea92f2f..35a2e7d5e8 100644 --- a/harbour/external/libpng/Makefile +++ b/harbour/external/libpng/Makefile @@ -2,6 +2,10 @@ # $Id$ # +ROOT := ../../ + +include $(TOP)$(ROOT)config/global.cf + HB_BUILD_WARN := no HB_USER_CFLAGS += -I$(TOP)$(ROOT)source/hbzlib @@ -9,8 +13,6 @@ ifeq ($(HB_COMPILER),djgpp) HB_USER_CFLAGS += -DPNG_NO_SNPRINTF endif -ROOT := ../../ - LIBNAME := libpng ifeq ($(HB_WITH_LIBPNG),) diff --git a/harbour/external/sqlite3/Makefile b/harbour/external/sqlite3/Makefile index c314e9de13..0077fc2d83 100644 --- a/harbour/external/sqlite3/Makefile +++ b/harbour/external/sqlite3/Makefile @@ -2,6 +2,10 @@ # $Id$ # +ROOT := ../../ + +include $(TOP)$(ROOT)config/global.cf + HB_BUILD_WARN := no HB_BUILD_MODE := c @@ -15,8 +19,6 @@ ifeq ($(HB_ARCHITECTURE),dos) HB_USER_CFLAGS += -DSQLITE_OS_OTHER endif -ROOT := ../../ - LIBNAME := sqlite3 ifeq ($(HB_WITH_SQLITE3),) diff --git a/harbour/source/rdd/Makefile b/harbour/source/rdd/Makefile index 41061d0333..4bf580acf7 100644 --- a/harbour/source/rdd/Makefile +++ b/harbour/source/rdd/Makefile @@ -4,6 +4,8 @@ ROOT := ../../ +include $(TOP)$(ROOT)config/global.cf + ifneq ($(HB_ARCHITECTURE),wce) HB_GCMODE := 3 endif diff --git a/harbour/source/rdd/dbffpt/Makefile b/harbour/source/rdd/dbffpt/Makefile index ea27cb4a6b..af5e17a65d 100644 --- a/harbour/source/rdd/dbffpt/Makefile +++ b/harbour/source/rdd/dbffpt/Makefile @@ -2,12 +2,14 @@ # $Id$ # +ROOT := ../../../ + +include $(TOP)$(ROOT)config/global.cf + ifeq ($(HB_COMPILER),xcc) HB_USER_CFLAGS := $(subst -Ox,,$(subst -Ot,,$(HB_USER_CFLAGS))) endif -ROOT := ../../../ - C_SOURCES := \ dbffpt1.c \ diff --git a/harbour/source/rtl/Makefile b/harbour/source/rtl/Makefile index 80c8419937..ff77cf8245 100644 --- a/harbour/source/rtl/Makefile +++ b/harbour/source/rtl/Makefile @@ -4,6 +4,8 @@ ROOT := ../../ +include $(TOP)$(ROOT)config/global.cf + ifneq ($(HB_ARCHITECTURE),wce) HB_GCMODE := 3 endif diff --git a/harbour/source/rtl/gtcrs/Makefile b/harbour/source/rtl/gtcrs/Makefile index 56b1b05e9a..6025f44358 100644 --- a/harbour/source/rtl/gtcrs/Makefile +++ b/harbour/source/rtl/gtcrs/Makefile @@ -4,6 +4,8 @@ ROOT := ../../../ +include $(TOP)$(ROOT)config/global.cf + LIBNAME := gtcrs C_SOURCES := \ diff --git a/harbour/source/rtl/gtdos/Makefile b/harbour/source/rtl/gtdos/Makefile index 6407583700..7dce964aa1 100644 --- a/harbour/source/rtl/gtdos/Makefile +++ b/harbour/source/rtl/gtdos/Makefile @@ -4,6 +4,8 @@ ROOT := ../../../ +include $(TOP)$(ROOT)config/global.cf + LIBNAME := gtdos ifeq ($(HB_ARCHITECTURE),dos) diff --git a/harbour/source/rtl/gtgui/Makefile b/harbour/source/rtl/gtgui/Makefile index da67a07b0c..d125e21fbf 100644 --- a/harbour/source/rtl/gtgui/Makefile +++ b/harbour/source/rtl/gtgui/Makefile @@ -4,6 +4,8 @@ ROOT := ../../../ +include $(TOP)$(ROOT)config/global.cf + LIBNAME := gtgui HB_WITH_GTGUI := no diff --git a/harbour/source/rtl/gtos2/Makefile b/harbour/source/rtl/gtos2/Makefile index 3faa07a0f6..deed71f716 100644 --- a/harbour/source/rtl/gtos2/Makefile +++ b/harbour/source/rtl/gtos2/Makefile @@ -4,6 +4,8 @@ ROOT := ../../../ +include $(TOP)$(ROOT)config/global.cf + LIBNAME := gtos2 ifeq ($(HB_ARCHITECTURE),os2) diff --git a/harbour/source/rtl/gtsln/Makefile b/harbour/source/rtl/gtsln/Makefile index f51ce0f0a3..c3a5686c32 100644 --- a/harbour/source/rtl/gtsln/Makefile +++ b/harbour/source/rtl/gtsln/Makefile @@ -4,6 +4,8 @@ ROOT := ../../../ +include $(TOP)$(ROOT)config/global.cf + LIBNAME := gtsln C_SOURCES := \ diff --git a/harbour/source/rtl/gttrm/Makefile b/harbour/source/rtl/gttrm/Makefile index 1f14f10479..12dcae2f26 100644 --- a/harbour/source/rtl/gttrm/Makefile +++ b/harbour/source/rtl/gttrm/Makefile @@ -4,6 +4,8 @@ ROOT := ../../../ +include $(TOP)$(ROOT)config/global.cf + LIBNAME := gttrm C_SOURCES := \ diff --git a/harbour/source/rtl/gtwin/Makefile b/harbour/source/rtl/gtwin/Makefile index 02f593bdae..21b9bf4090 100644 --- a/harbour/source/rtl/gtwin/Makefile +++ b/harbour/source/rtl/gtwin/Makefile @@ -4,6 +4,8 @@ ROOT := ../../../ +include $(TOP)$(ROOT)config/global.cf + LIBNAME := gtwin ifeq ($(HB_ARCHITECTURE),win) diff --git a/harbour/source/rtl/gtwvt/Makefile b/harbour/source/rtl/gtwvt/Makefile index a2a2d9cf0b..fbc4463ea4 100644 --- a/harbour/source/rtl/gtwvt/Makefile +++ b/harbour/source/rtl/gtwvt/Makefile @@ -4,6 +4,8 @@ ROOT := ../../../ +include $(TOP)$(ROOT)config/global.cf + LIBNAME := gtwvt HB_WITH_GTWVT := no diff --git a/harbour/source/rtl/gtxwc/Makefile b/harbour/source/rtl/gtxwc/Makefile index f6ecb41652..0f55f6adb3 100644 --- a/harbour/source/rtl/gtxwc/Makefile +++ b/harbour/source/rtl/gtxwc/Makefile @@ -4,6 +4,8 @@ ROOT := ../../../ +include $(TOP)$(ROOT)config/global.cf + LIBNAME := gtxwc C_SOURCES := \ diff --git a/harbour/source/vm/Makefile b/harbour/source/vm/Makefile index 36c7c6341a..0ed1d8f257 100644 --- a/harbour/source/vm/Makefile +++ b/harbour/source/vm/Makefile @@ -4,6 +4,8 @@ ROOT := ../../ +include $(TOP)$(ROOT)config/global.cf + ifeq ($(HB_HVM_ALL),) HB_HVM_ALL := yes diff --git a/harbour/source/vm/vmmt/Makefile b/harbour/source/vm/vmmt/Makefile index 9282c3f777..e7c930b50c 100644 --- a/harbour/source/vm/vmmt/Makefile +++ b/harbour/source/vm/vmmt/Makefile @@ -7,6 +7,8 @@ vpath %.prg ../ ROOT := ../../../ +include $(TOP)$(ROOT)config/global.cf + ifeq ($(HB_ARCHITECTURE),win) ifeq ($(HB_COMPILER),mingw) C_MAIN := mainwin.c diff --git a/harbour/tests/multifnc/Makefile b/harbour/tests/multifnc/Makefile index f1c8e5aa10..31e40b9fd4 100644 --- a/harbour/tests/multifnc/Makefile +++ b/harbour/tests/multifnc/Makefile @@ -2,6 +2,14 @@ # $Id$ # +ifeq ($(HB_MAIN),) + HB_MAIN := std +endif + +ROOT := ../../ + +include $(TOP)$(ROOT)config/global.cf + ifneq ($(findstring $(HB_COMPILER),gcc djgpp mingw cygwin),) HB_USER_LDFLAGS += -Wl,--allow-multiple-definition else @@ -10,12 +18,6 @@ HB_USER_LDFLAGS += /FORCE:MULTIPLE endif endif -ifeq ($(HB_MAIN),) - HB_MAIN := std -endif - -ROOT := ../../ - PRG_SOURCES := \ t0.prg \ t1.prg \