fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* 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.*).
This commit is contained in:
Viktor Szakats
2009-08-09 19:52:17 +00:00
parent 504ca98e1c
commit 8106523a59
39 changed files with 171 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
harbour/ChangeLog
View File

@@ -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

39
harbour/config/global.cf
View File

@@ -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),)

2
harbour/contrib/gtalleg/Makefile
View File

@@ -4,6 +4,8 @@
ROOT := ../../
include $(TOP)$(ROOT)config/global.cf
LIBNAME := gtalleg
ifneq ($(HB_COMPILER),pocc)

2
harbour/contrib/gtqtc/Makefile
View File

@@ -4,6 +4,8 @@
ROOT := ../../
include $(TOP)$(ROOT)config/global.cf
LIBNAME := gtqtc
ifeq ($(HB_WITH_QT),)

6
harbour/contrib/gtwvg/Makefile
View File

@@ -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),)

2
harbour/contrib/hbblat/Makefile
View File

@@ -4,6 +4,8 @@
ROOT := ../../
include $(TOP)$(ROOT)config/global.cf
LIBNAME := hbblat
ifeq ($(HB_ARCHITECTURE),win)

2
harbour/contrib/hbcurl/Makefile
View File

@@ -4,6 +4,8 @@
ROOT := ../../
include $(TOP)$(ROOT)config/global.cf
LIBNAME := hbcurl
HB_INC_CURL_OK :=

2
harbour/contrib/hbfbird/Makefile
View File

@@ -4,6 +4,8 @@
ROOT := ../../
include $(TOP)$(ROOT)config/global.cf
LIBNAME := hbfbird
ifneq ($(HB_COMPILER),pocc64)

2
harbour/contrib/hbfimage/Makefile
View File

@@ -4,6 +4,8 @@
ROOT := ../../
include $(TOP)$(ROOT)config/global.cf
LIBNAME := hbfimage
HB_INC_FREEIMAGE_OK :=

2
harbour/contrib/hbodbc/Makefile
View File

@@ -4,6 +4,8 @@
ROOT := ../../
include $(TOP)$(ROOT)config/global.cf
LIBNAME := hbodbc
ifeq ($(HB_COMPILER),rsxnt)

2
harbour/contrib/hbqt/Makefile
View File

@@ -4,6 +4,8 @@
ROOT := ../../
include $(TOP)$(ROOT)config/global.cf
LIBNAME := hbqt
ifeq ($(HB_WITH_QT),)

2
harbour/contrib/hbsqlit3/Makefile
View File

@@ -4,6 +4,8 @@
ROOT := ../../
include $(TOP)$(ROOT)config/global.cf
LIBNAME := hbsqlit3
ifeq ($(HB_INC_SQLITE3),)

2
harbour/contrib/hbssl/Makefile
View File

@@ -4,6 +4,8 @@
ROOT := ../../
include $(TOP)$(ROOT)config/global.cf
LIBNAME := hbssl
HB_INC_OPENSSL_OK :=

2
harbour/contrib/hbtip/Makefile
View File

@@ -4,6 +4,8 @@
ROOT := ../../
include $(TOP)$(ROOT)config/global.cf
LIBNAME := hbtip
ifneq ($(HB_ARCHITECTURE),dos)

2
harbour/contrib/hbtpathy/Makefile
View File

@@ -4,6 +4,8 @@
ROOT := ../../
include $(TOP)$(ROOT)config/global.cf
LIBNAME := hbtpathy
C_SOURCES := \

4
harbour/contrib/hbwin/Makefile
View File

@@ -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

6
harbour/contrib/hbxbp/Makefile
View File

@@ -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),)

2
harbour/contrib/rddado/Makefile
View File

@@ -4,6 +4,8 @@
ROOT := ../../
include $(TOP)$(ROOT)config/global.cf
LIBNAME := rddado
ifneq ($(HB_ARCHITECTURE),os2)

2
harbour/contrib/rddads/Makefile
View File

@@ -4,6 +4,8 @@
ROOT := ../../
include $(TOP)$(ROOT)config/global.cf
LIBNAME := rddads
ifneq ($(HB_ARCHITECTURE),dos)

2
harbour/contrib/rddsql/sddfb/Makefile
View File

@@ -4,6 +4,8 @@
ROOT := ../../../
include $(TOP)$(ROOT)config/global.cf
LIBNAME := sddfb
ifneq ($(HB_COMPILER),pocc64)

2
harbour/contrib/rddsql/sddodbc/Makefile
View File

@@ -4,6 +4,8 @@
ROOT := ../../../
include $(TOP)$(ROOT)config/global.cf
LIBNAME := sddodbc
ifeq ($(HB_COMPILER),rsxnt)

6
harbour/external/libhpdf/Makefile vendored
View File

@@ -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),)

6
harbour/external/libpng/Makefile vendored
View File

@@ -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),)

6
harbour/external/sqlite3/Makefile vendored
View File

@@ -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),)

2
harbour/source/rdd/Makefile
View File

@@ -4,6 +4,8 @@
ROOT := ../../
include $(TOP)$(ROOT)config/global.cf
ifneq ($(HB_ARCHITECTURE),wce)
HB_GCMODE := 3
endif

6
harbour/source/rdd/dbffpt/Makefile
View File

@@ -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 \

2
harbour/source/rtl/Makefile
View File

@@ -4,6 +4,8 @@
ROOT := ../../
include $(TOP)$(ROOT)config/global.cf
ifneq ($(HB_ARCHITECTURE),wce)
HB_GCMODE := 3
endif

2
harbour/source/rtl/gtcrs/Makefile
View File

@@ -4,6 +4,8 @@
ROOT := ../../../
include $(TOP)$(ROOT)config/global.cf
LIBNAME := gtcrs
C_SOURCES := \

2
harbour/source/rtl/gtdos/Makefile
View File

@@ -4,6 +4,8 @@
ROOT := ../../../
include $(TOP)$(ROOT)config/global.cf
LIBNAME := gtdos
ifeq ($(HB_ARCHITECTURE),dos)

2
harbour/source/rtl/gtgui/Makefile
View File

@@ -4,6 +4,8 @@
ROOT := ../../../
include $(TOP)$(ROOT)config/global.cf
LIBNAME := gtgui
HB_WITH_GTGUI := no

2
harbour/source/rtl/gtos2/Makefile
View File

@@ -4,6 +4,8 @@
ROOT := ../../../
include $(TOP)$(ROOT)config/global.cf
LIBNAME := gtos2
ifeq ($(HB_ARCHITECTURE),os2)

2
harbour/source/rtl/gtsln/Makefile
View File

@@ -4,6 +4,8 @@
ROOT := ../../../
include $(TOP)$(ROOT)config/global.cf
LIBNAME := gtsln
C_SOURCES := \

2
harbour/source/rtl/gttrm/Makefile
View File

@@ -4,6 +4,8 @@
ROOT := ../../../
include $(TOP)$(ROOT)config/global.cf
LIBNAME := gttrm
C_SOURCES := \

2
harbour/source/rtl/gtwin/Makefile
View File

@@ -4,6 +4,8 @@
ROOT := ../../../
include $(TOP)$(ROOT)config/global.cf
LIBNAME := gtwin
ifeq ($(HB_ARCHITECTURE),win)

2
harbour/source/rtl/gtwvt/Makefile
View File

@@ -4,6 +4,8 @@
ROOT := ../../../
include $(TOP)$(ROOT)config/global.cf
LIBNAME := gtwvt
HB_WITH_GTWVT := no

2
harbour/source/rtl/gtxwc/Makefile
View File

@@ -4,6 +4,8 @@
ROOT := ../../../
include $(TOP)$(ROOT)config/global.cf
LIBNAME := gtxwc
C_SOURCES := \

2
harbour/source/vm/Makefile
View File

@@ -4,6 +4,8 @@
ROOT := ../../
include $(TOP)$(ROOT)config/global.cf
ifeq ($(HB_HVM_ALL),)
HB_HVM_ALL := yes

2
harbour/source/vm/vmmt/Makefile
View File

@@ -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

14
harbour/tests/multifnc/Makefile
View File

@@ -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 \