* Makefile
- source/hbpcre
- source/hbzlib
* external/Makefile
+ external/pcre
+ external/zlib
* external/pcre/Makefile
* external/zlib/Makefile
* external/libhpdf/Makefile
* external/libpng/Makefile
* include/hbsetup.h
* include/hbzlib.h
* include/hbregex.h
* source/rtl/hbzlibgz.c
* source/rtl/Makefile
* source/rtl/hbregexc.c
* source/rtl/hbregex.c
* source/rtl/hbzlib.c
* source/Makefile
* contrib/xhb/Makefile
* contrib/hbmzip/Makefile
* utils/hbmk2/hbmk2.prg
* config/global.mk
* config/lib.mk
* config/bin.mk
* config/detect.mk
* config/darwin/libs.mk
* config/linux/libs.mk
* config/wce/mingwarm.mk
* config/wce/poccarm.mk
* config/wce/msvcarm.mk
* config/win/xcc.mk
* config/win/mingw.mk
* config/win/pocc.mk
* config/win/bcc.mk
* config/win/watcom.mk
* config/win/icc.mk
* config/win/cygwin.mk
* config/win/msvc.mk
* config/dyn.mk
* config/os2/watcom.mk
* config/os2/gcc.mk
* config/bsd/libs.mk
* config/hpux/libs.mk
* config/sunos/libs.mk
* Changed the way embedded zlib and pcre are handled:
- They now reside in /external dir.
- They are now excluded from Harbour dynlib. This means they
will now be linked statically on non-*nix systems and
dynamically on *nix systems. On *nix it's probably easy to
switch to link statically. On non-*nix this is quite
complicated to do.
- If these libs are provided by the system, those will be used.
- On non-*nix systems the locally hosted versions will be used,
unless user overrides them using HB_INC_PCRE or HB_INC_ZLIB.
- There is currently no officially supported way to force usage
of locally hosted libs.
- If PCRE lib is forcibly disabled or not found, build system
will fall back to POSIX regex on *nix systems and Borland regex
with bcc compiler. Otherwise it will stop the build with an error.
- If zlib is forcibly disabled or not found, an error will be
generated at build-time (in hbrtl). hbmzip is simply skipped
in this case.
- hbmk2 will use local builds of these libs if they are present
in lib dir.
; TOFIX: hbmk script.
; TOFIX: dos builds. cmdline lenghts are most probably too big for them.
; NOTE: Bumps are expected.
; NOTE: I've yet to test/verify it.
- external/libhpdf/ori_src
- external/libhpdf/ori_dst
- Deleted. (added in prev commit by oversight)
44 lines
598 B
Makefile
44 lines
598 B
Makefile
#
|
|
# $Id$
|
|
#
|
|
|
|
ROOT := ./
|
|
|
|
ifeq ($(HB_HOST_BUILD),yes)
|
|
|
|
DIRS := \
|
|
source \
|
|
|
|
else
|
|
|
|
ifeq ($(HB_HOST_BUILD),lib)
|
|
HB_UTIL_DIR :=
|
|
else
|
|
HB_UTIL_DIR := utils{source}
|
|
endif
|
|
|
|
DIRS := \
|
|
doc \
|
|
include \
|
|
external \
|
|
source{external} \
|
|
$(HB_UTIL_DIR) \
|
|
contrib{source} \
|
|
|
|
endif
|
|
|
|
include $(ROOT)config/dir.mk
|
|
|
|
ifeq ($(HB_SHELL),sh)
|
|
HB_POSTINST := $(TOP)$(ROOT)bin/postinst.sh
|
|
else
|
|
ifeq ($(HB_SHELL),os2)
|
|
HB_POSTINST := $(subst /,\,$(TOP)$(ROOT)bin/postinst.cmd)
|
|
else
|
|
HB_POSTINST := $(subst /,\,$(TOP)$(ROOT)bin/postinst.bat)
|
|
endif
|
|
endif
|
|
|
|
install::
|
|
+$(HB_POSTINST)
|