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

2010-05-31 20:59 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* contrib/hbtip/hbtipssl/Makefile
  * contrib/hbtip/Makefile
    + Always create hbtipssl. (not just when 
      openssl is detected)

  * config/detect.mk
  * contrib/hbssl/hbssls/Makefile
  * contrib/hbssl/Makefile
    * Moved openssl detection from central (core) location 
      to hbssl lib.
    ! Fixed hbssl GNU Make files after recent change in 
      static/dynamic selection.
This commit is contained in:
Viktor Szakats
2010-05-31 19:00:30 +00:00
parent 7947434d3a
commit 0593b0ede5
6 changed files with 32 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
harbour/ChangeLog
View File

@@ -17,6 +17,20 @@
past entries belonging to author(s): Viktor Szakats.
*/
2010-05-31 20:59 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* contrib/hbtip/hbtipssl/Makefile
* contrib/hbtip/Makefile
+ Always create hbtipssl. (not just when
openssl is detected)
* config/detect.mk
* contrib/hbssl/hbssls/Makefile
* contrib/hbssl/Makefile
* Moved openssl detection from central (core) location
to hbssl lib.
! Fixed hbssl GNU Make files after recent change in
static/dynamic selection.
2010-05-31 20:35 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+ contrib/hbtip/hbtip.hbp
+ contrib/hbtip/hbtipssl.hbp

12
harbour/config/detect.mk
View File

@@ -66,18 +66,6 @@ _DET_INC_HEAD := /pcre.h
include $(TOP)$(ROOT)config/detfun.mk
# Detect OpenSSL
_DET_DSP_NAME := openssl
_DET_VAR_INC_ := HB_INC_OPENSSL
_DET_VAR_HAS_ := HB_HAS_OPENSSL
_DET_FLT_PLAT := !wce
_DET_FLT_COMP :=
_DET_INC_DEFP := /usr/include /usr/local/include /usr/local/ssl/include /boot/common/include
_DET_INC_HEAD := /openssl/ssl.h
include $(TOP)$(ROOT)config/detfun.mk
# Detect GPM mouse
_DET_DSP_NAME := gpm

13
harbour/contrib/hbssl/Makefile
View File

@@ -28,15 +28,22 @@ C_SOURCES := \
PRG_HEADERS := \
hbssl.ch \
_DET_DSP_NAME := openssl
_DET_VAR_INC_ := HB_INC_OPENSSL
_DET_VAR_HAS_ := HB_HAS_OPENSSL
_DET_FLT_PLAT := !wce
_DET_FLT_COMP :=
_DET_INC_DEFP := /usr/include /usr/local/include /usr/local/ssl/include /boot/common/include
_DET_INC_HEAD := /openssl/ssl.h
include $(TOP)$(ROOT)config/detfun.mk
ifneq ($(HB_HAS_OPENSSL),)
HB_CFLAGS += $(foreach d,$(HB_HAS_OPENSSL),-I$(d))
ifeq ($(HB_PLATFORM),darwin)
HB_CFLAGS += -DOPENSSL_NO_SHA256 -DOPENSSL_NO_SHA512 -DOPENSSL_NO_CAMELLIA -DOPENSSL_NO_SEED -DOPENSSL_NO_DGRAM -DHB_OPENSSL_OLD_OSX_
endif
ifneq ($(filter $(HB_PLATFORM),win wce),)
HB_CFLAGS += -DOPENSSL_OPT_WINDLL
endif
# Patent will expire in 2010/2011
HB_CFLAGS += -DOPENSSL_NO_IDEA

2
harbour/contrib/hbssl/hbssls/Makefile
View File

@@ -31,6 +31,8 @@ ifneq ($(HB_HAS_OPENSSL),)
HB_CFLAGS += $(foreach d,$(HB_HAS_OPENSSL),-I$(d))
HB_CFLAGS += -DHB_OPENSSL_STATIC
# Patent will expire in 2010/2011
HB_CFLAGS += -DOPENSSL_NO_IDEA

8
harbour/contrib/hbtip/Makefile
View File

@@ -36,10 +36,8 @@ PRG_HEADERS := \
thtml.ch \
tip.ch \
DIRS := hbtipssl
include $(TOP)$(ROOT)config/header.mk
include $(TOP)$(ROOT)config/lib.mk
ifneq ($(HB_HAS_OPENSSL),)
DIRS := hbtipssl
include $(TOP)$(ROOT)config/dir.mk
endif
include $(TOP)$(ROOT)config/dir.mk

11
harbour/contrib/hbtip/hbtipssl/Makefile
View File

@@ -35,12 +35,7 @@ PRG_SOURCES := \
thtml.prg \
url.prg \
ifneq ($(HB_HAS_OPENSSL),)
HB_PRGFLAGS += -DHB_HAS_OPENSSL
HB_INC_DEPEND := -I$(TOP)$(ROOT)contrib/hbssl
HB_PRGFLAGS += -DHB_HAS_OPENSSL
HB_INC_DEPEND := -I$(TOP)$(ROOT)contrib/hbssl
include $(TOP)$(ROOT)config/lib.mk
else
include $(TOP)$(ROOT)config/none.mk
endif
include $(TOP)$(ROOT)config/lib.mk