From b68b12a17d765aefdc4bfc1639d13245a95aeea6 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Mon, 30 Jun 2008 17:25:23 +0000 Subject: [PATCH] 2008-06-30 19:20 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * contrib/hbapollo/Makefile * contrib/hbcurl/Makefile * contrib/hbfbird/Makefile * contrib/hbfimage/Makefile * contrib/hbgd/Makefile * contrib/hbhpdf/Makefile * contrib/hbmysql/Makefile * contrib/hbpgsql/Makefile * contrib/rddads/Makefile * Changed to use default for all architecture. Let's hope that checking existence for mixed platform paths won't create problems on any platforms. + Added include path detection logic to hbapollo, too. + Added Darwin path to hbgd include path list. + Added std Linux path to hbfbird include path list. ; TOFIX: Seems that 'ifneq ($(HB_INC_*_OK),)' doesn't really work if no path in the path list is valid. --- harbour/ChangeLog | 19 +++++++++++++++++++ harbour/contrib/hbapollo/Makefile | 7 +++++-- harbour/contrib/hbcurl/Makefile | 2 -- harbour/contrib/hbfbird/Makefile | 4 +--- harbour/contrib/hbfimage/Makefile | 2 -- harbour/contrib/hbgd/Makefile | 4 +--- harbour/contrib/hbhpdf/Makefile | 2 -- harbour/contrib/hbmysql/Makefile | 4 ---- harbour/contrib/hbpgsql/Makefile | 2 -- harbour/contrib/rddads/Makefile | 2 -- 10 files changed, 26 insertions(+), 22 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 4e61b312c2..bba144899c 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,25 @@ 2008-12-31 13:59 UTC+0100 Foo Bar */ +2008-06-30 19:20 UTC+0200 Viktor Szakats (harbour.01 syenar hu) + * contrib/hbapollo/Makefile + * contrib/hbcurl/Makefile + * contrib/hbfbird/Makefile + * contrib/hbfimage/Makefile + * contrib/hbgd/Makefile + * contrib/hbhpdf/Makefile + * contrib/hbmysql/Makefile + * contrib/hbpgsql/Makefile + * contrib/rddads/Makefile + * Changed to use default for all architecture. + Let's hope that checking existence for mixed platform + paths won't create problems on any platforms. + + Added include path detection logic to hbapollo, too. + + Added Darwin path to hbgd include path list. + + Added std Linux path to hbfbird include path list. + ; TOFIX: Seems that 'ifneq ($(HB_INC_*_OK),)' doesn't + really work if no path in the path list is valid. + 2008-06-30 17:15 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * source/rtl/hbinet.c ! Fixed non-ANSI comment. diff --git a/harbour/contrib/hbapollo/Makefile b/harbour/contrib/hbapollo/Makefile index 2609df6074..2437f20171 100644 --- a/harbour/contrib/hbapollo/Makefile +++ b/harbour/contrib/hbapollo/Makefile @@ -3,9 +3,12 @@ # ifeq ($(HB_ARCHITECTURE),w32) -ifneq ($(HB_INC_APOLLO),) -C_USR += -I"${HB_INC_APOLLO}" +HB_INC_APOLLO_OK += $(foreach d, $(HB_INC_APOLLO), $(if $(wildcard $(d)/sde61.h),$(d),)) + +ifneq ($(HB_INC_APOLLO_OK),) + +C_USR += $(foreach d, $(HB_INC_APOLLO_OK), -I$(d)) ROOT = ../../ diff --git a/harbour/contrib/hbcurl/Makefile b/harbour/contrib/hbcurl/Makefile index e17985e707..4a074534eb 100644 --- a/harbour/contrib/hbcurl/Makefile +++ b/harbour/contrib/hbcurl/Makefile @@ -2,11 +2,9 @@ # $Id$ # -ifeq ($(HB_ARCHITECTURE),linux) ifeq ($(HB_INC_CURL),) HB_INC_CURL = /usr/include endif -endif HB_INC_CURL_OK += $(foreach d, $(HB_INC_CURL), $(if $(wildcard $(d)/curl/curl.h),$(d),)) diff --git a/harbour/contrib/hbfbird/Makefile b/harbour/contrib/hbfbird/Makefile index 61df4f80ca..d37b3d67e4 100644 --- a/harbour/contrib/hbfbird/Makefile +++ b/harbour/contrib/hbfbird/Makefile @@ -2,10 +2,8 @@ # $Id$ # -ifeq ($(HB_ARCHITECTURE),linux) ifeq ($(HB_INC_FIREBIRD),) -HB_INC_FIREBIRD = /opt/firebird/include -endif +HB_INC_FIREBIRD = /usr/include /opt/firebird/include endif HB_INC_FIREBIRD_OK += $(foreach d, $(HB_INC_FIREBIRD), $(if $(wildcard $(d)/ibase.h),$(d),)) diff --git a/harbour/contrib/hbfimage/Makefile b/harbour/contrib/hbfimage/Makefile index f54ef2559d..e461c9061c 100644 --- a/harbour/contrib/hbfimage/Makefile +++ b/harbour/contrib/hbfimage/Makefile @@ -2,11 +2,9 @@ # $Id$ # -ifeq ($(HB_ARCHITECTURE),linux) ifeq ($(HB_INC_FREEIMAGE),) HB_INC_FREEIMAGE = /usr/include endif -endif HB_INC_FREEIMAGE_OK += $(foreach d, $(HB_INC_FREEIMAGE), $(if $(wildcard $(d)/FreeImage.h),$(d),)) diff --git a/harbour/contrib/hbgd/Makefile b/harbour/contrib/hbgd/Makefile index 4f8f2ad509..263af89d3a 100644 --- a/harbour/contrib/hbgd/Makefile +++ b/harbour/contrib/hbgd/Makefile @@ -2,10 +2,8 @@ # $Id$ # -ifeq ($(HB_ARCHITECTURE),linux) ifeq ($(HB_INC_GD),) -HB_INC_GD = /usr/include -endif +HB_INC_GD = /usr/include /opt/local/include endif HB_INC_GD_OK += $(foreach d, $(HB_INC_GD), $(if $(wildcard $(d)/gd.h),$(d),)) diff --git a/harbour/contrib/hbhpdf/Makefile b/harbour/contrib/hbhpdf/Makefile index 3306d041cd..a598694cb2 100644 --- a/harbour/contrib/hbhpdf/Makefile +++ b/harbour/contrib/hbhpdf/Makefile @@ -2,11 +2,9 @@ # $Id$ # -ifeq ($(HB_ARCHITECTURE),linux) ifeq ($(HB_INC_LIBHARU),) HB_INC_LIBHARU = /usr/include endif -endif HB_INC_LIBHARU_OK += $(foreach d, $(HB_INC_LIBHARU), $(if $(wildcard $(d)/hpdf.h),$(d),)) diff --git a/harbour/contrib/hbmysql/Makefile b/harbour/contrib/hbmysql/Makefile index 8f7f85546e..7ca5c5c393 100644 --- a/harbour/contrib/hbmysql/Makefile +++ b/harbour/contrib/hbmysql/Makefile @@ -2,13 +2,9 @@ # $Id$ # -ifeq ($(HB_ARCHITECTURE),linux) ifeq ($(HB_INC_MYSQL),) -# a workaround of a problem with different include directories -# for mysql header files between different unix distributions HB_INC_MYSQL = /usr/include/mysql endif -endif HB_INC_MYSQL_OK += $(foreach d, $(HB_INC_MYSQL), $(if $(wildcard $(d)/mysql.h),$(d),)) diff --git a/harbour/contrib/hbpgsql/Makefile b/harbour/contrib/hbpgsql/Makefile index ed249cf829..8e0eadf3bb 100644 --- a/harbour/contrib/hbpgsql/Makefile +++ b/harbour/contrib/hbpgsql/Makefile @@ -2,11 +2,9 @@ # $Id$ # -ifeq ($(HB_ARCHITECTURE),linux) ifeq ($(HB_INC_PGSQL),) HB_INC_PGSQL = /usr/local/pgsql/include /usr/local/pgsql/include/libpq /usr/include/pgsql /usr/include/postgresql /postgres/include endif -endif HB_INC_PGSQL_OK += $(foreach d, $(HB_INC_PGSQL), $(if $(wildcard $(d)/libpq-fe.h),$(d),)) diff --git a/harbour/contrib/rddads/Makefile b/harbour/contrib/rddads/Makefile index dffe99cd65..b958c348d9 100644 --- a/harbour/contrib/rddads/Makefile +++ b/harbour/contrib/rddads/Makefile @@ -2,11 +2,9 @@ # $Id$ # -ifeq ($(HB_ARCHITECTURE),linux) ifeq ($(HB_INC_ADS),) HB_INC_ADS = /usr/local/ads/acesdk $(HOME)/ads/acesdk endif -endif HB_INC_ADS_OK += $(foreach d, $(HB_INC_ADS), $(if $(wildcard $(d)/ace.h),$(d),))