From d3d011b6796b979d9c06a837a6dc52fa32197807 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Thu, 27 Aug 2009 12:00:28 +0000
Subject: [PATCH] 2009-08-27 13:59 UTC+0200 Viktor Szakats (harbour.01
 syenar.hu)   * contrib/hbqt/Makefile   * contrib/hbxbp/Makefile   *
 contrib/gtqtc/Makefile     + QT detection is now also based on detfun.mk.    
 * hbxbp changed a little, but the logic is basically the same.

---
 harbour/ChangeLog              |   9 ++-
 harbour/contrib/gtqtc/Makefile | 107 ++++++++++++++-------------------
 harbour/contrib/hbqt/Makefile  | 104 ++++++++++++++------------------
 harbour/contrib/hbxbp/Makefile | 107 ++++++++++++++++-----------------
 4 files changed, 149 insertions(+), 178 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 77e26198d4..2b6d615894 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,13 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-08-27 13:59 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/hbqt/Makefile
+  * contrib/hbxbp/Makefile
+  * contrib/gtqtc/Makefile
+    + QT detection is now also based on detfun.mk.
+    * hbxbp changed a little, but the logic is basically the same.
+
 2009-08-27 13:15 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * mpkg_deb.sh
     * HB_WITHOUT_ADS -> HB_INC_ADS
@@ -47,7 +54,7 @@
     ; It's possible that I made some mistakes along the line,
       plus report if anything is wrongly detected.
     * external component names converted to all lowercase.
-    ; QT will be done in next commit.
+    ; QT will be done in next commit. [DONE]
 
   * config/detfun.mk
   * config/detect.mk
diff --git a/harbour/contrib/gtqtc/Makefile b/harbour/contrib/gtqtc/Makefile
index 04a9296347..c9620e3d4f 100644
--- a/harbour/contrib/gtqtc/Makefile
+++ b/harbour/contrib/gtqtc/Makefile
@@ -6,81 +6,66 @@ ROOT := ../../
 
 include $(TOP)$(ROOT)config/global.mk
 
-LIBNAME := gtqtc
-
-ifneq ($(filter $(HB_PLATFORM),dos os2),)
-   PREREQ_MISS := platform
-else ifneq ($(filter $(HB_COMPILER),mingw64 watcom bcc pocc pocc64 poccarm),)
-   PREREQ_MISS := compiler
+ifeq ($(HB_QT_STATIC),)
+   LIBNAME := gtqtc
 else
-   PREREQ_MISS :=
+   LIBNAME := gtqtcs
 endif
 
-ifeq ($(PREREQ_MISS),)
+CPP_SOURCES := \
+   gtqtc.cpp \
+   moc_gtqtc.cpp \
 
-   ifneq ($(HB_INC_QT),no)
+C_HEADERS := \
+   gtqtc.h \
 
-      ifeq ($(HB_INC_QT),)
-         ifeq ($(HB_XBUILD),)
-            ifneq ($(HB_PLATFORM_UNIX),)
-               HB_INC_QT := /usr/include/qt4 /usr/lib/qt4/include /usr/include /Developer/qt/include
-            endif
-         endif
-      endif
+_DET_DSP_NAME := qt
+_DET_VAR_INC_ := HB_INC_QT
+_DET_VAR_HAS_ := HB_HAS_QT
+_DET_FLT_PLAT := !dos !os2
+_DET_FLT_COMP := !mingw64 !watcom !bcc !pocc !pocc64 !poccarm
+_DET_INC_DEFP := /usr/include/qt4 /usr/lib/qt4/include /usr/include /Developer/qt/include
+_DET_INC_HEAD := /Qt/qglobal.h
+include $(TOP)$(ROOT)config/detfun.mk
 
-      ifneq ($(HB_INC_QT),)
+_QT_DARWIN :=
+ifeq ($(HB_PLATFORM),darwin)
+   ifeq ($(HB_HAS_QT),)
+      _DET_DSP_NAME := qt
+      _DET_VAR_INC_ := HB_INC_QT
+      _DET_VAR_HAS_ := HB_HAS_QT
+      _DET_INC_DEFP := /Library/Frameworks/QtCore.framework/Versions/4/Headers
+      _DET_INC_HEAD := /QtCore
+      include $(TOP)$(ROOT)config/detfun.mk
+      _QT_DARWIN := yes
+   endif
+endif
 
-         HB_INC_QT_OK := $(strip $(foreach d, $(HB_INC_QT), $(if $(wildcard $(d)/Qt/qglobal.h),$(d),)))
-         ifeq ($(HB_PLATFORM),darwin)
-            ifeq ($(HB_INC_QT_OK),)
-               HB_INC_QT_OK := $(if $(wildcard /Library/Frameworks/QtCore.framework/Versions/4/Headers/QtCore),spec,)
-               ifeq ($(HB_INC_QT_OK),spec)
-                  HB_CFLAGS += -I/Library/Frameworks/QtCore.framework/Headers
-                  HB_CFLAGS += -I/Library/Frameworks/QtGui.framework/Headers
-                  HB_CFLAGS += -I/Library/Frameworks/QtNetwork.framework/Headers
-                  HB_CFLAGS += -I/Library/Frameworks/QtWebKit.framework/Headers
-               endif
-            endif
-         endif
+ifneq ($(HB_HAS_QT),)
 
-         ifneq ($(HB_INC_QT_OK),)
+   ifeq ($(_QT_DARWIN),yes)
+      HB_CFLAGS += -I/Library/Frameworks/QtCore.framework/Headers
+      HB_CFLAGS += -I/Library/Frameworks/QtGui.framework/Headers
+      HB_CFLAGS += -I/Library/Frameworks/QtNetwork.framework/Headers
+      HB_CFLAGS += -I/Library/Frameworks/QtWebKit.framework/Headers
+   else
+      HB_CFLAGS += $(foreach d,$(HB_HAS_QT),-I$(d) -I$(d)/Qt -I$(d)/QtCore -I$(d)/QtGui -I$(d)/QtNetwork -I$(d)/QtWebKit)
+   endif
 
-            ifneq ($(HB_QT_STATIC),)
-               LIBNAME := gtqtcs
-               HB_CFLAGS += -DQT_NODLL
-            endif
+   ifneq ($(HB_QT_STATIC),)
+      HB_CFLAGS += -DQT_NODLL
+   endif
 
-            ifneq ($(HB_INC_QT_OK),spec)
-               HB_CFLAGS += $(foreach d,$(HB_INC_QT_OK),-I$(d) -I$(d)/Qt -I$(d)/QtCore -I$(d)/QtGui -I$(d)/QtNetwork -I$(d)/QtWebKit)
-            endif
+   include $(TOP)$(ROOT)contrib/hbqt/filelist.mk
 
-            CPP_SOURCES := \
-               gtqtc.cpp \
-               moc_gtqtc.cpp \
+   include $(TOP)$(ROOT)config/header.mk
+   INSTALL_RULE_HEADERS := $(INSTALL_RULE)
+   include $(TOP)$(ROOT)config/lib.mk
 
-            C_HEADERS := \
-               gtqtc.h \
-
-            include $(TOP)$(ROOT)config/header.mk
-            INSTALL_RULE_HEADERS := $(INSTALL_RULE)
-            include $(TOP)$(ROOT)config/lib.mk
-
-            install::
+   install::
 	$(INSTALL_RULE_HEADERS)
 
-         else
-            HB_SKIP_REASON := component not found
-            include $(TOP)$(ROOT)config/none.mk
-         endif
-      else
-         HB_SKIP_REASON := component location not set
-         include $(TOP)$(ROOT)config/none.mk
-      endif
-   else
-      HB_SKIP_REASON := deselected
-      include $(TOP)$(ROOT)config/none.mk
-   endif
 else
-   HB_SKIP_REASON := $(PREREQ_MISS) not supported
+   HB_SKIP_REASON := $(_DET_RES_TEXT)
    include $(TOP)$(ROOT)config/none.mk
 endif
diff --git a/harbour/contrib/hbqt/Makefile b/harbour/contrib/hbqt/Makefile
index b915da79d9..f06d14d3a7 100644
--- a/harbour/contrib/hbqt/Makefile
+++ b/harbour/contrib/hbqt/Makefile
@@ -6,79 +6,63 @@ ROOT := ../../
 
 include $(TOP)$(ROOT)config/global.mk
 
-LIBNAME := hbqt
-
-ifneq ($(filter $(HB_PLATFORM),dos os2),)
-   PREREQ_MISS := platform
-else ifneq ($(filter $(HB_COMPILER),mingw64 watcom bcc pocc pocc64 poccarm),)
-   PREREQ_MISS := compiler
+ifeq ($(HB_QT_STATIC),)
+   LIBNAME := hbqt
 else
-   PREREQ_MISS :=
+   LIBNAME := hbqts
 endif
 
-ifeq ($(PREREQ_MISS),)
+PRG_HEADERS := \
+   hbqt.ch \
 
-   ifneq ($(HB_INC_QT),no)
+_DET_DSP_NAME := qt
+_DET_VAR_INC_ := HB_INC_QT
+_DET_VAR_HAS_ := HB_HAS_QT
+_DET_FLT_PLAT := !dos !os2
+_DET_FLT_COMP := !mingw64 !watcom !bcc !pocc !pocc64 !poccarm
+_DET_INC_DEFP := /usr/include/qt4 /usr/lib/qt4/include /usr/include /Developer/qt/include
+_DET_INC_HEAD := /Qt/qglobal.h
+include $(TOP)$(ROOT)config/detfun.mk
 
-      ifeq ($(HB_INC_QT),)
-         ifeq ($(HB_XBUILD),)
-            ifneq ($(HB_PLATFORM_UNIX),)
-               HB_INC_QT := /usr/include/qt4 /usr/lib/qt4/include /usr/include /Developer/qt/include
-            endif
-         endif
-      endif
+ifeq ($(HB_PLATFORM),darwin)
+   ifneq ($(HB_HAS_QT),)
+      _DET_DSP_NAME := qt
+      _DET_VAR_INC_ := HB_INC_QT
+      _DET_VAR_HAS_ := HB_HAS_QT
+      _DET_FLT_PLAT := !dos !os2
+      _DET_FLT_COMP := !mingw64 !watcom !bcc !pocc !pocc64 !poccarm
+      _DET_INC_DEFP := /Library/Frameworks/QtCore.framework/Versions/4/Headers
+      _DET_INC_HEAD := /QtCore
+      include $(TOP)$(ROOT)config/detfun.mk
+      _QT_DARWIN := yes
+   endif
+endif
 
-      ifneq ($(HB_INC_QT),)
+ifneq ($(HB_HAS_QT),)
 
-         HB_INC_QT_OK := $(strip $(foreach d, $(HB_INC_QT), $(if $(wildcard $(d)/Qt/qglobal.h),$(d),)))
-         ifeq ($(HB_PLATFORM),darwin)
-            ifeq ($(HB_INC_QT_OK),)
-               HB_INC_QT_OK := $(if $(wildcard /Library/Frameworks/QtCore.framework/Versions/4/Headers/QtCore),spec,)
-               ifeq ($(HB_INC_QT_OK),spec)
-                  HB_CFLAGS += -I/Library/Frameworks/QtCore.framework/Headers
-                  HB_CFLAGS += -I/Library/Frameworks/QtGui.framework/Headers
-                  HB_CFLAGS += -I/Library/Frameworks/QtNetwork.framework/Headers
-                  HB_CFLAGS += -I/Library/Frameworks/QtWebKit.framework/Headers
-               endif
-            endif
-         endif
+   ifeq ($(_QT_DARWIN),yes)
+      HB_CFLAGS += -I/Library/Frameworks/QtCore.framework/Headers
+      HB_CFLAGS += -I/Library/Frameworks/QtGui.framework/Headers
+      HB_CFLAGS += -I/Library/Frameworks/QtNetwork.framework/Headers
+      HB_CFLAGS += -I/Library/Frameworks/QtWebKit.framework/Headers
+   else
+      HB_CFLAGS += $(foreach d,$(HB_HAS_QT),-I$(d) -I$(d)/Qt -I$(d)/QtCore -I$(d)/QtGui -I$(d)/QtNetwork -I$(d)/QtWebKit)
+   endif
 
-         ifneq ($(HB_INC_QT_OK),)
+   ifneq ($(HB_QT_STATIC),)
+      HB_CFLAGS += -DQT_NODLL
+   endif
 
-            ifneq ($(HB_QT_STATIC),)
-               LIBNAME := hbqts
-               HB_CFLAGS += -DQT_NODLL
-            endif
+   include $(TOP)$(ROOT)contrib/hbqt/filelist.mk
 
-            ifneq ($(HB_INC_QT_OK),spec)
-               HB_CFLAGS += $(foreach d,$(HB_INC_QT_OK),-I$(d) -I$(d)/Qt -I$(d)/QtCore -I$(d)/QtGui -I$(d)/QtNetwork -I$(d)/QtWebKit)
-            endif
+   include $(TOP)$(ROOT)config/header.mk
+   INSTALL_RULE_HEADERS := $(INSTALL_RULE)
+   include $(TOP)$(ROOT)config/lib.mk
 
-            include $(TOP)$(ROOT)contrib/hbqt/filelist.mk
-
-            PRG_HEADERS := \
-               hbqt.ch \
-
-            include $(TOP)$(ROOT)config/header.mk
-            INSTALL_RULE_HEADERS := $(INSTALL_RULE)
-            include $(TOP)$(ROOT)config/lib.mk
-
-            install::
+   install::
 	$(INSTALL_RULE_HEADERS)
 
-         else
-            HB_SKIP_REASON := component not found
-            include $(TOP)$(ROOT)config/none.mk
-         endif
-      else
-         HB_SKIP_REASON := component location not set
-         include $(TOP)$(ROOT)config/none.mk
-      endif
-   else
-      HB_SKIP_REASON := deselected
-      include $(TOP)$(ROOT)config/none.mk
-   endif
 else
-   HB_SKIP_REASON := $(PREREQ_MISS) not supported
+   HB_SKIP_REASON := $(_DET_RES_TEXT)
    include $(TOP)$(ROOT)config/none.mk
 endif
diff --git a/harbour/contrib/hbxbp/Makefile b/harbour/contrib/hbxbp/Makefile
index 41aca82f40..34f4fca7c5 100644
--- a/harbour/contrib/hbxbp/Makefile
+++ b/harbour/contrib/hbxbp/Makefile
@@ -8,72 +8,67 @@ include $(TOP)$(ROOT)config/global.mk
 
 LIBNAME := hbxbp
 
-HB_INC_DEPEND := -I$(TOP)$(ROOT)contrib/hbqt
+PRG_SOURCES := \
+   xbpgeneric.prg \
+   xbpdialog.prg \
+   xbpwindow.prg \
+   xbpparthandler.prg \
+   xbpmenubar.prg \
+   xbptoolbar.prg \
+   xbppushbutton.prg \
+   xbpdataref.prg \
+   xbpcheckbox.prg \
+   xbp3state.prg \
+   xbpradiobutton.prg \
+   xbptabpage.prg \
+   xbplistbox.prg \
+   xbpstatusbar.prg \
+   xbpscrollbar.prg \
+   xbpsle.prg \
+   xbpmle.prg \
+   xbpspinbutton.prg \
+   xbpcombobox.prg \
+   xbptreeview.prg \
+   xbpstyle.prg \
+   xbpappevent.prg \
+   xbpstatic.prg \
+   xbphtmlviewer.prg \
+   xbpfiledialog.prg \
+   xbpfontdialog.prg \
+   xbpbitmap.prg \
+   xbprtf.prg \
+   xbppresspace.prg \
+   xbpprinter.prg \
+   xbpprintdialog.prg \
+   xbpbrowse.prg \
 
-ifneq ($(filter $(HB_PLATFORM),dos os2),)
-   PREREQ_MISS := platform
-else ifneq ($(filter $(HB_COMPILER),mingw64 watcom bcc pocc pocc64 poccarm),)
-   PREREQ_MISS := compiler
-else
-   PREREQ_MISS :=
-endif
+PRG_HEADERS := \
+   xbp.ch \
+   xbpdev.ch \
+   appevent.ch \
+   gra.ch \
 
-ifeq ($(PREREQ_MISS),)
+# Try to be in sync with hbqt, but not too hard, since this
+# lib doesn't need QT external component directly.
+ifeq ($(filter $(HB_PLATFORM),dos os2),)
+   ifeq ($(filter $(HB_COMPILER),mingw64 watcom bcc pocc pocc64 poccarm),)
+      ifneq ($(HB_INC_QT),no)
 
-   ifneq ($(HB_INC_QT),no)
+         HB_INC_DEPEND := -I$(TOP)$(ROOT)contrib/hbqt
 
-      PRG_SOURCES := \
-         xbpgeneric.prg \
-         xbpdialog.prg \
-         xbpwindow.prg \
-         xbpparthandler.prg \
-         xbpmenubar.prg \
-         xbptoolbar.prg \
-         xbppushbutton.prg \
-         xbpdataref.prg \
-         xbpcheckbox.prg \
-         xbp3state.prg \
-         xbpradiobutton.prg \
-         xbptabpage.prg \
-         xbplistbox.prg \
-         xbpstatusbar.prg \
-         xbpscrollbar.prg \
-         xbpsle.prg \
-         xbpmle.prg \
-         xbpspinbutton.prg \
-         xbpcombobox.prg \
-         xbptreeview.prg \
-         xbpstyle.prg \
-         xbpappevent.prg \
-         xbpstatic.prg \
-         xbphtmlviewer.prg \
-         xbpfiledialog.prg \
-         xbpfontdialog.prg \
-         xbpbitmap.prg \
-         xbprtf.prg \
-         xbppresspace.prg \
-         xbpprinter.prg \
-         xbpprintdialog.prg \
-         xbpbrowse.prg \
+         include $(TOP)$(ROOT)config/header.mk
+         INSTALL_RULE_HEADERS := $(INSTALL_RULE)
+         include $(TOP)$(ROOT)config/lib.mk
 
-      PRG_HEADERS := \
-         xbp.ch \
-         xbpdev.ch \
-         appevent.ch \
-         gra.ch \
-
-      include $(TOP)$(ROOT)config/header.mk
-      INSTALL_RULE_HEADERS := $(INSTALL_RULE)
-      include $(TOP)$(ROOT)config/lib.mk
-
-      install::
+         install::
 	$(INSTALL_RULE_HEADERS)
 
+      else
+         include $(TOP)$(ROOT)config/none.mk
+      endif
    else
-      HB_SKIP_REASON := deselected
       include $(TOP)$(ROOT)config/none.mk
    endif
 else
-   HB_SKIP_REASON := $(PREREQ_MISS) not supported
    include $(TOP)$(ROOT)config/none.mk
 endif