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

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

Browse Source 
* source/rtl/gtcrs/Makefile
  * source/rtl/gttrm/Makefile
  * source/rtl/gtsln/Makefile
    * Using HB_HAS_GPM instead of old HB_GPM_MOUSE.

  * config/bin.mk
  * config/dyn.mk
  * config/bsd/libs.mk
  * config/darwin/libs.mk
  * config/hpux/libs.mk
  * config/dos/djgpp.mk
  * config/win/mingw.mk
  * config/linux/libs.mk
  * config/os2/gcc.mk
  * config/sunos/libs.mk
    * Extended the way it's decided whether to include
      rtl external lib dependencies or not. Now binary specific
      logic was moved to bin.mk, and dynamic lib logic was added
      to dyn.mk.
      The flag is called HB_LINKING_RTL (not empty means yes).
    + Updated syslib list assembly parts to use HB_HAS_*
      autodetection variables instead of trying to find it out
      by other means.

  * config/global.mk
    + Adding gtcrs, gtsln, gtxwc to std liblist if required
      components are available. This means that it's now again
      possible to select these as build-time default GTs.
    * Updated comment for setting plans.
This commit is contained in:
Viktor Szakats
2009-08-26 16:43:24 +00:00
parent a0ab9cd07a
commit 5495d2978a
15 changed files with 83 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
harbour/ChangeLog
View File

@@ -17,6 +17,37 @@
past entries belonging to author(s): Viktor Szakats.
*/
2009-08-26 18:42 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* source/rtl/gtcrs/Makefile
* source/rtl/gttrm/Makefile
* source/rtl/gtsln/Makefile
* Using HB_HAS_GPM instead of old HB_GPM_MOUSE.
* config/bin.mk
* config/dyn.mk
* config/bsd/libs.mk
* config/darwin/libs.mk
* config/hpux/libs.mk
* config/dos/djgpp.mk
* config/win/mingw.mk
* config/linux/libs.mk
* config/os2/gcc.mk
* config/sunos/libs.mk
* Extended the way it's decided whether to include
rtl external lib dependencies or not. Now binary specific
logic was moved to bin.mk, and dynamic lib logic was added
to dyn.mk.
The flag is called HB_LINKING_RTL (not empty means yes).
+ Updated syslib list assembly parts to use HB_HAS_*
autodetection variables instead of trying to find it out
by other means.
* config/global.mk
+ Adding gtcrs, gtsln, gtxwc to std liblist if required
components are available. This means that it's now again
possible to select these as build-time default GTs.
* Updated comment for setting plans.
2009-08-26 17:55 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+ config/detfun.mk
+ config/detect.mk

6
harbour/config/bin.mk
View File

@@ -52,6 +52,12 @@ HB_LIBS_TPL :=
_HB_RDD :=
_HB_VM :=
ifneq ($(filter hbrtl, $(LIBS)),)
HB_LINKING_RTL := yes
else
HB_LINKING_RTL :=
endif
-include $(TOP)$(ROOT)config/$(HB_PLATFORM)/libs.mk
include $(TOP)$(ROOT)config/$(HB_PLATFORM)/$(HB_COMPILER).mk
include $(TOP)$(ROOT)config/c.mk

10
harbour/config/bsd/libs.mk
View File

@@ -5,21 +5,21 @@
SYSLIBS :=
SYSLIBPATHS :=
ifneq ($(filter hbrtl, $(LIBS)),)
ifneq ($(HB_LINKING_RTL),)
ifeq ($(HB_CRS_LIB),)
HB_CRS_LIB := ncurses
endif
ifneq ($(filter gtcrs, $(LIBS)),)
ifneq ($(HB_HAS_CURSES),)
SYSLIBS += $(HB_CRS_LIB)
endif
ifneq ($(filter gtsln, $(LIBS)),)
ifneq ($(HB_HAS_SLANG),)
SYSLIBS += slang
# In BSD, slang still needs curses :(
ifeq ($(filter gtcrs, $(LIBS)),)
ifneq ($(HB_HAS_CURSES),)
SYSLIBS += $(HB_CRS_LIB)
endif
endif
ifneq ($(filter gtxwc, $(LIBS)),)
ifneq ($(HB_HAS_X11),)
SYSLIBS += X11
# SYSLIBPATHS += /usr/X11R6/lib64
SYSLIBPATHS += /usr/X11R6/lib

10
harbour/config/darwin/libs.mk
View File

@@ -5,21 +5,21 @@
SYSLIBS :=
SYSLIBPATHS :=
ifneq ($(filter hbrtl, $(LIBS)),)
ifneq ($(HB_LINKING_RTL),)
ifeq ($(HB_CRS_LIB),)
HB_CRS_LIB := ncurses
endif
ifneq ($(filter gtcrs, $(LIBS)),)
ifneq ($(HB_HAS_CURSES),)
SYSLIBS += $(HB_CRS_LIB)
endif
ifneq ($(filter gtsln, $(LIBS)),)
ifneq ($(HB_HAS_SLANG),)
SYSLIBS += slang
# In BSD, slang still needs curses :(
ifeq ($(filter gtcrs, $(LIBS)),)
ifneq ($(HB_HAS_CURSES),)
SYSLIBS += $(HB_CRS_LIB)
endif
endif
ifneq ($(filter gtxwc, $(LIBS)),)
ifneq ($(HB_HAS_X11),)
SYSLIBS += X11
# SYSLIBPATHS += /usr/X11R6/lib64
SYSLIBPATHS += /usr/X11R6/lib

3
harbour/config/dos/djgpp.mk
View File

@@ -39,8 +39,7 @@ LIBPATHS := -L$(LIB_DIR)
LDLIBS := $(foreach lib,$(LIBS),-l$(lib))
ifneq ($(filter hbrtl, $(LIBS)),)
# Add the specified GT driver library
ifneq ($(HB_LINKING_RTL),)
ifeq ($(HB_CRS_LIB),)
HB_CRS_LIB := pdcurses
endif

6
harbour/config/dyn.mk
View File

@@ -7,6 +7,12 @@ include $(TOP)$(ROOT)config/global.mk
ifneq ($(HB_PLATFORM),)
ifneq ($(HB_COMPILER),)
ifneq ($(DYNNAME),)
HB_LINKING_RTL := yes
else
HB_LINKING_RTL :=
endif
-include $(TOP)$(ROOT)config/$(HB_PLATFORM)/libs.mk
include $(TOP)$(ROOT)config/$(HB_PLATFORM)/$(HB_COMPILER).mk
include $(TOP)$(ROOT)config/c.mk

15
harbour/config/global.mk
View File

@@ -268,11 +268,7 @@ ifeq ($(HB_INIT_DONE),)
# HB_GT_CRS_BCEHACK -> HB_USER_CFLAGS=-DHB_GT_CRS_BCEHACK
# HB_NCURSES_194 -> HB_USER_CFLAGS=-DHB_NCURSES_194
# HB_DLLIBS -> (only used in place location, so it's a local matter)
#
# HB_CRS_LIB -> HB_LIB_CURSES
# HB_GPM_MOUSE -> HB_WITH_GPM
# HB_WITHOUT_* -> HB_WITH_*=no
# HB_INC_* -> HB_WITH_*=<dir>
# HB_DIR_* -> ? (only used for implib
# HB_HAS_* -> ?
#
@@ -1079,6 +1075,17 @@ HB_GT_LIBS := \
gtpca \
gtstd \
# Add GTs if dependency is available
ifneq ($(HB_HAS_CURSES),)
HB_GT_LIBS += gtcrs
endif
ifneq ($(HB_HAS_SLANG),)
HB_GT_LIBS += gtsln
endif
ifneq ($(HB_HAS_X11),)
HB_GT_LIBS += gtxwc
endif
# Names of valid RDD libraries
HB_RDD_LIBS := \
rddntx \

8
harbour/config/hpux/libs.mk
View File

@@ -5,17 +5,17 @@
SYSLIBS :=
SYSLIBPATHS :=
ifneq ($(filter hbrtl, $(LIBS)),)
ifneq ($(HB_LINKING_RTL),)
ifeq ($(HB_CRS_LIB),)
HB_CRS_LIB := ncurses
endif
ifneq ($(filter gtcrs, $(LIBS)),)
ifneq ($(HB_HAS_CURSES),)
SYSLIBS += $(HB_CRS_LIB)
endif
ifneq ($(filter gtsln, $(LIBS)),)
ifneq ($(HB_HAS_SLANG),)
SYSLIBS += slang
endif
ifneq ($(filter gtxwc, $(LIBS)),)
ifneq ($(HB_HAS_X11),)
SYSLIBS += X11
# SYSLIBPATHS += /usr/X11R6/lib64
SYSLIBPATHS += /usr/X11R6/lib

10
harbour/config/linux/libs.mk
View File

@@ -28,22 +28,22 @@ endif
SYSLIBS :=
SYSLIBPATHS :=
ifneq ($(filter hbrtl, $(LIBS)),)
ifneq ($(HB_LINKING_RTL),)
ifeq ($(HB_CRS_LIB),)
HB_CRS_LIB := ncurses
endif
ifneq ($(filter gtcrs, $(LIBS)),)
ifneq ($(HB_HAS_CURSES),)
SYSLIBS += $(HB_CRS_LIB)
endif
ifneq ($(filter gtsln, $(LIBS)),)
ifneq ($(HB_HAS_SLANG),)
SYSLIBS += slang
endif
ifneq ($(filter gtxwc, $(LIBS)),)
ifneq ($(HB_HAS_X11),)
SYSLIBS += X11
# SYSLIBPATHS += /usr/X11R6/lib64
SYSLIBPATHS += /usr/X11R6/lib
endif
ifeq ($(HB_GPM_MOUSE),yes)
ifneq ($(HB_HAS_GPM),)
SYSLIBS += gpm
endif
ifneq ($(filter -DHB_PCRE_REGEX, $(HB_USER_CFLAGS)),)

3
harbour/config/os2/gcc.mk
View File

@@ -47,8 +47,7 @@ SYSLIBS := socket
LIBPATHS := -L$(LIB_DIR)
LDLIBS := $(foreach lib,$(LIBS),-l$(lib))
# Add the specified GT driver library
ifneq ($(filter hbrtl, $(LIBS)),)
ifneq ($(HB_LINKING_RTL),)
ifeq ($(C_MAIN),)
ifeq ($(filter os2pm,$(HB_GT_LIB)),os2pm)
# Special handling for PM mode

8
harbour/config/sunos/libs.mk
View File

@@ -5,17 +5,17 @@
SYSLIBS :=
SYSLIBPATHS :=
ifneq ($(filter hbrtl, $(LIBS)),)
ifneq ($(HB_LINKING_RTL),)
ifeq ($(HB_CRS_LIB),)
HB_CRS_LIB := curses
endif
ifneq ($(filter gtcrs, $(LIBS)),)
ifneq ($(HB_HAS_CURSES),)
SYSLIBS += $(HB_CRS_LIB)
endif
ifneq ($(filter gtsln, $(LIBS)),)
ifneq ($(HB_HAS_SLANG),)
SYSLIBS += slang
endif
ifneq ($(filter gtxwc, $(LIBS)),)
ifneq ($(HB_HAS_X11),)
SYSLIBS += X11
# SYSLIBPATHS += /usr/X11R6/lib64
SYSLIBPATHS += /usr/X11R6/lib

2
harbour/config/win/mingw.mk
View File

@@ -44,7 +44,7 @@ LDLIBS := $(foreach lib,$(LIBS) $(SYSLIBS),-l$(lib))
# Add the standard C main() entry
ifeq ($(HB_MAIN),std)
ifeq ($(filter hbrtl,$(LIBS)),hbrtl)
ifneq ($(HB_LINKING_RTL),)
LDLIBS += -lhbmainstd
endif
endif

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

@@ -41,7 +41,7 @@ ifneq ($(HB_INC_CURSES_OK),)
ifeq ($(HB_GT_CRS_BCEHACK),yes)
HB_CFLAGS += -DHB_GT_CRS_BCEHACK
endif
ifeq ($(HB_GPM_MOUSE),yes)
ifneq ($(HB_HAS_GPM),)
HB_CFLAGS += -DHB_HAS_GPM
ifeq ($(HB_GPM_NOICE_DISABLE),yes)
HB_CFLAGS += -DHB_GPM_NOICE_DISABLE

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

@@ -36,7 +36,7 @@ HB_INC_SLANG_OK := $(foreach d, $(HB_INC_SLANG), $(if $(wildcard $(d)/slang.h),$
ifneq ($(strip $(HB_INC_SLANG_OK)),)
ifeq ($(HB_GPM_MOUSE),yes)
ifneq ($(HB_HAS_GPM),)
HB_CFLAGS += -DHB_HAS_GPM
ifeq ($(HB_GPM_NOICE_DISABLE),yes)
HB_CFLAGS += -DHB_GPM_NOICE_DISABLE

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

@@ -33,7 +33,7 @@ endif
ifeq ($(HB_WITH_GTTRM),yes)
ifeq ($(HB_GPM_MOUSE),yes)
ifneq ($(HB_HAS_GPM),)
HB_CFLAGS += -DHB_HAS_GPM
ifeq ($(HB_GPM_NOICE_DISABLE),yes)
HB_CFLAGS += -DHB_GPM_NOICE_DISABLE