From f61ee664b286174eea3d2102fb9d0b10875749aa Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Wed, 26 Aug 2009 16:55:12 +0000
Subject: [PATCH] 2009-08-26 18:51 UTC+0200 Viktor Szakats (harbour.01
 syenar.hu)   * source/rtl/gtxwc/Makefile   * source/rtl/gtcrs/Makefile   *
 source/rtl/gtsln/Makefile     + Changed to use HB_HAS_* values instead of
 doing autodetection       locally.

  * source/rtl/gttrm/Makefile
    + Indenting.

  * config/global.mk
    + Added HB_LDFLAGS variable. Not yet used.
---
 harbour/ChangeLog                 | 15 ++++++++-
 harbour/config/global.mk          |  1 +
 harbour/source/rtl/gtcrs/Makefile | 56 +++++++++----------------------
 harbour/source/rtl/gtsln/Makefile | 46 ++++++++-----------------
 harbour/source/rtl/gttrm/Makefile | 15 ++++-----
 harbour/source/rtl/gtxwc/Makefile | 21 +++---------
 6 files changed, 55 insertions(+), 99 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index eda48f37a5..676949ee59 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,19 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-08-26 18:51 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * source/rtl/gtxwc/Makefile
+  * source/rtl/gtcrs/Makefile
+  * source/rtl/gtsln/Makefile
+    + Changed to use HB_HAS_* values instead of doing autodetection
+      locally.
+
+  * source/rtl/gttrm/Makefile
+    + Indenting.
+
+  * config/global.mk
+    + Added HB_LDFLAGS variable. Not yet used.
+
 2009-08-26 18:42 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * source/rtl/gtcrs/Makefile
   * source/rtl/gttrm/Makefile
@@ -80,7 +93,7 @@
             tuned after testing.
     ; TODO: Remove reliance on legacy settings in our own codebase.
     ; TODO: Start using HB_HAS_* values for dynamic lib syslib list assembly
-            and in GT Makefiles.
+            and in GT Makefiles. [DONE]
 
   * contrib/hbtip/hbtipssl/Makefile
   * contrib/hbtip/Makefile
diff --git a/harbour/config/global.mk b/harbour/config/global.mk
index 2ec4a208ce..a1f71426d7 100644
--- a/harbour/config/global.mk
+++ b/harbour/config/global.mk
@@ -987,6 +987,7 @@ endif
 # Notice that even single lib/bin builds will currently
 # result in recursive runs, see rule 'descend'. [vszakats]
 HB_CFLAGS :=
+HB_LDFLAGS :=
 HB_PRGFLAGS :=
 
 HB_CROSS_BUILD :=
diff --git a/harbour/source/rtl/gtcrs/Makefile b/harbour/source/rtl/gtcrs/Makefile
index d2eb07d7cf..dc47561fc2 100644
--- a/harbour/source/rtl/gtcrs/Makefile
+++ b/harbour/source/rtl/gtcrs/Makefile
@@ -11,50 +11,24 @@ LIBNAME := gtcrs
 C_SOURCES := \
    gtcrs.c \
 
-ifeq ($(HB_INC_CURSES),)
-   ifeq ($(HB_XBUILD),)
-      ifeq ($(HB_NCURSES_194),yes)
-         HB_INC_CURSES := /usr/include/ncur194
-      else
-         HB_INC_CURSES := /usr/include /usr/local/include /sw/include /opt/local/include
+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
-endif
-
-ifeq ($(HB_WITHOUT_GTCRS),yes)
-   HB_INC_CURSES :=
-endif
-ifeq ($(HB_PLATFORM),os2)
-   HB_INC_CURSES :=
-endif
-
-HB_INC_CURSES_OK := $(strip $(foreach d, $(HB_INC_CURSES), $(if $(wildcard $(d)/curses.h),$(d),)))
-
-ifeq ($(HB_INC_CURSES_OK),)
-   ifeq ($(HB_COMPILER),djgpp)
-      HB_INC_CURSES_OK := $(strip $(foreach d, $(subst ;, ,$(PATH)), $(if $(wildcard $(d)/../include/curses.h),$(d)/../include,)))
+   ifeq ($(HB_NCURSES_194),yes)
+      HB_CFLAGS += -DHB_NCURSES_194
    endif
-endif
-
-ifneq ($(HB_INC_CURSES_OK),)
-
-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
-
-HB_CFLAGS += $(foreach d,$(HB_INC_CURSES_OK),-I$(d))
-
-include $(TOP)$(ROOT)config/lib.mk
 
+   include $(TOP)$(ROOT)config/lib.mk
 else
-include $(TOP)$(ROOT)config/none.mk
+   include $(TOP)$(ROOT)config/none.mk
 endif
diff --git a/harbour/source/rtl/gtsln/Makefile b/harbour/source/rtl/gtsln/Makefile
index 0d65544041..4c79968a6c 100644
--- a/harbour/source/rtl/gtsln/Makefile
+++ b/harbour/source/rtl/gtsln/Makefile
@@ -13,40 +13,22 @@ C_SOURCES := \
    kbsln.c \
    mousesln.c \
 
-ifeq ($(HB_INC_SLANG),)
-   ifeq ($(HB_XBUILD),)
-      ifeq ($(HB_LOCAL_SLN),yes)
-         HB_INC_SLANG := /usr/local/include /usr/local/include/slang
-         LDFLAGS := -L/usr/local/lib $(LDFLAGS)
-      else
-         HB_INC_SLANG := /usr/include /usr/include/slang /usr/local/include /usr/local/include/slang /sw/include /sw/include/slang /opt/local/include /opt/local/include/slang
-         LDFLAGS := -L/usr/lib/slang -L/usr/local/lib -L/usr/local/lib/slang $(LDFLAGS)
+# TODO: Add these to lib path list
+# LDFLAGS := -L/usr/local/lib $(LDFLAGS)
+# LDFLAGS := -L/usr/lib/slang -L/usr/local/lib -L/usr/local/lib/slang $(LDFLAGS)
+
+ifneq ($(HB_HAS_CURSES),)
+
+   HB_CFLAGS += $(foreach d,$(HB_HAS_CURSES),-I$(d))
+
+   ifneq ($(HB_HAS_GPM),)
+      HB_CFLAGS += -DHB_HAS_GPM
+      ifeq ($(HB_GPM_NOICE_DISABLE),yes)
+         HB_CFLAGS += -DHB_GPM_NOICE_DISABLE
       endif
    endif
-endif
-
-ifeq ($(HB_WITHOUT_GTSLN),yes)
-   HB_INC_SLANG :=
-endif
-ifeq ($(HB_COMMERCE),yes)
-   HB_INC_SLANG :=
-endif
-
-HB_INC_SLANG_OK := $(foreach d, $(HB_INC_SLANG), $(if $(wildcard $(d)/slang.h),$(d),))
-
-ifneq ($(strip $(HB_INC_SLANG_OK)),)
-
-ifneq ($(HB_HAS_GPM),)
-   HB_CFLAGS += -DHB_HAS_GPM
-   ifeq ($(HB_GPM_NOICE_DISABLE),yes)
-      HB_CFLAGS += -DHB_GPM_NOICE_DISABLE
-   endif
-endif
-
-HB_CFLAGS += $(foreach d,$(HB_INC_SLANG_OK),-I$(d))
-
-include $(TOP)$(ROOT)config/lib.mk
 
+   include $(TOP)$(ROOT)config/lib.mk
 else
-include $(TOP)$(ROOT)config/none.mk
+   include $(TOP)$(ROOT)config/none.mk
 endif
diff --git a/harbour/source/rtl/gttrm/Makefile b/harbour/source/rtl/gttrm/Makefile
index c43c794f0a..b4393c25bb 100644
--- a/harbour/source/rtl/gttrm/Makefile
+++ b/harbour/source/rtl/gttrm/Makefile
@@ -33,15 +33,14 @@ endif
 
 ifeq ($(HB_WITH_GTTRM),yes)
 
-ifneq ($(HB_HAS_GPM),)
-   HB_CFLAGS += -DHB_HAS_GPM
-   ifeq ($(HB_GPM_NOICE_DISABLE),yes)
-      HB_CFLAGS += -DHB_GPM_NOICE_DISABLE
+   ifneq ($(HB_HAS_GPM),)
+      HB_CFLAGS += -DHB_HAS_GPM
+      ifeq ($(HB_GPM_NOICE_DISABLE),yes)
+         HB_CFLAGS += -DHB_GPM_NOICE_DISABLE
+      endif
    endif
-endif
-
-include $(TOP)$(ROOT)config/lib.mk
 
+   include $(TOP)$(ROOT)config/lib.mk
 else
-include $(TOP)$(ROOT)config/none.mk
+   include $(TOP)$(ROOT)config/none.mk
 endif
diff --git a/harbour/source/rtl/gtxwc/Makefile b/harbour/source/rtl/gtxwc/Makefile
index ca8161f3fc..059bffb86d 100644
--- a/harbour/source/rtl/gtxwc/Makefile
+++ b/harbour/source/rtl/gtxwc/Makefile
@@ -11,24 +11,11 @@ LIBNAME := gtxwc
 C_SOURCES := \
    gtxwc.c \
 
-ifeq ($(HB_INC_X11),)
-   ifeq ($(HB_XBUILD),)
-      HB_INC_X11 := /usr/include
-   endif
-endif
+ifneq ($(HB_HAS_X11),)
 
-ifeq ($(HB_WITHOUT_GTXWC),yes)
-   HB_INC_X11 :=
-endif
-
-HB_INC_X11_OK := $(foreach d, $(HB_INC_X11), $(if $(wildcard $(d)/X11/Xlib.h),$(d),))
-
-ifneq ($(strip $(HB_INC_X11_OK)),)
-
-HB_CFLAGS += $(foreach d,$(HB_INC_X11_OK),-I$(d))
-
-include $(TOP)$(ROOT)config/lib.mk
+   HB_CFLAGS += $(foreach d,$(HB_HAS_X11),-I$(d))
 
+   include $(TOP)$(ROOT)config/lib.mk
 else
-include $(TOP)$(ROOT)config/none.mk
+   include $(TOP)$(ROOT)config/none.mk
 endif