From d3ba9019b8bc7cfcabdcecc6c62c87cdaaaf7ef0 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Thu, 17 Sep 2009 11:15:46 +0000 Subject: [PATCH] 2009-09-17 13:14 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * source/rtl/gtcrs/Makefile * source/rtl/gttrm/Makefile * source/rtl/gtsln/Makefile * config/global.mk % Deleted dedicated (redundant) make level settings: - HB_GPM_NOICE_DISABLE=yes It should be replaced with HB_USER_CFLAGS=-DHB_GPM_NOICE_DISABLE Notice this setting was only effective in gtsln (yet it was passed to two other GTs). - HB_GT_CRS_BCEHACK=yes It should be replaced with HB_USER_CFLAGS=-DHB_GT_CRS_BCEHACK - HB_NCURSES_194=yes It should be replaced with HB_USER_CFLAGS=-DHB_NCURSES_194 ; TODO: Change logic in bin/hb-func.sh to lookup user flags for -DHB_NCURSES_194, instead of processing dedicated HB_NCURSES_194 variable. I'm unsure which variable to check here for user flags. --- harbour/ChangeLog | 17 +++++++++++++++++ harbour/config/detect.mk | 2 +- harbour/config/global.mk | 7 ------- harbour/source/rtl/gtcrs/Makefile | 9 --------- harbour/source/rtl/gtsln/Makefile | 3 --- harbour/source/rtl/gttrm/Makefile | 3 --- 6 files changed, 18 insertions(+), 23 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 050c2a48f4..1fa0ae6d72 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,23 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-09-17 13:14 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * source/rtl/gtcrs/Makefile + * source/rtl/gttrm/Makefile + * source/rtl/gtsln/Makefile + * config/global.mk + % Deleted dedicated (redundant) make level settings: + - HB_GPM_NOICE_DISABLE=yes + It should be replaced with HB_USER_CFLAGS=-DHB_GPM_NOICE_DISABLE + Notice this setting was only effective in gtsln (yet it was passed to two other GTs). + - HB_GT_CRS_BCEHACK=yes + It should be replaced with HB_USER_CFLAGS=-DHB_GT_CRS_BCEHACK + - HB_NCURSES_194=yes + It should be replaced with HB_USER_CFLAGS=-DHB_NCURSES_194 + ; TODO: Change logic in bin/hb-func.sh to lookup user flags for -DHB_NCURSES_194, + instead of processing dedicated HB_NCURSES_194 variable. I'm unsure + which variable to check here for user flags. + 2009-09-17 13:00 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * bin/hb-func.sh * config/beos/libs.mk diff --git a/harbour/config/detect.mk b/harbour/config/detect.mk index 410a420486..406d3d15a6 100644 --- a/harbour/config/detect.mk +++ b/harbour/config/detect.mk @@ -121,7 +121,7 @@ _DET_FLT_COMP := _DET_INC_DEFP := /boot/develop/headers/3rdparty _DET_INC_HEAD := /curses.h -ifeq ($(HB_NCURSES_194),yes) +ifneq ($(filter -DHB_NCURSES_194,$(HB_USER_CFLAGS)),) _DET_INC_DEFP += /usr/include/ncur194 else _DET_INC_DEFP += /usr/include /usr/local/include /sw/include /opt/local/include diff --git a/harbour/config/global.mk b/harbour/config/global.mk index 8ad7daf9da..3020c15136 100644 --- a/harbour/config/global.mk +++ b/harbour/config/global.mk @@ -242,19 +242,12 @@ ifeq ($(HB_INIT_DONE),) # Some additional ones to be given a standard name: # HB_HOST_BUILD [yes|all|lib] -> ? (yes = build harbour/hbpp bin only, all = default, lib = build libs only) - # HB_REBUILD_PARSER -> HB_BUILD_PARSER (or maybe HB_HAVE_BISON?) # HB_DB_DRVEXT -> - # HB_COMMERCE -> ? # HB_BIN_COMPILE -> HB_BUILD_BIN_DIR # HB_INC_COMPILE -> - (HB_BUILD_INC_DIR) - # # HB_DIR_* -> HB_LIBDIR_* ? (only used for implib and a few .hbm files) - # # HB_DLLIBS -> (only used in one location, so it's a local matter) - # HB_GPM_NOICE_DISABLE -> HB_USER_CFLAGS=-DHB_GPM_NOICE_DISABLE - # HB_GT_CRS_BCEHACK -> HB_USER_CFLAGS=-DHB_GT_CRS_BCEHACK - # HB_NCURSES_194 -> HB_USER_CFLAGS=-DHB_NCURSES_194 - # # Macros: # -DHB_GT_LIB= diff --git a/harbour/source/rtl/gtcrs/Makefile b/harbour/source/rtl/gtcrs/Makefile index 5d2e20a61b..4e08922365 100644 --- a/harbour/source/rtl/gtcrs/Makefile +++ b/harbour/source/rtl/gtcrs/Makefile @@ -15,17 +15,8 @@ ifneq ($(HB_HAS_CURSES),) HB_CFLAGS += $(foreach d,$(HB_HAS_CURSES),-I$(d)) - ifeq ($(HB_GT_CRS_BCEHACK),yes) - HB_CFLAGS += -DHB_GT_CRS_BCEHACK - endif ifneq ($(HB_HAS_GPM),) HB_CFLAGS += -DHB_HAS_GPM - ifeq ($(HB_GPM_NOICE_DISABLE),yes) - HB_CFLAGS += -DHB_GPM_NOICE_DISABLE - endif - endif - ifeq ($(HB_NCURSES_194),yes) - HB_CFLAGS += -DHB_NCURSES_194 endif include $(TOP)$(ROOT)config/lib.mk diff --git a/harbour/source/rtl/gtsln/Makefile b/harbour/source/rtl/gtsln/Makefile index 1791c8e3a9..478d4a1979 100644 --- a/harbour/source/rtl/gtsln/Makefile +++ b/harbour/source/rtl/gtsln/Makefile @@ -23,9 +23,6 @@ ifneq ($(HB_HAS_SLANG),) ifneq ($(HB_HAS_GPM),) HB_CFLAGS += -DHB_HAS_GPM - ifeq ($(HB_GPM_NOICE_DISABLE),yes) - HB_CFLAGS += -DHB_GPM_NOICE_DISABLE - endif endif include $(TOP)$(ROOT)config/lib.mk diff --git a/harbour/source/rtl/gttrm/Makefile b/harbour/source/rtl/gttrm/Makefile index 3437a2a423..3bd89b52aa 100644 --- a/harbour/source/rtl/gttrm/Makefile +++ b/harbour/source/rtl/gttrm/Makefile @@ -35,9 +35,6 @@ ifeq ($(HB_SUPPORTED),yes) ifneq ($(HB_HAS_GPM),) HB_CFLAGS += -DHB_HAS_GPM - ifeq ($(HB_GPM_NOICE_DISABLE),yes) - HB_CFLAGS += -DHB_GPM_NOICE_DISABLE - endif endif include $(TOP)$(ROOT)config/lib.mk