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

2008-06-30 19:20 UTC+0200 Viktor Szakats (harbour.01 syenar hu)

Browse Source 
* 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.
This commit is contained in:
Viktor Szakats
2008-06-30 17:25:23 +00:00
parent 714b965a82
commit b68b12a17d
10 changed files with 26 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
harbour/ChangeLog
View File

@@ -8,6 +8,25 @@
2008-12-31 13:59 UTC+0100 Foo Bar <foo.bar@foobar.org>
*/
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.

7
harbour/contrib/hbapollo/Makefile
View File

@@ -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 = ../../

2
harbour/contrib/hbcurl/Makefile
View File

@@ -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),))

4
harbour/contrib/hbfbird/Makefile
View File

@@ -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),))

2
harbour/contrib/hbfimage/Makefile
View File

@@ -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),))

4
harbour/contrib/hbgd/Makefile
View File

@@ -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),))

2
harbour/contrib/hbhpdf/Makefile
View File

@@ -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),))

4
harbour/contrib/hbmysql/Makefile
View File

@@ -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),))

2
harbour/contrib/hbpgsql/Makefile
View File

@@ -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),))

2
harbour/contrib/rddads/Makefile
View File

@@ -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),))