From a341b29acdcd980242f05c066cb8c0fd4145b8c2 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Fri, 6 Feb 2009 23:15:37 +0000 Subject: [PATCH] 2009-02-06 23:47 UTC+0100 Viktor Szakats (harbour.01 syenar hu) * common.mak * harbour-wce-spec * harbour-win-spec * harbour.spec * make_b32.bat * make_b32.mak * make_gcc.mak * make_gcc.sh * make_gnu.bat * make_gnu.sh * make_gnu_os2.cmd * make_gnu_xmingw.sh * make_gnu_xmingwce.sh * make_vc.bat * make_vc.mak * mpkg_tgz.sh * bin/hb-func.sh * bin/hb-mkslib.sh * bin/hbmk.bat * bin/hbmk_os2.cmd * bin/postinst.sh * config/bin.cf * config/bsd/gcc.cf * config/darwin/gcc.cf * config/dos/bcc16.cf * config/dos/djgpp.cf * config/dos/owatcom.cf * config/dos/rsx32.cf * config/hpux/gcc.cf * config/lib.cf * config/linux/gcc.cf * config/linux/owatcom.cf * config/os2/gcc.cf * config/os2/icc.cf * config/rules.cf * config/sunos/gcc.cf * config/win/bcc32.cf * config/win/dm.cf * config/win/gcc.cf * config/win/icc.cf * config/win/mingw.cf * config/win/mingwce.cf * config/win/msvc.cf * config/win/msvcce.cf * config/win/owatcom.cf * config/win/pocc.cf * config/win/pocc64.cf * config/win/poccce.cf * config/win/rsxnt.cf * config/win/xcc.cf * contrib/gtalleg/Makefile * contrib/hbapollo/Makefile * contrib/hbcurl/Makefile * contrib/hbfbird/Makefile * contrib/hbfimage/Makefile * contrib/hbgd/Makefile * contrib/hbgd/tests/hbmk_b32.bat * contrib/hbgd/tests/hbmk_vc.bat * contrib/hbgf/hbgfgtk/Makefile * contrib/hbhpdf/Makefile * contrib/hbmysql/Makefile * contrib/hbodbc/Makefile * contrib/hbpgsql/Makefile * contrib/hbssl/Makefile * contrib/hbtip/ChangeLog * contrib/hbwhat/Makefile * contrib/hbwhat/tests/hbmk_b32.bat * contrib/hbwhat/tests/hbmk_vc.bat * contrib/mtpl_b32.bat * contrib/mtpl_b32.mak * contrib/mtpl_gcc.mak * contrib/mtpl_gcc.sh * contrib/mtpl_vc.bat * contrib/mtpl_vc.mak * contrib/rddads/Makefile * contrib/rddsql/sddfb/Makefile * contrib/rddsql/sddmy/Makefile * contrib/rddsql/sddpg/Makefile * doc/es/tracing.txt * doc/gmake.txt * doc/tracing.txt * include/hbapi.h * source/main/harbour.c * source/pp/hbpp.c * source/rdd/dbffpt/Makefile * source/vm/cmdarg.c * source/vm/Makefile * source/vm/vmmt/Makefile * tests/multifnc/Makefile * tests/testid.prg * utils/hbdoc/Makefile * utils/hbi18n/Makefile * utils/hbmake/hbmake.prg * utils/hbmake/Makefile * utils/hbrun/Makefile * utils/hbtest/Makefile * Renamed remaining build configration envvars: - PRG_USR -> HB_USER_PRGFLAGS - C_USR -> HB_USER_CFLAGS - L_USR -> HB_USER_LDFLAGS - A_USR -> HB_USER_AFLAGS - MK_USR -> HB_USER_MAKEFLAGS (finally settled with HB_USER* instead of HB_USR*, this also means that HB_USER_LIBS was kept unchanged.) ; Please update your environment. You may use these commands to make it easy: gsar -o -sPRG_USR -rHB_USER_PRGFLAGS * gsar -o -sC_USR -rHB_USER_CFLAGS * gsar -o -sL_USR -rHB_USER_LDFLAGS * gsar -o -sA_USR -rHB_USER_AFLAGS * gsar -o -sMK_USR -rHB_USER_MAKEFLAGS * --- harbour/ChangeLog | 113 ++++++++++++++++++++++ harbour/bin/hb-func.sh | 46 ++++----- harbour/bin/hb-mkslib.sh | 4 +- harbour/bin/hbmk.bat | 26 ++--- harbour/bin/hbmk_os2.cmd | 10 +- harbour/bin/postinst.sh | 4 +- harbour/common.mak | 4 +- harbour/config/bin.cf | 2 +- harbour/config/bsd/gcc.cf | 6 +- harbour/config/darwin/gcc.cf | 10 +- harbour/config/dos/bcc16.cf | 6 +- harbour/config/dos/djgpp.cf | 4 +- harbour/config/dos/owatcom.cf | 2 +- harbour/config/dos/rsx32.cf | 2 +- harbour/config/hpux/gcc.cf | 6 +- harbour/config/lib.cf | 2 +- harbour/config/linux/gcc.cf | 6 +- harbour/config/linux/owatcom.cf | 4 +- harbour/config/os2/gcc.cf | 4 +- harbour/config/os2/icc.cf | 2 +- harbour/config/rules.cf | 8 +- harbour/config/sunos/gcc.cf | 6 +- harbour/config/win/bcc32.cf | 2 +- harbour/config/win/dm.cf | 4 +- harbour/config/win/gcc.cf | 2 +- harbour/config/win/icc.cf | 2 +- harbour/config/win/mingw.cf | 4 +- harbour/config/win/mingwce.cf | 6 +- harbour/config/win/msvc.cf | 2 +- harbour/config/win/msvcce.cf | 2 +- harbour/config/win/owatcom.cf | 4 +- harbour/config/win/pocc.cf | 2 +- harbour/config/win/pocc64.cf | 2 +- harbour/config/win/poccce.cf | 2 +- harbour/config/win/rsxnt.cf | 2 +- harbour/config/win/xcc.cf | 2 +- harbour/contrib/gtalleg/Makefile | 2 +- harbour/contrib/hbapollo/Makefile | 2 +- harbour/contrib/hbcurl/Makefile | 2 +- harbour/contrib/hbfbird/Makefile | 2 +- harbour/contrib/hbfimage/Makefile | 2 +- harbour/contrib/hbgd/Makefile | 2 +- harbour/contrib/hbgd/tests/hbmk_b32.bat | 2 +- harbour/contrib/hbgd/tests/hbmk_vc.bat | 2 + harbour/contrib/hbgf/hbgfgtk/Makefile | 4 +- harbour/contrib/hbhpdf/Makefile | 2 +- harbour/contrib/hbmysql/Makefile | 2 +- harbour/contrib/hbodbc/Makefile | 2 +- harbour/contrib/hbpgsql/Makefile | 2 +- harbour/contrib/hbssl/Makefile | 2 +- harbour/contrib/hbtip/ChangeLog | 2 +- harbour/contrib/hbwhat/Makefile | 2 +- harbour/contrib/hbwhat/tests/hbmk_b32.bat | 2 +- harbour/contrib/hbwhat/tests/hbmk_vc.bat | 1 + harbour/contrib/mtpl_b32.bat | 8 +- harbour/contrib/mtpl_b32.mak | 12 +-- harbour/contrib/mtpl_gcc.mak | 8 +- harbour/contrib/mtpl_gcc.sh | 4 +- harbour/contrib/mtpl_vc.bat | 8 +- harbour/contrib/mtpl_vc.mak | 12 +-- harbour/contrib/rddads/Makefile | 2 +- harbour/contrib/rddsql/sddfb/Makefile | 2 +- harbour/contrib/rddsql/sddmy/Makefile | 2 +- harbour/contrib/rddsql/sddpg/Makefile | 2 +- harbour/doc/es/tracing.txt | 4 +- harbour/doc/gmake.txt | 4 +- harbour/doc/tracing.txt | 6 +- harbour/harbour-wce-spec | 22 ++--- harbour/harbour-win-spec | 22 ++--- harbour/harbour.spec | 14 +-- harbour/include/hbapi.h | 6 +- harbour/make_b32.bat | 8 +- harbour/make_b32.mak | 14 +-- harbour/make_gcc.mak | 16 +-- harbour/make_gcc.sh | 12 +-- harbour/make_gnu.bat | 14 +-- harbour/make_gnu.sh | 22 ++--- harbour/make_gnu_os2.cmd | 6 +- harbour/make_gnu_xmingw.sh | 12 +-- harbour/make_gnu_xmingwce.sh | 12 +-- harbour/make_vc.bat | 8 +- harbour/make_vc.mak | 18 ++-- harbour/mpkg_tgz.sh | 10 +- harbour/source/main/harbour.c | 18 ++-- harbour/source/pp/hbpp.c | 12 +-- harbour/source/rdd/dbffpt/Makefile | 2 +- harbour/source/vm/Makefile | 2 +- harbour/source/vm/cmdarg.c | 18 ++-- harbour/source/vm/vmmt/Makefile | 4 +- harbour/tests/multifnc/Makefile | 12 +-- harbour/tests/testid.prg | 2 +- harbour/utils/hbdoc/Makefile | 2 +- harbour/utils/hbi18n/Makefile | 2 +- harbour/utils/hbmake/Makefile | 2 +- harbour/utils/hbmake/hbmake.prg | 6 +- harbour/utils/hbrun/Makefile | 8 +- harbour/utils/hbtest/Makefile | 2 +- 97 files changed, 425 insertions(+), 309 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 5e862072a4..697eb06862 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,119 @@ 2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2009-02-06 23:47 UTC+0100 Viktor Szakats (harbour.01 syenar hu) + * common.mak + * harbour-wce-spec + * harbour-win-spec + * harbour.spec + * make_b32.bat + * make_b32.mak + * make_gcc.mak + * make_gcc.sh + * make_gnu.bat + * make_gnu.sh + * make_gnu_os2.cmd + * make_gnu_xmingw.sh + * make_gnu_xmingwce.sh + * make_vc.bat + * make_vc.mak + * mpkg_tgz.sh + * bin/hb-func.sh + * bin/hb-mkslib.sh + * bin/hbmk.bat + * bin/hbmk_os2.cmd + * bin/postinst.sh + * config/bin.cf + * config/bsd/gcc.cf + * config/darwin/gcc.cf + * config/dos/bcc16.cf + * config/dos/djgpp.cf + * config/dos/owatcom.cf + * config/dos/rsx32.cf + * config/hpux/gcc.cf + * config/lib.cf + * config/linux/gcc.cf + * config/linux/owatcom.cf + * config/os2/gcc.cf + * config/os2/icc.cf + * config/rules.cf + * config/sunos/gcc.cf + * config/win/bcc32.cf + * config/win/dm.cf + * config/win/gcc.cf + * config/win/icc.cf + * config/win/mingw.cf + * config/win/mingwce.cf + * config/win/msvc.cf + * config/win/msvcce.cf + * config/win/owatcom.cf + * config/win/pocc.cf + * config/win/pocc64.cf + * config/win/poccce.cf + * config/win/rsxnt.cf + * config/win/xcc.cf + * contrib/gtalleg/Makefile + * contrib/hbapollo/Makefile + * contrib/hbcurl/Makefile + * contrib/hbfbird/Makefile + * contrib/hbfimage/Makefile + * contrib/hbgd/Makefile + * contrib/hbgd/tests/hbmk_b32.bat + * contrib/hbgd/tests/hbmk_vc.bat + * contrib/hbgf/hbgfgtk/Makefile + * contrib/hbhpdf/Makefile + * contrib/hbmysql/Makefile + * contrib/hbodbc/Makefile + * contrib/hbpgsql/Makefile + * contrib/hbssl/Makefile + * contrib/hbtip/ChangeLog + * contrib/hbwhat/Makefile + * contrib/hbwhat/tests/hbmk_b32.bat + * contrib/hbwhat/tests/hbmk_vc.bat + * contrib/mtpl_b32.bat + * contrib/mtpl_b32.mak + * contrib/mtpl_gcc.mak + * contrib/mtpl_gcc.sh + * contrib/mtpl_vc.bat + * contrib/mtpl_vc.mak + * contrib/rddads/Makefile + * contrib/rddsql/sddfb/Makefile + * contrib/rddsql/sddmy/Makefile + * contrib/rddsql/sddpg/Makefile + * doc/es/tracing.txt + * doc/gmake.txt + * doc/tracing.txt + * include/hbapi.h + * source/main/harbour.c + * source/pp/hbpp.c + * source/rdd/dbffpt/Makefile + * source/vm/cmdarg.c + * source/vm/Makefile + * source/vm/vmmt/Makefile + * tests/multifnc/Makefile + * tests/testid.prg + * utils/hbdoc/Makefile + * utils/hbi18n/Makefile + * utils/hbmake/hbmake.prg + * utils/hbmake/Makefile + * utils/hbrun/Makefile + * utils/hbtest/Makefile + * Renamed remaining build configration envvars: + - PRG_USR -> HB_USER_PRGFLAGS + - C_USR -> HB_USER_CFLAGS + - L_USR -> HB_USER_LDFLAGS + - A_USR -> HB_USER_AFLAGS + - MK_USR -> HB_USER_MAKEFLAGS + (finally settled with HB_USER* instead of HB_USR*, + this also means that HB_USER_LIBS was kept unchanged.) + ; Please update your environment. + You may use these commands to make it easy: + gsar -o -sPRG_USR -rHB_USER_PRGFLAGS * + gsar -o -sC_USR -rHB_USER_CFLAGS * + gsar -o -sL_USR -rHB_USER_LDFLAGS * + gsar -o -sA_USR -rHB_USER_AFLAGS * + gsar -o -sMK_USR -rHB_USER_MAKEFLAGS * + 2009-02-06 23:00 UTC+0100 Viktor Szakats (harbour.01 syenar hu) * include/hbpp.h * Minor rearrangement of previous state. diff --git a/harbour/bin/hb-func.sh b/harbour/bin/hb-func.sh index d295ca6dd8..de3e24c0d8 100755 --- a/harbour/bin/hb-func.sh +++ b/harbour/bin/hb-func.sh @@ -165,13 +165,13 @@ mk_hbtools() HB_SYS_LIBS="-lm" HB_CRS_LIB="" HB_SLN_LIB="" - if [ "${C_USR//-DHB_PCRE_REGEX/}" != "${C_USR}" ]; then + if [ "${HB_USER_CFLAGS//-DHB_PCRE_REGEX/}" != "${HB_USER_CFLAGS}" ]; then HB_SYS_LIBS="-lpcre ${HB_SYS_LIBS}" hb_libs="${hb_libs//hbpcre/}" - elif [ "${C_USR//-DHB_POSIX_REGEX/}" != "${C_USR}" ]; then + elif [ "${HB_USER_CFLAGS//-DHB_POSIX_REGEX/}" != "${HB_USER_CFLAGS}" ]; then hb_libs="${hb_libs//hbpcre/}" fi - if [ "${C_USR//-DHB_EXT_ZLIB/}" != "${C_USR}" ]; then + if [ "${HB_USER_CFLAGS//-DHB_EXT_ZLIB/}" != "${HB_USER_CFLAGS}" ]; then HB_SYS_LIBS="-lz ${HB_SYS_LIBS}" hb_libs="${hb_libs//hbzlib/}" fi @@ -201,24 +201,24 @@ mk_hbtools() fi HB_SLN_LIB="slang" fi - CC_C_USR="-O3 ${CC_C_USR}" - if [ "${C_USR//-mlp64/}" != "${C_USR}" ]; then - CC_C_USR="${CC_C_USR} -mlp64" - CC_L_USR="${CC_L_USR} -mlp64" - elif [ "${C_USR//-mlp32/}" != "${C_USR}" ]; then - CC_C_USR="${CC_C_USR} -mlp32" - CC_L_USR="${CC_L_USR} -mlp32" - elif [ "${C_USR//-m64/}" != "${C_USR}" ]; then - CC_C_USR="${CC_C_USR} -m64" - CC_L_USR="${CC_L_USR} -m64" - elif [ "${C_USR//-m32/}" != "${C_USR}" ]; then - CC_C_USR="${CC_C_USR} -m32" - CC_L_USR="${CC_L_USR} -m32" + CC_HB_USER_CFLAGS="-O3 ${CC_HB_USER_CFLAGS}" + if [ "${HB_USER_CFLAGS//-mlp64/}" != "${HB_USER_CFLAGS}" ]; then + CC_HB_USER_CFLAGS="${CC_HB_USER_CFLAGS} -mlp64" + CC_HB_USER_LDFLAGS="${CC_HB_USER_LDFLAGS} -mlp64" + elif [ "${HB_USER_CFLAGS//-mlp32/}" != "${HB_USER_CFLAGS}" ]; then + CC_HB_USER_CFLAGS="${CC_HB_USER_CFLAGS} -mlp32" + CC_HB_USER_LDFLAGS="${CC_HB_USER_LDFLAGS} -mlp32" + elif [ "${HB_USER_CFLAGS//-m64/}" != "${HB_USER_CFLAGS}" ]; then + CC_HB_USER_CFLAGS="${CC_HB_USER_CFLAGS} -m64" + CC_HB_USER_LDFLAGS="${CC_HB_USER_LDFLAGS} -m64" + elif [ "${HB_USER_CFLAGS//-m32/}" != "${HB_USER_CFLAGS}" ]; then + CC_HB_USER_CFLAGS="${CC_HB_USER_CFLAGS} -m32" + CC_HB_USER_LDFLAGS="${CC_HB_USER_LDFLAGS} -m32" fi - if [ "${C_USR//-fPIC/}" != "${C_USR}" ]; then - CC_C_USR="${CC_C_USR} -fPIC" - elif [ "${C_USR//-fpic/}" != "${C_USR}" ]; then - CC_C_USR="${CC_C_USR} -fpic" + if [ "${HB_USER_CFLAGS//-fPIC/}" != "${HB_USER_CFLAGS}" ]; then + CC_HB_USER_CFLAGS="${CC_HB_USER_CFLAGS} -fPIC" + elif [ "${HB_USER_CFLAGS//-fpic/}" != "${HB_USER_CFLAGS}" ]; then + CC_HB_USER_CFLAGS="${CC_HB_USER_CFLAGS} -fpic" fi echo "Generating ${hb_tool}... " @@ -321,9 +321,9 @@ HB_USRLIBS="" HB_USRLPATH="" HB_GEN="" HB_MODE="" -LN_OPT="${CC_L_USR}" -CC_OPT="${CC_C_USR}" -HB_OPT="${CC_PRG_USR}" +LN_OPT="${CC_HB_USER_LDFLAGS}" +CC_OPT="${CC_HB_USER_CFLAGS}" +HB_OPT="${CC_HB_USER_PRGFLAGS}" [ -n "\$TMPDIR" ] || TMPDIR="\$TMP" [ -n "\$TMPDIR" ] || TMPDIR="\$TEMP" diff --git a/harbour/bin/hb-mkslib.sh b/harbour/bin/hb-mkslib.sh index c9a8f743f1..14b71284fa 100755 --- a/harbour/bin/hb-mkslib.sh +++ b/harbour/bin/hb-mkslib.sh @@ -138,7 +138,7 @@ elif [ "${SLIB_EXT}" = ".dll" ]; then SYSLIBS="-luser32 -lwinspool -lgdi32 -lcomctl32 -lcomdlg32 -lole32" SYSLIBS="${SYSLIBS} -loleaut32 -luuid -lmpr -lwsock32 -lws2_32 -lmapi32" fi - ${CCPREFIX}gcc -shared -o "${FULLNAME}" $OBJLST ${linker_options} ${L_USR} ${SYSLIBS} ${HB_DLLIBS} && \ + ${CCPREFIX}gcc -shared -o "${FULLNAME}" $OBJLST ${linker_options} ${HB_USER_LDFLAGS} ${SYSLIBS} ${HB_DLLIBS} && \ cd "${dir}" && \ rm -f "${DSTDIR}${FULLNAME}" && \ mv -f "${OTMPDIR}/${FULLNAME}" "${DSTDIR}${FULLNAME}" @@ -146,7 +146,7 @@ else #FULLNAME="${BASE}-${VERSION}${SLIB_EXT}" #FULLNAME="${BASE}{SLIB_EXT}.${VERSION}" FULLNAME="${LIB_NAME}${SLIB_EXT}" - ${CCPREFIX}gcc -shared -fPIC -o "${FULLNAME}" $OBJLST ${linker_options} ${L_USR} && \ + ${CCPREFIX}gcc -shared -fPIC -o "${FULLNAME}" $OBJLST ${linker_options} ${HB_USER_LDFLAGS} && \ cd "${dir}" && \ mv -f "${OTMPDIR}/${FULLNAME}" "${DSTDIR}${FULLNAME}" fi diff --git a/harbour/bin/hbmk.bat b/harbour/bin/hbmk.bat index ebed967989..4e93460561 100644 --- a/harbour/bin/hbmk.bat +++ b/harbour/bin/hbmk.bat @@ -128,7 +128,7 @@ if "%_HB_MT%" == "yes" set _HB_MT=mt if "%OS%" == "Windows_NT" set _HB_PRG_NAME=%~n1 if not "%OS%" == "Windows_NT" set _HB_PRG_NAME=%1 - %HB_BIN_INSTALL%\harbour %_HB_PRG_NAME%.prg -n -q0 -i%HB_INC_INSTALL% %2 %3 %PRG_USR% + %HB_BIN_INSTALL%\harbour %_HB_PRG_NAME%.prg -n -q0 -i%HB_INC_INSTALL% %2 %3 %HB_USER_PRGFLAGS% :A_DOS @@ -137,7 +137,7 @@ if "%_HB_MT%" == "yes" set _HB_MT=mt if not "%HB_COMPILER%" == "djgpp" goto A_DOS_DJGPP_NOT echo %_HB_PRG_NAME%.c > _hb_mk.tmp - echo -o%_HB_PRG_NAME%.exe -O3 %C_USR% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% >> _hb_mk.tmp + echo -o%_HB_PRG_NAME%.exe -O3 %HB_USER_CFLAGS% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% >> _hb_mk.tmp echo -lhbcpage >> _hb_mk.tmp echo -lhbdebug >> _hb_mk.tmp echo -lhbvm >> _hb_mk.tmp @@ -168,15 +168,15 @@ if "%_HB_MT%" == "yes" set _HB_MT=mt if not "%HB_COMPILER%" == "rsx32" goto A_DOS_RSX32_NOT - gcc %_HB_PRG_NAME%.c -O3 -Zrsx32 %C_USR% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% -lhbcpage -lhbdebug -lhbvm -lhbrtl -lgtdos -lgtcgi -lgtstd -lgtpca -lhblang -lhbrdd -lhbrtl -lhbvm -lhbmacro -lhbpp -lrddfpt -lrddntx -lrddnsx -lrddcdx -lhbhsx -lhbsix -lhbcommon -lhbpcre -lhbzlib + gcc %_HB_PRG_NAME%.c -O3 -Zrsx32 %HB_USER_CFLAGS% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% -lhbcpage -lhbdebug -lhbvm -lhbrtl -lgtdos -lgtcgi -lgtstd -lgtpca -lhblang -lhbrdd -lhbrtl -lhbvm -lhbmacro -lhbpp -lrddfpt -lrddntx -lrddnsx -lrddcdx -lhbhsx -lhbsix -lhbcommon -lhbpcre -lhbzlib goto CLEANUP :A_DOS_RSX32_NOT if not "%HB_COMPILER%" == "owatcom" goto END - wpp386 -j -w3 -5s -5r -fp5 -oxehtz -zq -zt0 -bt=DOS %C_USR% %_HB_PRG_NAME%.c -fo=%_HB_PRG_NAME%.obj - echo OP osn=DOS OP stack=65536 OP CASEEXACT OP stub=cwstub.exe %L_USR% NAME %_HB_PRG_NAME%.exe > _hb_mk.tmp + wpp386 -j -w3 -5s -5r -fp5 -oxehtz -zq -zt0 -bt=DOS %HB_USER_CFLAGS% %_HB_PRG_NAME%.c -fo=%_HB_PRG_NAME%.obj + echo OP osn=DOS OP stack=65536 OP CASEEXACT OP stub=cwstub.exe %HB_USER_LDFLAGS% NAME %_HB_PRG_NAME%.exe > _hb_mk.tmp echo FILE %_HB_PRG_NAME%.obj >> _hb_mk.tmp echo LIB hbcpage.lib >> _hb_mk.tmp echo LIB hbdebug.lib >> _hb_mk.tmp @@ -216,8 +216,8 @@ if "%_HB_MT%" == "yes" set _HB_MT=mt if "%_HB_GUI%" == "yes" set _HB_USR_C=%_HB_USR_C% -tW - if not "%_HB_SHARED%" == "yes" bcc32 -q -tWM -O2 -OS -Ov -Oi -Oc -d %C_USR% %_HB_USR_C% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% %_HB_PRG_NAME%.c %HB_USER_LIBS% hbcpage.lib hbdebug.lib hbvm%_HB_MT%.lib hbrtl.lib gtcgi.lib gtgui.lib gtpca.lib gtstd.lib gtwin.lib gtwvt.lib hblang.lib hbrdd.lib hbmacro.lib hbpp.lib rddfpt.lib rddntx.lib rddnsx.lib rddcdx.lib hbhsx.lib hbsix.lib hbcommon.lib hbpcre.lib hbzlib.lib - if "%_HB_SHARED%" == "yes" bcc32 -q -tWM -O2 -OS -Ov -Oi -Oc -d %C_USR% %_HB_USR_C% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% %_HB_PRG_NAME%.c %HB_USER_LIBS% harbour%_HB_MT%-11-b32.lib hbmainstd.lib hbmainwin.lib hbcommon.lib + if not "%_HB_SHARED%" == "yes" bcc32 -q -tWM -O2 -OS -Ov -Oi -Oc -d %HB_USER_CFLAGS% %_HB_USR_C% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% %_HB_PRG_NAME%.c %HB_USER_LIBS% hbcpage.lib hbdebug.lib hbvm%_HB_MT%.lib hbrtl.lib gtcgi.lib gtgui.lib gtpca.lib gtstd.lib gtwin.lib gtwvt.lib hblang.lib hbrdd.lib hbmacro.lib hbpp.lib rddfpt.lib rddntx.lib rddnsx.lib rddcdx.lib hbhsx.lib hbsix.lib hbcommon.lib hbpcre.lib hbzlib.lib + if "%_HB_SHARED%" == "yes" bcc32 -q -tWM -O2 -OS -Ov -Oi -Oc -d %HB_USER_CFLAGS% %_HB_USR_C% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% %_HB_PRG_NAME%.c %HB_USER_LIBS% harbour%_HB_MT%-11-b32.lib hbmainstd.lib hbmainwin.lib hbcommon.lib goto CLEANUP @@ -230,8 +230,8 @@ if "%_HB_MT%" == "yes" set _HB_MT=mt if not "%_HB_GUI%" == "yes" set _HB_USR_L=/subsystem:console if "%_HB_GUI%" == "yes" set _HB_USR_L=/subsystem:windows - if not "%_HB_SHARED%" == "yes" cl -nologo -W3 %C_USR% %_HB_USR_C% -I%HB_INC_INSTALL% %_HB_PRG_NAME%.c /link /libpath:%HB_LIB_INSTALL% %L_USR% %_HB_USR_L% %HB_USER_LIBS% hbcpage.lib hbdebug.lib hbvm%_HB_MT%.lib hbrtl.lib gtcgi.lib gtgui.lib gtpca.lib gtstd.lib gtwin.lib gtwvt.lib hblang.lib hbrdd.lib hbmacro.lib hbpp.lib rddntx.lib rddnsx.lib rddcdx.lib rddfpt.lib hbhsx.lib hbsix.lib hbcommon.lib hbpcre.lib hbzlib.lib user32.lib wsock32.lib advapi32.lib gdi32.lib - if "%_HB_SHARED%" == "yes" cl -nologo -W3 %C_USR% %_HB_USR_C% -I%HB_INC_INSTALL% %_HB_PRG_NAME%.c /link /libpath:%HB_LIB_INSTALL% %L_USR% %_HB_USR_L% %HB_USER_LIBS% harbour%_HB_MT%-11-vc.lib hbmainstd.lib hbmainwin.lib hbcommon.lib user32.lib wsock32.lib advapi32.lib gdi32.lib + if not "%_HB_SHARED%" == "yes" cl -nologo -W3 %HB_USER_CFLAGS% %_HB_USR_C% -I%HB_INC_INSTALL% %_HB_PRG_NAME%.c /link /libpath:%HB_LIB_INSTALL% %HB_USER_LDFLAGS% %_HB_USR_L% %HB_USER_LIBS% hbcpage.lib hbdebug.lib hbvm%_HB_MT%.lib hbrtl.lib gtcgi.lib gtgui.lib gtpca.lib gtstd.lib gtwin.lib gtwvt.lib hblang.lib hbrdd.lib hbmacro.lib hbpp.lib rddntx.lib rddnsx.lib rddcdx.lib rddfpt.lib hbhsx.lib hbsix.lib hbcommon.lib hbpcre.lib hbzlib.lib user32.lib wsock32.lib advapi32.lib gdi32.lib + if "%_HB_SHARED%" == "yes" cl -nologo -W3 %HB_USER_CFLAGS% %_HB_USR_C% -I%HB_INC_INSTALL% %_HB_PRG_NAME%.c /link /libpath:%HB_LIB_INSTALL% %HB_USER_LDFLAGS% %_HB_USR_L% %HB_USER_LIBS% harbour%_HB_MT%-11-vc.lib hbmainstd.lib hbmainwin.lib hbcommon.lib user32.lib wsock32.lib advapi32.lib gdi32.lib goto CLEANUP :A_WIN_MSVC_NOT @@ -239,22 +239,22 @@ if "%_HB_MT%" == "yes" set _HB_MT=mt if "%HB_COMPILER%" == "gcc" set HB_COMPILER=mingw if not "%HB_COMPILER%" == "mingw" goto A_WIN_MINGW_NOT - gcc %_HB_PRG_NAME%.c -O3 -o%_HB_PRG_NAME%.exe %C_USR% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% -lhbcpage -lhbdebug -lhbvm%_HB_MT% -lhbrtl -lgtcgi -lgtgui -lgtpca -lgtstd -lgtwin -lgtwvt -lhblang -lhbrdd -lhbrtl -lhbvm%_HB_MT% -lhbmacro -lhbpp -lrddfpt -lrddntx -lrddnsx -lrddcdx -lhbhsx -lhbsix -lhbcommon -lhbpcre -lhbzlib + gcc %_HB_PRG_NAME%.c -O3 -o%_HB_PRG_NAME%.exe %HB_USER_CFLAGS% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% -lhbcpage -lhbdebug -lhbvm%_HB_MT% -lhbrtl -lgtcgi -lgtgui -lgtpca -lgtstd -lgtwin -lgtwvt -lhblang -lhbrdd -lhbrtl -lhbvm%_HB_MT% -lhbmacro -lhbpp -lrddfpt -lrddntx -lrddnsx -lrddcdx -lhbhsx -lhbsix -lhbcommon -lhbpcre -lhbzlib goto CLEANUP :A_WIN_MINGW_NOT if not "%HB_COMPILER%" == "rsxnt" goto A_WIN_RSXNT_NOT - gcc %_HB_PRG_NAME%.c -O3 -Zwin32 %C_USR% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% -lhbcpage -lhbdebug -lhbvm%_HB_MT% -lhbrtl -lgtcgi -lgtgui -lgtpca -lgtstd -lgtwin -lgtwvt -lhblang -lhbrdd -lhbrtl -lhbvm%_HB_MT% -lhbmacro -lhbpp -lrddfpt -lrddntx -lrddnsx -lrddcdx -lhbhsx -lhbsix -lhbcommon -lhbpcre -lhbzlib + gcc %_HB_PRG_NAME%.c -O3 -Zwin32 %HB_USER_CFLAGS% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% -lhbcpage -lhbdebug -lhbvm%_HB_MT% -lhbrtl -lgtcgi -lgtgui -lgtpca -lgtstd -lgtwin -lgtwvt -lhblang -lhbrdd -lhbrtl -lhbvm%_HB_MT% -lhbmacro -lhbpp -lrddfpt -lrddntx -lrddnsx -lrddcdx -lhbhsx -lhbsix -lhbcommon -lhbpcre -lhbzlib goto CLEANUP :A_WIN_RSXNT_NOT if not "%HB_COMPILER%" == "owatcom" goto END - wpp386 -j -w3 -5s -5r -fp5 -oxehtz -zq -zt0 -mf -bt=NT %C_USR% %_HB_PRG_NAME%.c -fo=%_HB_PRG_NAME%.obj - echo OP osn=NT OP stack=65536 OP CASEEXACT %L_USR% NAME %_HB_PRG_NAME%.exe > _hb_mk.tmp + wpp386 -j -w3 -5s -5r -fp5 -oxehtz -zq -zt0 -mf -bt=NT %HB_USER_CFLAGS% %_HB_PRG_NAME%.c -fo=%_HB_PRG_NAME%.obj + echo OP osn=NT OP stack=65536 OP CASEEXACT %HB_USER_LDFLAGS% NAME %_HB_PRG_NAME%.exe > _hb_mk.tmp echo FILE %_HB_PRG_NAME%.obj >> _hb_mk.tmp echo LIB hbcpage.lib >> _hb_mk.tmp echo LIB hbdebug.lib >> _hb_mk.tmp diff --git a/harbour/bin/hbmk_os2.cmd b/harbour/bin/hbmk_os2.cmd index 5723c8e860..ca7da98ecf 100644 --- a/harbour/bin/hbmk_os2.cmd +++ b/harbour/bin/hbmk_os2.cmd @@ -74,28 +74,28 @@ if "%_HB_MT%" == "MT" set _HBVM_LIB=hbvmmt :COMPILE - %HB_BIN_INSTALL%\harbour %1.prg -n -i%HB_INC_INSTALL% %2 %3 %PRG_USR% + %HB_BIN_INSTALL%\harbour %1.prg -n -i%HB_INC_INSTALL% %2 %3 %HB_USER_PRGFLAGS% :A_DOS if not "%HB_COMPILER%" == "gcc" goto A_OS2_GCC_NOT - gcc %1.c -O3 %C_USR% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% -lhbcpage -lhbdebug -l_HBVM_LIB -lhbrtl -lgtcgi -lgtstd -lgtos2 -lgtpca -lhblang -lhbrdd -lhbrtl -l_HBVM_LIB -lhbmacro -lhbpp -lrddfpt -lrddntx -lrddnsx -lrddcdx -lhbsix -lhbcommon -lhbpcre -lhbzlib + gcc %1.c -O3 %HB_USER_CFLAGS% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% -lhbcpage -lhbdebug -l_HBVM_LIB -lhbrtl -lgtcgi -lgtstd -lgtos2 -lgtpca -lhblang -lhbrdd -lhbrtl -l_HBVM_LIB -lhbmacro -lhbpp -lrddfpt -lrddntx -lrddnsx -lrddcdx -lhbsix -lhbcommon -lhbpcre -lhbzlib goto CLEANUP :A_OS2_GCC_NOT if not "%HB_COMPILER%" == "icc" goto A_OS2_ICC_NOT - icc /Gs+ /W2 /Se /Sd+ /Ti+ /C- /Tp %C_USR% -I%HB_INC_INSTALL% %1.c %HB_LIB_INSTALL%\hbcpage.lib %HB_LIB_INSTALL%\hbdebug.lib %HB_LIB_INSTALL%\_HBVM_LIB.lib %HB_LIB_INSTALL%\hbrtl.lib %HB_LIB_INSTALL%\gtcgi.lib %HB_LIB_INSTALL%\gtstd.lib %HB_LIB_INSTALL%\gtos2.lib %HB_LIB_INSTALL%\gtpca.lib %HB_LIB_INSTALL%\hblang.lib %HB_LIB_INSTALL%\hbrdd.lib %HB_LIB_INSTALL%\hbrtl.lib %HB_LIB_INSTALL%\_HBVM_LIB.lib %HB_LIB_INSTALL%\hbmacro.lib %HB_LIB_INSTALL%\hbpp.lib %HB_LIB_INSTALL%\rddfpt.lib %HB_LIB_INSTALL%\rddntx.lib %HB_LIB_INSTALL%\rddnsx.lib %HB_LIB_INSTALL%\rddcdx.lib %HB_LIB_INSTALL%\hbsix.lib %HB_LIB_INSTALL%\hbcommon.lib %HB_LIB_INSTALL%\hbpcre.lib %HB_LIB_INSTALL%\hbzlib.lib + icc /Gs+ /W2 /Se /Sd+ /Ti+ /C- /Tp %HB_USER_CFLAGS% -I%HB_INC_INSTALL% %1.c %HB_LIB_INSTALL%\hbcpage.lib %HB_LIB_INSTALL%\hbdebug.lib %HB_LIB_INSTALL%\_HBVM_LIB.lib %HB_LIB_INSTALL%\hbrtl.lib %HB_LIB_INSTALL%\gtcgi.lib %HB_LIB_INSTALL%\gtstd.lib %HB_LIB_INSTALL%\gtos2.lib %HB_LIB_INSTALL%\gtpca.lib %HB_LIB_INSTALL%\hblang.lib %HB_LIB_INSTALL%\hbrdd.lib %HB_LIB_INSTALL%\hbrtl.lib %HB_LIB_INSTALL%\_HBVM_LIB.lib %HB_LIB_INSTALL%\hbmacro.lib %HB_LIB_INSTALL%\hbpp.lib %HB_LIB_INSTALL%\rddfpt.lib %HB_LIB_INSTALL%\rddntx.lib %HB_LIB_INSTALL%\rddnsx.lib %HB_LIB_INSTALL%\rddcdx.lib %HB_LIB_INSTALL%\hbsix.lib %HB_LIB_INSTALL%\hbcommon.lib %HB_LIB_INSTALL%\hbpcre.lib %HB_LIB_INSTALL%\hbzlib.lib goto CLEANUP :A_OS2_ICC_NOT if not "%HB_COMPILER%" == "owatcom" goto END - wpp386 -j -w3 -5s -5r -fp5 -oxehtz -zq -zt0 -mf -bt=OS2 %C_USR% %_HB_PRG_NAME%.c -fo=%_HB_PRG_NAME%.obj - echo OP stack=65536 OP CASEEXACT %L_USR% NAME %_HB_PRG_NAME%.exe > _hb_mk.tmp + wpp386 -j -w3 -5s -5r -fp5 -oxehtz -zq -zt0 -mf -bt=OS2 %HB_USER_CFLAGS% %_HB_PRG_NAME%.c -fo=%_HB_PRG_NAME%.obj + echo OP stack=65536 OP CASEEXACT %HB_USER_LDFLAGS% NAME %_HB_PRG_NAME%.exe > _hb_mk.tmp echo FILE %_HB_PRG_NAME%.obj >> _hb_mk.tmp echo LIB hbcpage.lib >> _hb_mk.tmp echo LIB hbdebug.lib >> _hb_mk.tmp diff --git a/harbour/bin/postinst.sh b/harbour/bin/postinst.sh index be4c0e0888..36409f3703 100755 --- a/harbour/bin/postinst.sh +++ b/harbour/bin/postinst.sh @@ -56,7 +56,7 @@ then # We must build an archive index on Darwin #AR="${CCPREFIX}ar -crs" AR="libtool" - AR_OPT="-static ${LIBTOOL_USR} -o " + AR_OPT="-static ${LIBTOOHB_USER_LDFLAGS} -o " fi if [ -n "${HB_TOOLS_PREF}" ]; then @@ -83,7 +83,7 @@ then fi # build hbfm lib with memory statistic (cd ${hb_root}/source/vm - export C_USR="${C_USR//-DHB_FM_STATISTICS_OFF/} -DHB_FM_STATISTICS" + export HB_USER_CFLAGS="${HB_USER_CFLAGS//-DHB_FM_STATISTICS_OFF/} -DHB_FM_STATISTICS" rm -f fm.o ${MAKE} -r fm.o ${AR} ${AR_OPT} ${HB_LIB_INSTALL}/libhbfm.a fm.o diff --git a/harbour/common.mak b/harbour/common.mak index 0ef89c8c39..b27ed71ca5 100644 --- a/harbour/common.mak +++ b/harbour/common.mak @@ -98,8 +98,8 @@ HBFLAGSPLT = -D__PLATFORM__WINCE !else HBFLAGSPLT = -gc3 !endif -HARBOURFLAGSLIB= -n1 $(HBFLAGSCMN) $(HBFLAGSDBG) $(HBFLAGSPLT) $(PRG_USR) -HARBOURFLAGSEXE= -n $(HBFLAGSCMN) $(HBFLAGSDBG) $(HBFLAGSPLT) -gc0 $(PRG_USR) +HARBOURFLAGSLIB= -n1 $(HBFLAGSCMN) $(HBFLAGSDBG) $(HBFLAGSPLT) $(HB_USER_PRGFLAGS) +HARBOURFLAGSEXE= -n $(HBFLAGSCMN) $(HBFLAGSDBG) $(HBFLAGSPLT) -gc0 $(HB_USER_PRGFLAGS) #********************************************************** # Directory macros. These should never have to change. diff --git a/harbour/config/bin.cf b/harbour/config/bin.cf index 0c795ac285..8280fd1064 100644 --- a/harbour/config/bin.cf +++ b/harbour/config/bin.cf @@ -31,7 +31,7 @@ ALL_OBJS = $(ALL_C_OBJS) $(ALL_PRG_OBJS) first:: dirbase descend descend:: dirbase - +@$(MK) -C $(ARCH_DIR) -f $(GRANDP)Makefile TOP=$(GRANDP) $(EXE_NAME) $(MK_USR) + +@$(MK) -C $(ARCH_DIR) -f $(GRANDP)Makefile TOP=$(GRANDP) $(EXE_NAME) $(HB_USER_MAKEFLAGS) $(EXE_NAME) : $(ALL_OBJS) $(LD_RULE) diff --git a/harbour/config/bsd/gcc.cf b/harbour/config/bsd/gcc.cf index c3b61f55e5..8d768f45c1 100644 --- a/harbour/config/bsd/gcc.cf +++ b/harbour/config/bsd/gcc.cf @@ -73,11 +73,11 @@ LINKPATHS += -L/usr/local/lib endif -ifneq ($(findstring -DHB_PCRE_REGEX, $(C_USR)),) +ifneq ($(findstring -DHB_PCRE_REGEX, $(HB_USER_CFLAGS)),) LINKLIBS += -lpcre endif -ifneq ($(findstring -DHB_EXT_ZLIB, $(C_USR)),) +ifneq ($(findstring -DHB_EXT_ZLIB, $(HB_USER_CFLAGS)),) LINKLIBS += -lz endif @@ -86,7 +86,7 @@ LINKLIBS += -lm -Wl,--end-group LDFLAGS += $(LINKPATHS) AR = ar -ARFLAGS = $(A_USR) +ARFLAGS = $(HB_USER_AFLAGS) AR_RULE = $(AR) $(ARFLAGS) r $(LIB_DIR)/$@ $(^F) || $(RM) $(LIB_DIR)/$@ include $(TOP)$(ROOT)config/rules.cf diff --git a/harbour/config/darwin/gcc.cf b/harbour/config/darwin/gcc.cf index 5dc90dbe7b..0b3f3abd80 100644 --- a/harbour/config/darwin/gcc.cf +++ b/harbour/config/darwin/gcc.cf @@ -92,24 +92,24 @@ endif endif -ifneq ($(findstring -DHB_PCRE_REGEX, $(C_USR)),) +ifneq ($(findstring -DHB_PCRE_REGEX, $(HB_USER_CFLAGS)),) LINKLIBS += -lpcre endif -ifneq ($(findstring -DHB_EXT_ZLIB, $(C_USR)),) +ifneq ($(findstring -DHB_EXT_ZLIB, $(HB_USER_CFLAGS)),) LINKLIBS += -lz endif LINKLIBS += -lm LDFLAGS = $(LINKPATHS) -LD_RULE = $(LD) $(CFLAGS) $(LD_OUT) $@ $(^F) $(LDFLAGS) $(L_USR) $(LINKLIBS) $(LINKLIBS) +LD_RULE = $(LD) $(CFLAGS) $(LD_OUT) $@ $(^F) $(LDFLAGS) $(HB_USER_LDFLAGS) $(LINKLIBS) $(LINKLIBS) #AR = ar -#ARFLAGS = $(A_USR) +#ARFLAGS = $(HB_USER_AFLAGS) #AR_RULE = $(AR) $(ARFLAGS) r $@ $(^F) || $(RM) $@ LIBTOOL = libtool -LIBTOOLFLAGS = $(LIBTOOL_USR) +LIBTOOLFLAGS = $(LIBTOOHB_USER_LDFLAGS) AR_RULE = $(LIBTOOL) -static $(LIBTOOLFLAGS) -o $(LIB_DIR)/$@ $(^F) || ( $(RM) $(LIB_DIR)/$@ && false ) RANLIB = ranlib diff --git a/harbour/config/dos/bcc16.cf b/harbour/config/dos/bcc16.cf index 9683204873..1bb1ac91e1 100644 --- a/harbour/config/dos/bcc16.cf +++ b/harbour/config/dos/bcc16.cf @@ -28,7 +28,7 @@ CPPFLAGS = -I$($(HB_ARCHITECTURE)_$(HB_COMPILER)_GRANDP) -I$(_HB_INC_COMPILE) CFLAGS = -i48 -O2 -mh -d -DHB_LONG_LONG_OFF # BCC (at least version 3.1) requires that the output file be listed ahead of the input file -CC_RULE = $(CC) $(CPPFLAGS) $(CFLAGS) $(C_USR) $(CC_OUT)$(> __link__.tmp endef define link_exe_file -echo. $(LDFLAGS) $(L_USR) $(LD_OUT)$@ > __link__.tmp +echo. $(LDFLAGS) $(HB_USER_LDFLAGS) $(LD_OUT)$@ > __link__.tmp $(foreach file, $(^F), $(link_file)) $(foreach file, $(LINKPATHS), $(link_file)) echo. -Wl,--start-group >> __link__.tmp @@ -73,7 +73,7 @@ echo. $(LDLIBS) >> __link__.tmp endef AR = ar -ARFLAGS = $(A_USR) +ARFLAGS = $(HB_USER_AFLAGS) AR_RULE = $(create_library) LD_RULE = $(link_exe_file) diff --git a/harbour/config/dos/owatcom.cf b/harbour/config/dos/owatcom.cf index 3f90291ecd..6f99c7f583 100644 --- a/harbour/config/dos/owatcom.cf +++ b/harbour/config/dos/owatcom.cf @@ -111,7 +111,7 @@ endef AR = wlib -ARFLAGS = -p=64 -c -n $(A_USR) +ARFLAGS = -p=64 -c -n $(HB_USER_AFLAGS) AR_RULE = $(create_library) include $(TOP)$(ROOT)config/rules.cf diff --git a/harbour/config/dos/rsx32.cf b/harbour/config/dos/rsx32.cf index a21dad3c16..3caf663d9f 100644 --- a/harbour/config/dos/rsx32.cf +++ b/harbour/config/dos/rsx32.cf @@ -53,7 +53,7 @@ endif LDFLAGS += $(LINKPATHS) AR = ar -ARFLAGS = $(A_USR) +ARFLAGS = $(HB_USER_AFLAGS) AR_RULE = $(AR) $(ARFLAGS) r $(LIB_DIR)/$@ $(^F) || ( $(RM) $(LIB_DIR)/$@ && false ) include $(TOP)$(ROOT)config/rules.cf diff --git a/harbour/config/hpux/gcc.cf b/harbour/config/hpux/gcc.cf index 9b81a6cc44..c6f747b8ed 100644 --- a/harbour/config/hpux/gcc.cf +++ b/harbour/config/hpux/gcc.cf @@ -70,11 +70,11 @@ endif endif -ifneq ($(findstring -DHB_PCRE_REGEX, $(C_USR)),) +ifneq ($(findstring -DHB_PCRE_REGEX, $(HB_USER_CFLAGS)),) LINKLIBS += -lpcre endif -ifneq ($(findstring -DHB_EXT_ZLIB, $(C_USR)),) +ifneq ($(findstring -DHB_EXT_ZLIB, $(HB_USER_CFLAGS)),) LINKLIBS += -lz endif @@ -83,7 +83,7 @@ LINKLIBS += -lm -lrt LDFLAGS += $(LINKPATHS) AR = ar -ARFLAGS = $(A_USR) +ARFLAGS = $(HB_USER_AFLAGS) AR_RULE = $(AR) $(ARFLAGS) cr $(LIB_DIR)/$@ $(^F) || ( $(RM) $(LIB_DIR)/$@ && false ) include $(TOP)$(ROOT)config/rules.cf diff --git a/harbour/config/lib.cf b/harbour/config/lib.cf index 1bbf7613c0..af1064a4d2 100644 --- a/harbour/config/lib.cf +++ b/harbour/config/lib.cf @@ -23,7 +23,7 @@ ALL_OBJS = $(ALL_C_OBJS) $(ALL_PRG_OBJS) first:: dirbase descend descend:: dirbase - +@$(MK) -C $(ARCH_DIR) -f $(GRANDP)Makefile TOP=$(GRANDP) $(LIB_NAME) $(MK_USR) + +@$(MK) -C $(ARCH_DIR) -f $(GRANDP)Makefile TOP=$(GRANDP) $(LIB_NAME) $(HB_USER_MAKEFLAGS) vpath $(LIB_NAME) $(LIB_DIR) $(LIB_NAME) : $(ALL_OBJS) diff --git a/harbour/config/linux/gcc.cf b/harbour/config/linux/gcc.cf index ba9fd1f07d..473f52567b 100644 --- a/harbour/config/linux/gcc.cf +++ b/harbour/config/linux/gcc.cf @@ -76,11 +76,11 @@ endif endif -ifneq ($(findstring -DHB_PCRE_REGEX, $(C_USR)),) +ifneq ($(findstring -DHB_PCRE_REGEX, $(HB_USER_CFLAGS)),) LINKLIBS += -lpcre endif -ifneq ($(findstring -DHB_EXT_ZLIB, $(C_USR)),) +ifneq ($(findstring -DHB_EXT_ZLIB, $(HB_USER_CFLAGS)),) LINKLIBS += -lz endif @@ -89,7 +89,7 @@ LINKLIBS += -lm -lrt -ldl -Wl,--end-group LDFLAGS = $(LINKPATHS) AR = ar -ARFLAGS = $(A_USR) +ARFLAGS = $(HB_USER_AFLAGS) AR_RULE = $(AR) $(ARFLAGS) cr $(LIB_DIR)/$@ $(^F) && $(RANLIB) $(LIB_DIR)/$@ || ( $(RM) $(LIB_DIR)/$@ && false ) include $(TOP)$(ROOT)config/rules.cf diff --git a/harbour/config/linux/owatcom.cf b/harbour/config/linux/owatcom.cf index aa4ac546d6..fbc08c1810 100644 --- a/harbour/config/linux/owatcom.cf +++ b/harbour/config/linux/owatcom.cf @@ -70,8 +70,8 @@ ifneq ($(LDLIBS),) endif AR = wlib -# ARFLAGS = -c -n -fa $(A_USR) -ARFLAGS = -c -n $(A_USR) +# ARFLAGS = -c -n -fa $(HB_USER_AFLAGS) +ARFLAGS = -c -n $(HB_USER_AFLAGS) AR_RULE = $(AR) $(ARFLAGS) $(LIB_DIR)/$@ $(foreach file, $(^F), -+$(file)) include $(TOP)$(ROOT)config/rules.cf diff --git a/harbour/config/os2/gcc.cf b/harbour/config/os2/gcc.cf index 386aee3fbc..37dabb0edb 100644 --- a/harbour/config/os2/gcc.cf +++ b/harbour/config/os2/gcc.cf @@ -68,7 +68,7 @@ LDFLAGS += $(LINKPATHS) ifeq ($(C_MAIN),) ifeq ($(HB_GT_LIB),os2pm) # Override the default link rule in order to add a call to emxbind -LD_RULE = $(LD) $(CFLAGS) $(LD_OUT)$@ $(^F) $(LDFLAGS) $(L_USR) $(LINKLIBS) & emxbind -ep $@ +LD_RULE = $(LD) $(CFLAGS) $(LD_OUT)$@ $(^F) $(LDFLAGS) $(HB_USER_LDFLAGS) $(LINKLIBS) & emxbind -ep $@ endif endif @@ -93,7 +93,7 @@ endef # Under OS/2 || isn't a command separator (inside a shell, that is); correct separator is & AR = ar -ARFLAGS = $(A_USR) +ARFLAGS = $(HB_USER_AFLAGS) AR_RULE = $(create_library) & $(RM) __lib__.tmp include $(TOP)$(ROOT)config/rules.cf diff --git a/harbour/config/os2/icc.cf b/harbour/config/os2/icc.cf index df2feefb7b..c2dd8f4e71 100644 --- a/harbour/config/os2/icc.cf +++ b/harbour/config/os2/icc.cf @@ -70,7 +70,7 @@ LINKLIBS += $(HB_SCREEN_LIB) endif AR = ilib -ARFLAGS = /NOE /NOIgnoreCase $(A_USR) +ARFLAGS = /NOE /NOIgnoreCase $(HB_USER_AFLAGS) AROBJS = $(foreach file, $(^F), -+$(file)) AR_RULE = $(AR) $(ARFLAGS) $(LIB_DIR)/$@ $(AROBJS),, diff --git a/harbour/config/rules.cf b/harbour/config/rules.cf index 5bbcd4b0cc..bfe35186b0 100644 --- a/harbour/config/rules.cf +++ b/harbour/config/rules.cf @@ -28,19 +28,19 @@ HB_FLAGS := -n -i$(HB_INC_COMPILE) -q0 -w3 -es2 -gc$(HB_GCMODE) -km -l # The rule to link an executable. ifeq ($(LD_RULE),) # Use default rule if architecture/compiler specific rule is not defined -LD_RULE = $(LD) $(CFLAGS) $(LD_OUT)$@ $(^F) $(LDFLAGS) $(L_USR) $(LINKLIBS) +LD_RULE = $(LD) $(CFLAGS) $(LD_OUT)$@ $(^F) $(LDFLAGS) $(HB_USER_LDFLAGS) $(LINKLIBS) endif # The rule to compile a C source file. ifeq ($(CC_RULE),) # Use default rule if architecture/compiler specific rule is not defined -CC_RULE = $(CC) $(CPPFLAGS) $(CFLAGS) $(C_USR) $(CC_IN) $< $(CC_OUT)$(> __link__.tmp $(foreach file, $(SYSLIBS), $(link_file)) echo. ) >> __link__.tmp --$(LD) $(LDFLAGS) $(L_USR) $(LD_OUT)$@ __link__.tmp +-$(LD) $(LDFLAGS) $(HB_USER_LDFLAGS) $(LD_OUT)$@ __link__.tmp endef AR = $(CCPREFIX)ar -ARFLAGS = $(A_USR) +ARFLAGS = $(HB_USER_AFLAGS) RANLIB = $(CCPREFIX)ranlib diff --git a/harbour/config/win/mingwce.cf b/harbour/config/win/mingwce.cf index 5ccc474349..d5e69a093c 100644 --- a/harbour/config/win/mingwce.cf +++ b/harbour/config/win/mingwce.cf @@ -113,18 +113,18 @@ $(foreach file, $(subst -L,,$(LINKPATHS)), $(search_dir)) echo. GROUP( >> __link__.tmp $(foreach file, $(SYSLIBS), $(link_file)) echo. ) >> __link__.tmp --$(LD) $(LDFLAGS) $(L_USR) $(LD_OUT)$@ __link__.tmp +-$(LD) $(LDFLAGS) $(HB_USER_LDFLAGS) $(LD_OUT)$@ __link__.tmp endef LDFLAGS = AR = $(CCPREFIX)ar -ARFLAGS = $(A_USR) +ARFLAGS = $(HB_USER_AFLAGS) RANLIB = $(CCPREFIX)ranlib AR = $(CCPREFIX)ar -ARFLAGS = $(A_USR) +ARFLAGS = $(HB_USER_AFLAGS) ifeq ($(SHLVL),) # COMMAND.COM - length of command line is limited ifneq ($(OS),Windows_NT) diff --git a/harbour/config/win/msvc.cf b/harbour/config/win/msvc.cf index 69462473b0..78f86bfee7 100644 --- a/harbour/config/win/msvc.cf +++ b/harbour/config/win/msvc.cf @@ -46,7 +46,7 @@ endif LDFLAGS = $(LINKPATHS) AR = lib.exe -ARFLAGS = $(A_USR) +ARFLAGS = $(HB_USER_AFLAGS) AR_RULE = $(AR) $(ARFLAGS) /out:$(LIB_DIR)/$@ $(^F) || $(RM) $(LIB_DIR)/$@ include $(TOP)$(ROOT)config/rules.cf diff --git a/harbour/config/win/msvcce.cf b/harbour/config/win/msvcce.cf index 4c0a5d7c51..a454f2eae3 100644 --- a/harbour/config/win/msvcce.cf +++ b/harbour/config/win/msvcce.cf @@ -51,7 +51,7 @@ endif LDFLAGS = $(LINKPATHS) AR = lib.exe -ARFLAGS = $(A_USR) +ARFLAGS = $(HB_USER_AFLAGS) AR_RULE = $(AR) $(ARFLAGS) /out:$(LIB_DIR)/$@ $(^F) || $(RM) $(LIB_DIR)/$@ include $(TOP)$(ROOT)config/rules.cf diff --git a/harbour/config/win/owatcom.cf b/harbour/config/win/owatcom.cf index ca57246096..823bd0ca4a 100644 --- a/harbour/config/win/owatcom.cf +++ b/harbour/config/win/owatcom.cf @@ -86,7 +86,7 @@ ifeq ($(findstring rtl,$(LIBS)),rtl) endif endif -LD_RULE = $(link_exe_file) $(L_USR) +LD_RULE = $(link_exe_file) $(HB_USER_LDFLAGS) #Note: The empty line below HAVE TO exist! define lib_object @@ -101,7 +101,7 @@ $(AR) $(ARFLAGS) @__lib__.tmp endef AR = wlib -ARFLAGS = -p=64 -c -n $(A_USR) +ARFLAGS = -p=64 -c -n $(HB_USER_AFLAGS) AR_RULE = $(create_library) include $(TOP)$(ROOT)config/rules.cf diff --git a/harbour/config/win/pocc.cf b/harbour/config/win/pocc.cf index 3be516f168..ff8704815b 100644 --- a/harbour/config/win/pocc.cf +++ b/harbour/config/win/pocc.cf @@ -58,7 +58,7 @@ LDFLAGS += /SUBSYSTEM:WINDOWS endif AR = polib.exe -ARFLAGS = $(A_USR) +ARFLAGS = $(HB_USER_AFLAGS) AR_RULE = $(AR) $(ARFLAGS) /out:$(LIB_DIR)/$@ $(^F) include $(TOP)$(ROOT)config/rules.cf diff --git a/harbour/config/win/pocc64.cf b/harbour/config/win/pocc64.cf index 2ab6467e1e..5421e04f4f 100644 --- a/harbour/config/win/pocc64.cf +++ b/harbour/config/win/pocc64.cf @@ -58,7 +58,7 @@ LDFLAGS += /SUBSYSTEM:WINDOWS endif AR = polib.exe -ARFLAGS = $(A_USR) +ARFLAGS = $(HB_USER_AFLAGS) AR_RULE = $(AR) $(ARFLAGS) /out:$(LIB_DIR)/$@ $(^F) include $(TOP)$(ROOT)config/rules.cf diff --git a/harbour/config/win/poccce.cf b/harbour/config/win/poccce.cf index 8f87d3275e..59be6fbae5 100644 --- a/harbour/config/win/poccce.cf +++ b/harbour/config/win/poccce.cf @@ -63,7 +63,7 @@ LDFLAGS += /SUBSYSTEM:WINDOWS endif AR = polib.exe -ARFLAGS = $(A_USR) +ARFLAGS = $(HB_USER_AFLAGS) AR_RULE = $(AR) $(ARFLAGS) /out:$(LIB_DIR)/$@ $(^F) include $(TOP)$(ROOT)config/rules.cf diff --git a/harbour/config/win/rsxnt.cf b/harbour/config/win/rsxnt.cf index 36c4957dd2..e1264204c4 100644 --- a/harbour/config/win/rsxnt.cf +++ b/harbour/config/win/rsxnt.cf @@ -74,7 +74,7 @@ endif LDFLAGS += $(LINKPATHS) AR = ar -ARFLAGS = $(A_USR) +ARFLAGS = $(HB_USER_AFLAGS) AR_RULE = $(AR) $(ARFLAGS) r $(LIB_DIR)/$@ $(^F) || $(RM) $(LIB_DIR)/$@ include $(TOP)$(ROOT)config/rules.cf diff --git a/harbour/config/win/xcc.cf b/harbour/config/win/xcc.cf index 8a1874f4f4..db0ef9b3c6 100644 --- a/harbour/config/win/xcc.cf +++ b/harbour/config/win/xcc.cf @@ -58,7 +58,7 @@ LDFLAGS += /SUBSYSTEM:WINDOWS endif AR = xlib.exe -ARFLAGS = $(A_USR) +ARFLAGS = $(HB_USER_AFLAGS) AR_RULE = $(AR) $(ARFLAGS) /out:$(LIB_DIR)/$@ $(^F) include $(TOP)$(ROOT)config/rules.cf diff --git a/harbour/contrib/gtalleg/Makefile b/harbour/contrib/gtalleg/Makefile index ce8404334c..f6be3865c9 100644 --- a/harbour/contrib/gtalleg/Makefile +++ b/harbour/contrib/gtalleg/Makefile @@ -21,7 +21,7 @@ HB_INC_ALLEGRO_OK += $(foreach d, $(HB_INC_ALLEGRO), $(if $(wildcard $(d)/allegr ifneq ($(strip $(HB_INC_ALLEGRO_OK)),) -C_USR += $(foreach d, $(HB_INC_ALLEGRO_OK), -I$(d)) +HB_USER_CFLAGS += $(foreach d, $(HB_INC_ALLEGRO_OK), -I$(d)) C_SOURCES=\ gtalleg.c \ diff --git a/harbour/contrib/hbapollo/Makefile b/harbour/contrib/hbapollo/Makefile index 8e803f5f56..d236e47888 100644 --- a/harbour/contrib/hbapollo/Makefile +++ b/harbour/contrib/hbapollo/Makefile @@ -12,7 +12,7 @@ HB_INC_APOLLO_OK += $(foreach d, $(HB_INC_APOLLO), $(if $(wildcard $(d)/Sde61.h) ifneq ($(strip $(HB_INC_APOLLO_OK)),) -C_USR += $(foreach d, $(HB_INC_APOLLO_OK), -I$(d)) +HB_USER_CFLAGS += $(foreach d, $(HB_INC_APOLLO_OK), -I$(d)) C_SOURCES=\ apollo.c \ diff --git a/harbour/contrib/hbcurl/Makefile b/harbour/contrib/hbcurl/Makefile index ba1f8b6738..ade2736b63 100644 --- a/harbour/contrib/hbcurl/Makefile +++ b/harbour/contrib/hbcurl/Makefile @@ -22,7 +22,7 @@ endif ifneq ($(strip $(HB_INC_CURL_OK)),) -C_USR += $(foreach d, $(HB_INC_CURL_OK), -I$(d)) +HB_USER_CFLAGS += $(foreach d, $(HB_INC_CURL_OK), -I$(d)) C_SOURCES=\ hbcurl.c \ diff --git a/harbour/contrib/hbfbird/Makefile b/harbour/contrib/hbfbird/Makefile index d3ab0d0d1c..8977c463fc 100644 --- a/harbour/contrib/hbfbird/Makefile +++ b/harbour/contrib/hbfbird/Makefile @@ -16,7 +16,7 @@ HB_INC_FIREBIRD_OK += $(foreach d, $(HB_INC_FIREBIRD), $(if $(wildcard $(d)/ibas ifneq ($(strip $(HB_INC_FIREBIRD_OK)),) -C_USR += $(foreach d, $(HB_INC_FIREBIRD_OK), -I$(d)) +HB_USER_CFLAGS += $(foreach d, $(HB_INC_FIREBIRD_OK), -I$(d)) C_SOURCES=\ firebird.c \ diff --git a/harbour/contrib/hbfimage/Makefile b/harbour/contrib/hbfimage/Makefile index f38caa91d0..1b00256c60 100644 --- a/harbour/contrib/hbfimage/Makefile +++ b/harbour/contrib/hbfimage/Makefile @@ -21,7 +21,7 @@ endif ifneq ($(strip $(HB_INC_FREEIMAGE_OK)),) -C_USR += $(foreach d, $(HB_INC_FREEIMAGE_OK), -I$(d)) +HB_USER_CFLAGS += $(foreach d, $(HB_INC_FREEIMAGE_OK), -I$(d)) C_SOURCES = \ fi_winfu.c \ diff --git a/harbour/contrib/hbgd/Makefile b/harbour/contrib/hbgd/Makefile index f1563296c4..db761815ca 100644 --- a/harbour/contrib/hbgd/Makefile +++ b/harbour/contrib/hbgd/Makefile @@ -16,7 +16,7 @@ HB_INC_GD_OK += $(foreach d, $(HB_INC_GD), $(if $(wildcard $(d)/gd.h),$(d),)) ifneq ($(strip $(HB_INC_GD_OK)),) -C_USR += $(foreach d, $(HB_INC_GD_OK), -I$(d)) +HB_USER_CFLAGS += $(foreach d, $(HB_INC_GD_OK), -I$(d)) C_SOURCES=\ gdwrp.c \ diff --git a/harbour/contrib/hbgd/tests/hbmk_b32.bat b/harbour/contrib/hbgd/tests/hbmk_b32.bat index cd6e7357e6..4305e7f1d2 100644 --- a/harbour/contrib/hbgd/tests/hbmk_b32.bat +++ b/harbour/contrib/hbgd/tests/hbmk_b32.bat @@ -11,6 +11,6 @@ set HB_ARCHITECTURE=win set HB_COMPILER=bcc32 set HB_USER_LIBS=hbgd.lib bgd.lib hbct.lib rem ; uncomment if needed -rem set C_USR=-tW +rem set HB_GUI=yes call %HB_BIN_INSTALL%\hbmk.bat %1 %2 %3 %4 %5 %6 %7 %8 %9 diff --git a/harbour/contrib/hbgd/tests/hbmk_vc.bat b/harbour/contrib/hbgd/tests/hbmk_vc.bat index 3a55339277..571f5ac44f 100644 --- a/harbour/contrib/hbgd/tests/hbmk_vc.bat +++ b/harbour/contrib/hbgd/tests/hbmk_vc.bat @@ -10,5 +10,7 @@ if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=..\..\..\include set HB_ARCHITECTURE=win set HB_COMPILER=msvc set HB_USER_LIBS=hbgd.lib bgd.lib hbct.lib +rem ; uncomment if needed +rem set HB_GUI=yes call %HB_BIN_INSTALL%\hbmk.bat %1 %2 %3 %4 %5 %6 %7 %8 %9 diff --git a/harbour/contrib/hbgf/hbgfgtk/Makefile b/harbour/contrib/hbgf/hbgfgtk/Makefile index b0f07d9b2d..9f2a95850c 100644 --- a/harbour/contrib/hbgf/hbgfgtk/Makefile +++ b/harbour/contrib/hbgf/hbgfgtk/Makefile @@ -19,8 +19,8 @@ endif ifneq ($(strip $(HB_INC_GTK_OK)),) -C_USR += $(foreach d, $(HB_INC_GTK_OK), -I$(d)) -C_USR += `pkg-config --cflags gtk+-2.0` +HB_USER_CFLAGS += $(foreach d, $(HB_INC_GTK_OK), -I$(d)) +HB_USER_CFLAGS += `pkg-config --cflags gtk+-2.0` C_SOURCES=\ creawin.c \ diff --git a/harbour/contrib/hbhpdf/Makefile b/harbour/contrib/hbhpdf/Makefile index 458bb33992..d1d9db7f2b 100644 --- a/harbour/contrib/hbhpdf/Makefile +++ b/harbour/contrib/hbhpdf/Makefile @@ -18,7 +18,7 @@ HB_INC_LIBHARU_OK += $(foreach d, $(HB_INC_LIBHARU), $(if $(wildcard $(d)/hpdf.h ifneq ($(strip $(HB_INC_LIBHARU_OK)),) -C_USR += $(foreach d, $(HB_INC_LIBHARU_OK), -I$(d)) +HB_USER_CFLAGS += $(foreach d, $(HB_INC_LIBHARU_OK), -I$(d)) C_SOURCES=\ harupdf.c \ diff --git a/harbour/contrib/hbmysql/Makefile b/harbour/contrib/hbmysql/Makefile index 4597da3ac6..452a09e027 100644 --- a/harbour/contrib/hbmysql/Makefile +++ b/harbour/contrib/hbmysql/Makefile @@ -16,7 +16,7 @@ HB_INC_MYSQL_OK += $(foreach d, $(HB_INC_MYSQL), $(if $(wildcard $(d)/mysql.h),$ ifneq ($(strip $(HB_INC_MYSQL_OK)),) -C_USR += $(foreach d, $(HB_INC_MYSQL_OK), -I$(d)) +HB_USER_CFLAGS += $(foreach d, $(HB_INC_MYSQL_OK), -I$(d)) C_SOURCES=\ mysql.c \ diff --git a/harbour/contrib/hbodbc/Makefile b/harbour/contrib/hbodbc/Makefile index f412005e01..4a9aa767dc 100644 --- a/harbour/contrib/hbodbc/Makefile +++ b/harbour/contrib/hbodbc/Makefile @@ -22,7 +22,7 @@ endif HB_INC_ODBC_OK += $(foreach d, $(HB_INC_ODBC), $(if $(wildcard $(d)/sql.h),$(d),)) ifneq ($(strip $(HB_INC_ODBC_OK)),) -C_USR += $(foreach d, $(HB_INC_ODBC_OK), -I$(d)) +HB_USER_CFLAGS += $(foreach d, $(HB_INC_ODBC_OK), -I$(d)) else HB_WITHOUT_ODBC=yes endif diff --git a/harbour/contrib/hbpgsql/Makefile b/harbour/contrib/hbpgsql/Makefile index 6ec3500c2c..cc052ad894 100644 --- a/harbour/contrib/hbpgsql/Makefile +++ b/harbour/contrib/hbpgsql/Makefile @@ -16,7 +16,7 @@ HB_INC_PGSQL_OK += $(foreach d, $(HB_INC_PGSQL), $(if $(wildcard $(d)/libpq-fe.h ifneq ($(strip $(HB_INC_PGSQL_OK)),) -C_USR += $(foreach d, $(HB_INC_PGSQL_OK), -I$(d)) +HB_USER_CFLAGS += $(foreach d, $(HB_INC_PGSQL_OK), -I$(d)) C_SOURCES=\ postgres.c \ diff --git a/harbour/contrib/hbssl/Makefile b/harbour/contrib/hbssl/Makefile index c9372c4476..80814fc84d 100644 --- a/harbour/contrib/hbssl/Makefile +++ b/harbour/contrib/hbssl/Makefile @@ -22,7 +22,7 @@ endif ifneq ($(strip $(HB_INC_OPENSSL_OK)),) -C_USR += $(foreach d, $(HB_INC_OPENSSL_OK), -I$(d)) +HB_USER_CFLAGS += $(foreach d, $(HB_INC_OPENSSL_OK), -I$(d)) C_SOURCES=\ ssl.c \ diff --git a/harbour/contrib/hbtip/ChangeLog b/harbour/contrib/hbtip/ChangeLog index 9733458807..34fc8e5a90 100644 --- a/harbour/contrib/hbtip/ChangeLog +++ b/harbour/contrib/hbtip/ChangeLog @@ -201,7 +201,7 @@ 2004-05-04 16:45 UTC+0200 Maurilio Longo * Rules.make - + added C_USR=-DTCPV40HDRS to use 16/32 tcp/ip stack on OS/2 (standard on OS/2 until eComStation and v5.x) + + added HB_USER_CFLAGS=-DTCPV40HDRS to use 16/32 tcp/ip stack on OS/2 (standard on OS/2 until eComStation and v5.x) * ticlientpop.prg * changed the way a mail gets ::Retreived(), so much faster now. + Added Top(), Noop() and UIDL() methods diff --git a/harbour/contrib/hbwhat/Makefile b/harbour/contrib/hbwhat/Makefile index ba89062649..7d6cda574c 100644 --- a/harbour/contrib/hbwhat/Makefile +++ b/harbour/contrib/hbwhat/Makefile @@ -83,7 +83,7 @@ PRG_HEADERS= \ # This lib needs xhb headers to compile, and this is # the hack to help Harbour find them. -PRG_USR += -I../../../xhb +HB_USER_PRGFLAGS += -I../../../xhb include $(TOP)$(ROOT)config/header.cf INSTALL_RULE_HEADERS := $(INSTALL_RULE) diff --git a/harbour/contrib/hbwhat/tests/hbmk_b32.bat b/harbour/contrib/hbwhat/tests/hbmk_b32.bat index dd1bc2c8dc..e2be4d2942 100644 --- a/harbour/contrib/hbwhat/tests/hbmk_b32.bat +++ b/harbour/contrib/hbwhat/tests/hbmk_b32.bat @@ -10,6 +10,6 @@ if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=..\..\..\include set HB_ARCHITECTURE=win set HB_COMPILER=bcc32 set HB_USER_LIBS=hbwhat.lib gtwvg.lib xhb.lib -set C_USR=-tW +set HB_GUI=yes call %HB_BIN_INSTALL%\hbmk.bat %1 %2 %3 %4 %5 %6 %7 %8 %9 diff --git a/harbour/contrib/hbwhat/tests/hbmk_vc.bat b/harbour/contrib/hbwhat/tests/hbmk_vc.bat index 8a06329a56..0e055b2d78 100644 --- a/harbour/contrib/hbwhat/tests/hbmk_vc.bat +++ b/harbour/contrib/hbwhat/tests/hbmk_vc.bat @@ -10,5 +10,6 @@ if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=..\..\..\include set HB_ARCHITECTURE=win set HB_COMPILER=msvc set HB_USER_LIBS=hbwhat.lib gtwvg.lib xhb.lib comdlg32.lib comctl32.lib shell32.lib ole32.lib oleaut32.lib +set HB_GUI=yes call %HB_BIN_INSTALL%\hbmk.bat %1 %2 %3 %4 %5 %6 %7 %8 %9 diff --git a/harbour/contrib/mtpl_b32.bat b/harbour/contrib/mtpl_b32.bat index be9acc8834..3a1da9f596 100644 --- a/harbour/contrib/mtpl_b32.bat +++ b/harbour/contrib/mtpl_b32.bat @@ -12,7 +12,7 @@ rem this batch file from your customized one. [vszakats] rem rem Set any of the below settings to customize your build process: rem set HB_MAKE_PROGRAM= -rem set MK_USR= +rem set HB_USER_MAKEFLAGS= rem --------------------------------------------------------------- set _HB_CC_NAME=%HB_CC_NAME% @@ -37,14 +37,14 @@ if "%1" == "INSTALL" goto INSTALL :BUILD - %_HB_MAKE_PROGRAM% %MK_USR% -f %_HB_MAKEFILE% %1 %2 %3 > %_HB_MAKELOG% + %_HB_MAKE_PROGRAM% %HB_USER_MAKEFLAGS% -f %_HB_MAKEFILE% %1 %2 %3 > %_HB_MAKELOG% if errorlevel 1 set HB_EXIT_LEVEL=1 if errorlevel 1 if not "%HB_SHOW_ERRORS%" == "no" notepad %_HB_MAKELOG% goto EXIT :CLEAN - %_HB_MAKE_PROGRAM% %MK_USR% -f %_HB_MAKEFILE% CLEAN > %_HB_MAKELOG% + %_HB_MAKE_PROGRAM% %HB_USER_MAKEFLAGS% -f %_HB_MAKEFILE% CLEAN > %_HB_MAKELOG% if errorlevel 1 set HB_EXIT_LEVEL=1 if errorlevel 1 goto EXIT @@ -53,7 +53,7 @@ if "%1" == "INSTALL" goto INSTALL :INSTALL - %_HB_MAKE_PROGRAM% %MK_USR% -f %_HB_MAKEFILE% INSTALL > nul + %_HB_MAKE_PROGRAM% %HB_USER_MAKEFLAGS% -f %_HB_MAKEFILE% INSTALL > nul if errorlevel 1 set HB_EXIT_LEVEL=1 goto EXIT diff --git a/harbour/contrib/mtpl_b32.mak b/harbour/contrib/mtpl_b32.mak index 7fab2a11df..a39db4147d 100644 --- a/harbour/contrib/mtpl_b32.mak +++ b/harbour/contrib/mtpl_b32.mak @@ -14,8 +14,8 @@ # NOTE: You can use these optional envvars to configure the make process: # -# C_USR - Extra C compiler options for libraries -# PRG_USR - Extra Harbour compiler options +# HB_USER_CFLAGS - Extra C compiler options for libraries +# HB_USER_PRGFLAGS - Extra Harbour compiler options # .AUTODEPEND @@ -105,7 +105,7 @@ MKLIB = tlib.exe #********************************************************** -CFLAGS = -I$(INCLUDE_DIR) $(C_USR) $(CFLAGS) +CFLAGS = -I$(INCLUDE_DIR) $(HB_USER_CFLAGS) $(CFLAGS) #----------- !if "$(HB_BUILD_DEBUG)" == "yes" @@ -120,17 +120,17 @@ CFLAGS = -I$(INCLUDE_DIR) $(C_USR) $(CFLAGS) #********************************************************** CLIBFLAGS = -c -q -d -Q -w -w-sig- $(CFLAGS) $(CLIBFLAGS) -HARBOURFLAGS = -i$(INCLUDE_DIR) -n -q0 -w3 -es2 -km -l $(PRG_USR) $(HARBOURFLAGS) +HARBOURFLAGS = -i$(INCLUDE_DIR) -n -q0 -w3 -es2 -km -l $(HB_USER_PRGFLAGS) $(HARBOURFLAGS) !if "$(HB_BUILD_DEBUG)" == "yes" HARBOURFLAGS = $(HARBOURFLAGS) -l- !endif -LDFLAGS = $(LDFLAGS) $(L_USR) +LDFLAGS = $(LDFLAGS) $(HB_USER_LDFLAGS) #********************************************************** # This is needed, otherwise the libs may overflow when # debug info is requested with -v -y -ARFLAGS = /P64 $(A_USR) +ARFLAGS = /P64 $(HB_USER_AFLAGS) #********************************************************** # COMPILE Rules diff --git a/harbour/contrib/mtpl_gcc.mak b/harbour/contrib/mtpl_gcc.mak index c5f738d301..596dff12a9 100644 --- a/harbour/contrib/mtpl_gcc.mak +++ b/harbour/contrib/mtpl_gcc.mak @@ -14,8 +14,8 @@ # NOTE: You can use these optional envvars to configure the make process: # -# C_USR - Extra C compiler options for libraries -# PRG_USR - Extra Harbour compiler options +# HB_USER_CFLAGS - Extra C compiler options for libraries +# HB_USER_PRGFLAGS - Extra Harbour compiler options # #********************************************************** @@ -121,9 +121,9 @@ endif CFLAGS := -O3 $(CFLAGS) endif -CFLAGS := -W -Wall -I$(INCLUDE_DIR) $(C_USR) $(CFLAGS) +CFLAGS := -W -Wall -I$(INCLUDE_DIR) $(HB_USER_CFLAGS) $(CFLAGS) CLIBFLAGS := -c $(CFLAGS) $(CLIBFLAGS) -HARBOURFLAGS := -i$(INCLUDE_DIR) -n1 -q0 -w3 -es2 -km -l $(PRG_USR) $(HARBOURFLAGS) +HARBOURFLAGS := -i$(INCLUDE_DIR) -n1 -q0 -w3 -es2 -km -l $(HB_USER_PRGFLAGS) $(HARBOURFLAGS) ifeq ($(HB_BUILD_DEBUG),yes) HARBOURFLAGS := $(HARBOURFLAGS) -l- endif diff --git a/harbour/contrib/mtpl_gcc.sh b/harbour/contrib/mtpl_gcc.sh index 30b36896c8..afc594620c 100755 --- a/harbour/contrib/mtpl_gcc.sh +++ b/harbour/contrib/mtpl_gcc.sh @@ -21,7 +21,7 @@ # # export any of the below settings to customize your build process: # export HB_MAKE_PROGRAM= -# export MK_USR= +# export HB_USER_MAKEFLAGS= # --------------------------------------------------------------- if [ -z "$HB_ARCHITECTURE" ]; then @@ -63,7 +63,7 @@ export HB_EXIT_LEVEL= [ -z "$CC" ] && export CC="gcc" [ -z "$LD" ] && export LD="gcc" -${_HB_MAKE_PROGRAM} ${MK_USR} -f ${_HB_MAKEFILE} $1 $2 $3 || export HB_EXIT_LEVEL=1 +${_HB_MAKE_PROGRAM} ${HB_USER_MAKEFLAGS} -f ${_HB_MAKEFILE} $1 $2 $3 || export HB_EXIT_LEVEL=1 # --------------------------------------------------------------- diff --git a/harbour/contrib/mtpl_vc.bat b/harbour/contrib/mtpl_vc.bat index a17e8b8e80..93eb4fda7c 100644 --- a/harbour/contrib/mtpl_vc.bat +++ b/harbour/contrib/mtpl_vc.bat @@ -12,7 +12,7 @@ rem this batch file from your customized one. [vszakats] rem rem Set any of the below settings to customize your build process: rem set HB_MAKE_PROGRAM= -rem set MK_USR= +rem set HB_USER_MAKEFLAGS= rem --------------------------------------------------------------- set _HB_CC_NAME=%HB_CC_NAME% @@ -37,14 +37,14 @@ if "%1" == "INSTALL" goto INSTALL :BUILD - %_HB_MAKE_PROGRAM% %MK_USR% -nologo -f %_HB_MAKEFILE% %1 %2 %3 > %_HB_MAKELOG% + %_HB_MAKE_PROGRAM% %HB_USER_MAKEFLAGS% -nologo -f %_HB_MAKEFILE% %1 %2 %3 > %_HB_MAKELOG% if errorlevel 1 set HB_EXIT_LEVEL=1 if errorlevel 1 if not "%HB_SHOW_ERRORS%" == "no" notepad %_HB_MAKELOG% goto EXIT :CLEAN - %_HB_MAKE_PROGRAM% %MK_USR% -nologo -f %_HB_MAKEFILE% CLEAN > %_HB_MAKELOG% + %_HB_MAKE_PROGRAM% %HB_USER_MAKEFLAGS% -nologo -f %_HB_MAKEFILE% CLEAN > %_HB_MAKELOG% if errorlevel 1 set HB_EXIT_LEVEL=1 if errorlevel 1 goto EXIT @@ -53,7 +53,7 @@ if "%1" == "INSTALL" goto INSTALL :INSTALL - %_HB_MAKE_PROGRAM% %MK_USR% -nologo -f %_HB_MAKEFILE% INSTALL > nul + %_HB_MAKE_PROGRAM% %HB_USER_MAKEFLAGS% -nologo -f %_HB_MAKEFILE% INSTALL > nul if errorlevel 1 set HB_EXIT_LEVEL=1 goto EXIT diff --git a/harbour/contrib/mtpl_vc.mak b/harbour/contrib/mtpl_vc.mak index 197dddd2cf..2a4ad8121a 100644 --- a/harbour/contrib/mtpl_vc.mak +++ b/harbour/contrib/mtpl_vc.mak @@ -14,8 +14,8 @@ # NOTE: You can use these optional envvars to configure the make process: # -# C_USR - Extra C compiler options for libraries -# PRG_USR - Extra Harbour compiler options +# HB_USER_CFLAGS - Extra C compiler options for libraries +# HB_USER_PRGFLAGS - Extra Harbour compiler options # #********************************************************** @@ -107,7 +107,7 @@ MKLIB = lib.exe HB_VISUALC_VER = 80 !endif -ARFLAGS = /nologo $(A_USR) +ARFLAGS = /nologo $(HB_USER_AFLAGS) # C Compiler Flags !if "$(HB_BUILD_OPTIM)" != "no" @@ -120,7 +120,7 @@ CFLAGS_VER = -Ogt2yb1p -GX- -G6 -YX #----------- CFLAGS = -nologo -W4 -wd4127 -Gs -I$(INCLUDE_DIR) $(CFLAGS_VER) \ - $(C_USR) $(CFLAGS) + $(HB_USER_CFLAGS) $(CFLAGS) #----------- !if "$(HB_BUILD_DEBUG)" == "yes" @@ -131,11 +131,11 @@ CFLAGS = -Zi $(CFLAGS) #********************************************************** CLIBFLAGS = -c $(CFLAGS) $(CLIBFLAGS) -HARBOURFLAGS = -i$(INCLUDE_DIR) -n -q0 -w3 -es2 -km -l $(PRG_USR) $(HARBOURFLAGS) +HARBOURFLAGS = -i$(INCLUDE_DIR) -n -q0 -w3 -es2 -km -l $(HB_USER_PRGFLAGS) $(HARBOURFLAGS) !if "$(HB_BUILD_DEBUG)" == "yes" HARBOURFLAGS = $(HARBOURFLAGS) -l- !endif -LDFLAGS = $(LDFLAGS) $(L_USR) +LDFLAGS = $(LDFLAGS) $(HB_USER_LDFLAGS) #********************************************************** # COMPILE Rules diff --git a/harbour/contrib/rddads/Makefile b/harbour/contrib/rddads/Makefile index 271f932bb9..37c43996e7 100644 --- a/harbour/contrib/rddads/Makefile +++ b/harbour/contrib/rddads/Makefile @@ -16,7 +16,7 @@ HB_INC_ADS_OK += $(foreach d, $(HB_INC_ADS), $(if $(wildcard $(d)/ace.h),$(d),)) ifneq ($(strip $(HB_INC_ADS_OK)),) -C_USR += $(foreach d, $(HB_INC_ADS_OK), -I$(d)) +HB_USER_CFLAGS += $(foreach d, $(HB_INC_ADS_OK), -I$(d)) C_SOURCES=\ ads1.c \ diff --git a/harbour/contrib/rddsql/sddfb/Makefile b/harbour/contrib/rddsql/sddfb/Makefile index 8b73cdf61f..9332e73aa9 100644 --- a/harbour/contrib/rddsql/sddfb/Makefile +++ b/harbour/contrib/rddsql/sddfb/Makefile @@ -16,7 +16,7 @@ HB_INC_FIREBIRD_OK += $(foreach d, $(HB_INC_FIREBIRD), $(if $(wildcard $(d)/ibas ifneq ($(strip $(HB_INC_FIREBIRD_OK)),) -C_USR += $(foreach d, $(HB_INC_FIREBIRD_OK), -I$(d)) +HB_USER_CFLAGS += $(foreach d, $(HB_INC_FIREBIRD_OK), -I$(d)) C_SOURCES=\ fbirddd.c \ diff --git a/harbour/contrib/rddsql/sddmy/Makefile b/harbour/contrib/rddsql/sddmy/Makefile index 87791bbbed..8b5d1b5826 100644 --- a/harbour/contrib/rddsql/sddmy/Makefile +++ b/harbour/contrib/rddsql/sddmy/Makefile @@ -16,7 +16,7 @@ HB_INC_MYSQL_OK += $(foreach d, $(HB_INC_MYSQL), $(if $(wildcard $(d)/mysql.h),$ ifneq ($(strip $(HB_INC_MYSQL_OK)),) -C_USR += $(foreach d, $(HB_INC_MYSQL_OK), -I$(d)) +HB_USER_CFLAGS += $(foreach d, $(HB_INC_MYSQL_OK), -I$(d)) C_SOURCES=\ mysqldd.c \ diff --git a/harbour/contrib/rddsql/sddpg/Makefile b/harbour/contrib/rddsql/sddpg/Makefile index 54b8784669..f62c6c1d42 100644 --- a/harbour/contrib/rddsql/sddpg/Makefile +++ b/harbour/contrib/rddsql/sddpg/Makefile @@ -16,7 +16,7 @@ HB_INC_PGSQL_OK += $(foreach d, $(HB_INC_PGSQL), $(if $(wildcard $(d)/libpq-fe.h ifneq ($(strip $(HB_INC_PGSQL_OK)),) -C_USR += $(foreach d, $(HB_INC_PGSQL_OK), -I$(d)) +HB_USER_CFLAGS += $(foreach d, $(HB_INC_PGSQL_OK), -I$(d)) C_SOURCES=\ pgsqldd.c \ diff --git a/harbour/doc/es/tracing.txt b/harbour/doc/es/tracing.txt index 4ffd5b8d8f..67f92da56b 100644 --- a/harbour/doc/es/tracing.txt +++ b/harbour/doc/es/tracing.txt @@ -101,9 +101,9 @@ HB_TR_WARNING HB_TR_INFO Todas las llamadaa con niveles HB_INFO y compilado con un menor nivel de rastreo. Por ejemplo, Yo compilo Harbour en WinNT con gcc (MINGW32), asĄ -usualmente establezco la variable de entorno C_USR a algo asĄ: +usualmente establezco la variable de entorno HB_USER_CFLAGS a algo asĄ: - export C_USR="-DHARBOUR_USE_WIN_GTAPI -DHB_TR_LEVEL=HB_TR_INFO" + export HB_USER_CFLAGS="-DHARBOUR_USE_WIN_GTAPI -DHB_TR_LEVEL=HB_TR_INFO" y me aseguro que tengo todo el seguimiento para los niveles INFO, WARNING, ERROR, FATAL y ALWAYS. Si obtengo demasiada informaci˘n, diff --git a/harbour/doc/gmake.txt b/harbour/doc/gmake.txt index 3ab566fa07..58ad4f3508 100644 --- a/harbour/doc/gmake.txt +++ b/harbour/doc/gmake.txt @@ -143,8 +143,8 @@ For gcc on Win95/WinNT with the Cygwin library: HB_COMPILER gcc HB_GT_LIB gtwin CYGWIN noglob - C_USR -mwin32 - L_USR -mwin32 + HB_USER_CFLAGS -mwin32 + HB_USER_LDFLAGS -mwin32 For gcc on Win95/WinNT with the MinGW library: HB_ARCHITECTURE win diff --git a/harbour/doc/tracing.txt b/harbour/doc/tracing.txt index eddf8dc7eb..50a20c989f 100644 --- a/harbour/doc/tracing.txt +++ b/harbour/doc/tracing.txt @@ -91,13 +91,13 @@ HB_TR_LEVEL_WARNING they have no performance effect; only a lower tracing level. For example, I compile Harbour on WinNT with gcc (MINGW32), so I -usually set the C_USR environment variable like this: +usually set the HB_USER_CFLAGS environment variable like this: - export C_USR='-DHARBOUR_USE_WIN_GTAPI -DHB_TR_LEVEL=HB_TR_INFO' + export HB_USER_CFLAGS='-DHARBOUR_USE_WIN_GTAPI -DHB_TR_LEVEL=HB_TR_INFO' or for other OS (eg: DOS, WIN9x) - SET C_USR=-DHARBOUR_USR_WIN_GTAPI -DHB_TR_LEVEL_INFO + SET HB_USER_CFLAGS=-DHARBOUR_USR_WIN_GTAPI -DHB_TR_LEVEL_INFO and make sure I have all the tracing for the INFO, WARNING, ERROR, FATAL and ALWAYS levels. If I get too much information, at run-time I diff --git a/harbour/harbour-wce-spec b/harbour/harbour-wce-spec index ec4191a67e..ac0c482786 100644 --- a/harbour/harbour-wce-spec +++ b/harbour/harbour-wce-spec @@ -89,7 +89,7 @@ rm -fR $RPM_BUILD_ROOT export HB_HOST_BUILD=yes export HB_ARCHITECTURE=linux export HB_COMPILER=gcc -export C_USR="-O2 -DHB_FM_STATISTICS_OFF" +export HB_USER_CFLAGS="-O2 -DHB_FM_STATISTICS_OFF" make -r export HB_HOST_BUILD=lib @@ -101,11 +101,11 @@ ln -s ../../linux/gcc/hbpp source/pp/${HB_ARCHITECTURE}/${HB_COMPILER}/hbpp.exe mkdir -p source/main/${HB_ARCHITECTURE}/${HB_COMPILER} ln -s ../../linux/gcc/harbour source/main/${HB_ARCHITECTURE}/${HB_COMPILER}/harbour.exe -export CC_C_USR="" -export C_USR="$CC_C_USR -O2 -DHB_FM_STATISTICS_OFF" -export CC_PRG_USR="-D__PLATFORM__WINDOWS -D__PLATFORM__WINCE -undef:__PLATFORM__UNIX -undef:__PLATFORM__LINUX" -export PRG_USR="$CC_PRG_USR" -export L_USR="${CC_L_USR}" +export CC_HB_USER_CFLAGS="" +export HB_USER_CFLAGS="$CC_HB_USER_CFLAGS -O2 -DHB_FM_STATISTICS_OFF" +export CC_HB_USER_PRGFLAGS="-D__PLATFORM__WINDOWS -D__PLATFORM__WINCE -undef:__PLATFORM__UNIX -undef:__PLATFORM__LINUX" +export HB_USER_PRGFLAGS="$CC_HB_USER_PRGFLAGS" +export HB_USER_LDFLAGS="${CC_HB_USER_LDFLAGS}" export CCPATH="%{hb_ccpath}:" export CCPREFIX="%{hb_ccpref}" @@ -127,11 +127,11 @@ make -r # Install harbour itself. -export CC_C_USR="" -export C_USR="$CC_C_USR -O2 -DHB_FM_STATISTICS_OFF" -export CC_PRG_USR="-D__PLATFORM__WINDOWS -D__PLATFORM__WINCE -undef:__PLATFORM__UNIX -undef:__PLATFORM__LINUX" -export PRG_USR="$CC_PRG_USR" -export L_USR="${CC_L_USR}" +export CC_HB_USER_CFLAGS="" +export HB_USER_CFLAGS="$CC_HB_USER_CFLAGS -O2 -DHB_FM_STATISTICS_OFF" +export CC_HB_USER_PRGFLAGS="-D__PLATFORM__WINDOWS -D__PLATFORM__WINCE -undef:__PLATFORM__UNIX -undef:__PLATFORM__LINUX" +export HB_USER_PRGFLAGS="$CC_HB_USER_PRGFLAGS" +export HB_USER_LDFLAGS="${CC_HB_USER_LDFLAGS}" export CCPATH="%{hb_ccpath}:" export CCPREFIX="%{hb_ccpref}" diff --git a/harbour/harbour-win-spec b/harbour/harbour-win-spec index bc909f8ca1..44094fbb4f 100644 --- a/harbour/harbour-win-spec +++ b/harbour/harbour-win-spec @@ -89,7 +89,7 @@ rm -fR $RPM_BUILD_ROOT export HB_HOST_BUILD=yes export HB_ARCHITECTURE=linux export HB_COMPILER=gcc -export C_USR="-O2 -DHB_FM_STATISTICS_OFF" +export HB_USER_CFLAGS="-O2 -DHB_FM_STATISTICS_OFF" make -r export HB_HOST_BUILD=lib @@ -101,11 +101,11 @@ ln -s ../../linux/gcc/hbpp source/pp/${HB_ARCHITECTURE}/${HB_COMPILER}/hbpp.exe mkdir -p source/main/${HB_ARCHITECTURE}/${HB_COMPILER} ln -s ../../linux/gcc/harbour source/main/${HB_ARCHITECTURE}/${HB_COMPILER}/harbour.exe -export CC_C_USR="" -export C_USR="$CC_C_USR -O2 -DHB_FM_STATISTICS_OFF" -export CC_PRG_USR="-D__PLATFORM__WINDOWS -undef:__PLATFORM__UNIX -undef:__PLATFORM__LINUX" -export PRG_USR="$CC_PRG_USR" -export L_USR="${CC_L_USR}" +export CC_HB_USER_CFLAGS="" +export HB_USER_CFLAGS="$CC_HB_USER_CFLAGS -O2 -DHB_FM_STATISTICS_OFF" +export CC_HB_USER_PRGFLAGS="-D__PLATFORM__WINDOWS -undef:__PLATFORM__UNIX -undef:__PLATFORM__LINUX" +export HB_USER_PRGFLAGS="$CC_HB_USER_PRGFLAGS" +export HB_USER_LDFLAGS="${CC_HB_USER_LDFLAGS}" export CCPATH="%{hb_ccpath}:" export CCPREFIX="%{hb_ccpref}" @@ -127,11 +127,11 @@ make -r # Install harbour itself. -export CC_C_USR="" -export C_USR="$CC_C_USR -O2 -DHB_FM_STATISTICS_OFF" -export CC_PRG_USR="-D__PLATFORM__WINDOWS -undef:__PLATFORM__UNIX -undef:__PLATFORM__LINUX" -export PRG_USR="$CC_PRG_USR" -export L_USR="${CC_L_USR}" +export CC_HB_USER_CFLAGS="" +export HB_USER_CFLAGS="$CC_HB_USER_CFLAGS -O2 -DHB_FM_STATISTICS_OFF" +export CC_HB_USER_PRGFLAGS="-D__PLATFORM__WINDOWS -undef:__PLATFORM__UNIX -undef:__PLATFORM__LINUX" +export HB_USER_PRGFLAGS="$CC_HB_USER_PRGFLAGS" +export HB_USER_LDFLAGS="${CC_HB_USER_LDFLAGS}" export CCPATH="%{hb_ccpath}:" export CCPREFIX="%{hb_ccpref}" diff --git a/harbour/harbour.spec b/harbour/harbour.spec index 4ff3f72fa6..38a6a99d47 100644 --- a/harbour/harbour.spec +++ b/harbour/harbour.spec @@ -71,8 +71,8 @@ %define hb_pref hb %define hb_arch export HB_ARCHITECTURE=linux %define hb_cc export HB_COMPILER=gcc -%define hb_cflag export C_USR="-DHB_FM_STATISTICS_OFF" -%define hb_lflag export L_USR="${CC_L_USR} %{?_with_static:-static}" +%define hb_cflag export HB_USER_CFLAGS="-DHB_FM_STATISTICS_OFF" +%define hb_lflag export HB_USER_LDFLAGS="${CC_HB_USER_LDFLAGS} %{?_with_static:-static}" %define hb_gpm export HB_GPM_MOUSE=%{!?_without_gpm:yes} %define hb_crs export HB_WITHOUT_GTCRS=%{?_without_gtcrs:yes} %define hb_sln export HB_WITHOUT_GTSLN=%{?_without_gtsln:yes} @@ -380,7 +380,7 @@ rm -rf $RPM_BUILD_ROOT %{hb_env} case "`uname -m`" in *[_@]64) - export C_USR="$C_USR -fPIC" + export HB_USER_CFLAGS="$HB_USER_CFLAGS -fPIC" ;; esac @@ -397,7 +397,7 @@ make -r %{hb_env} case "`uname -m`" in *[_@]64) - export C_USR="$C_USR -fPIC" + export HB_USER_CFLAGS="$HB_USER_CFLAGS -fPIC" ;; esac @@ -438,8 +438,8 @@ EOF # check if we should rebuild tools with shared libs if [ "%{!?_with_static:1}" ] then - export L_USR="${CC_L_USR} -L${HB_LIB_INSTALL} -l%{name} %{!?_without_gtcrs:-lncurses} %{!?_without_gtsln:-lslang} %{!?_without_gpm:-lgpm} %{!?_without_x11:-L/usr/X11R6/%{_lib} -lX11}" - export PRG_USR="\"-D_DEFAULT_INC_DIR='${_DEFAULT_INC_DIR}'\" ${PRG_USR}" + export HB_USER_LDFLAGS="${CC_HB_USER_LDFLAGS} -L${HB_LIB_INSTALL} -l%{name} %{!?_without_gtcrs:-lncurses} %{!?_without_gtsln:-lslang} %{!?_without_gpm:-lgpm} %{!?_without_x11:-L/usr/X11R6/%{_lib} -lX11}" + export HB_USER_PRGFLAGS="\"-D_DEFAULT_INC_DIR='${_DEFAULT_INC_DIR}'\" ${HB_USER_PRGFLAGS}" for utl in hbmake hbrun hbi18n hbdoc do @@ -736,7 +736,7 @@ rm -rf $RPM_BUILD_ROOT - removed bison and flex from dependences list * Sat Aug 09 2003 Przemyslaw Czerpak -- removed ${RPM_OPT_FLAGS} from C_USR +- removed ${RPM_OPT_FLAGS} from HB_USER_CFLAGS * Wed Jul 23 2003 Przemyslaw Czerpak - fixed file (user and group) owner for RPMs builded from non root account diff --git a/harbour/include/hbapi.h b/harbour/include/hbapi.h index 30c2819f5b..9538dee508 100644 --- a/harbour/include/hbapi.h +++ b/harbour/include/hbapi.h @@ -1027,9 +1027,9 @@ extern HB_EXPORT void hb_verBuildInfo( void ); /* display harbour, extern HB_EXPORT int hb_verSvnID( void ); /* retrieves ChangeLog SVN revision number */ extern HB_EXPORT const char * hb_verSvnChangeLogID( void ); /* retrieves a static buffer containing ChangeLog ID string */ extern HB_EXPORT const char * hb_verSvnLastEntry( void ); /* retrieves a static buffer containing ChangeLog last entry string */ -extern HB_EXPORT const char * hb_verFlagsC( void ); /* retrieves a static buffer containing build time C compiler flags in C_USR envvar */ -extern HB_EXPORT const char * hb_verFlagsL( void ); /* retrieves a static buffer containing build time linker flags in L_USR envvar */ -extern HB_EXPORT const char * hb_verFlagsPRG( void ); /* retrieves a static buffer containing build time Harbour compiler flags in PRG_USR envvar */ +extern HB_EXPORT const char * hb_verFlagsC( void ); /* retrieves a static buffer containing build time C compiler flags in HB_USER_CFLAGS envvar */ +extern HB_EXPORT const char * hb_verFlagsL( void ); /* retrieves a static buffer containing build time linker flags in HB_USER_LDFLAGS envvar */ +extern HB_EXPORT const char * hb_verFlagsPRG( void ); /* retrieves a static buffer containing build time Harbour compiler flags in HB_USER_PRGFLAGS envvar */ extern HB_EXPORT BOOL hb_iswinnt( void ); /* return .T. if OS == Windows NT, 2000, XP */ extern HB_EXPORT BOOL hb_iswince( void ); /* return .T. if OS is Windows CE or Windows Mobile */ diff --git a/harbour/make_b32.bat b/harbour/make_b32.bat index b1ba8d020b..6dc831fe34 100644 --- a/harbour/make_b32.bat +++ b/harbour/make_b32.bat @@ -18,7 +18,7 @@ rem set HB_BUILD_OPTIM=no rem set HB_REBUILD_PARSER=yes rem set HB_MAKE_PROGRAM= rem set HB_SHOW_ERRORS= -rem set MK_USR= +rem set HB_USER_MAKEFLAGS= rem --------------------------------------------------------------- set _HB_CC_NAME=%HB_CC_NAME% @@ -48,14 +48,14 @@ if "%1" == "INSTALL" goto INSTALL :BUILD - %_HB_MAKE_PROGRAM% %MK_USR% -f %_HB_MAKEFILE% %1 %2 %3 > make_%_HB_CC_NAME%.log + %_HB_MAKE_PROGRAM% %HB_USER_MAKEFLAGS% -f %_HB_MAKEFILE% %1 %2 %3 > make_%_HB_CC_NAME%.log if errorlevel 1 set HB_EXIT_LEVEL=1 if errorlevel 1 if not "%HB_SHOW_ERRORS%" == "no" notepad make_%_HB_CC_NAME%.log goto EXIT :CLEAN - %_HB_MAKE_PROGRAM% %MK_USR% -f %_HB_MAKEFILE% CLEAN > make_%_HB_CC_NAME%.log + %_HB_MAKE_PROGRAM% %HB_USER_MAKEFLAGS% -f %_HB_MAKEFILE% CLEAN > make_%_HB_CC_NAME%.log if errorlevel 1 set HB_EXIT_LEVEL=1 if errorlevel 1 goto EXIT if exist make_%_HB_CC_NAME%.log del make_%_HB_CC_NAME%.log > nul @@ -64,7 +64,7 @@ if "%1" == "INSTALL" goto INSTALL :INSTALL - %_HB_MAKE_PROGRAM% %MK_USR% -f %_HB_MAKEFILE% INSTALL > nul + %_HB_MAKE_PROGRAM% %HB_USER_MAKEFLAGS% -f %_HB_MAKEFILE% INSTALL > nul if errorlevel 1 set HB_EXIT_LEVEL=1 goto EXIT diff --git a/harbour/make_b32.mak b/harbour/make_b32.mak index 926daf1784..f6bc488cc2 100644 --- a/harbour/make_b32.mak +++ b/harbour/make_b32.mak @@ -21,9 +21,9 @@ # NOTE: You can use these envvars to configure the make process: # (note that these are all optional) # -# C_USR - Extra C compiler options for libraries and for executables -# L_USR - Extra linker options for libraries -# PRG_USR - Extra Harbour compiler options +# HB_USER_CFLAGS - Extra C compiler options for libraries and for executables +# HB_USER_LDFLAGS - Extra linker options for libraries +# HB_USER_PRGFLAGS - Extra Harbour compiler options # # HB_BUILD_DLL - If set to yes enables building harbour VM+RTL # dll in addition to normal static build @@ -82,7 +82,7 @@ MTDLL_OBJS = $(TMP_DLL_OBJS:$(OBJ_DIR)=$(DLL_OBJ_DIR)) $(VMMTDLL_LIB_OBJS) #********************************************************** # C Compiler Flags -CFLAGS = -I$(INCLUDE_DIR) -I$(OBJ_DIR) $(C_USR) +CFLAGS = -I$(INCLUDE_DIR) -I$(OBJ_DIR) $(HB_USER_CFLAGS) CFLAGSMT = -DHB_MT_VM #----------- @@ -108,8 +108,8 @@ CEXEFLAGSDLL = $(HB_BCCDLL_DYNRT) $(CLIBFLAGS) #********************************************************** # Linker Flags -LDFLAGS = -Gn -C -ap -Tpe -L$(LIB_DIR) -L$(BIN_DIR) $(L_USR) -LDFLAGSDLL = -Gn -C -aa -Tpd -Gi -L$(LIB_DIR) $(L_USR) +LDFLAGS = -Gn -C -ap -Tpe -L$(LIB_DIR) -L$(BIN_DIR) $(HB_USER_LDFLAGS) +LDFLAGSDLL = -Gn -C -aa -Tpd -Gi -L$(LIB_DIR) $(HB_USER_LDFLAGS) !if "$(HB_BUILD_DEBUG)" == "yes" LDFLAGS = -v $(LDFLAGS) LDFLAGSDLL = -v $(LDFLAGSDLL) @@ -121,7 +121,7 @@ STANDARD_STATIC_CLIBS = cw32mt$(RTLIBSUFFIX).lib # This is needed, otherwise the libs may overflow # when debug info is requested with -v -y -ARFLAGS = /P64 $(A_USR) +ARFLAGS = /P64 $(HB_USER_AFLAGS) #********************************************************** #********************************************************** diff --git a/harbour/make_gcc.mak b/harbour/make_gcc.mak index 60bf9eb0d6..81ba5c6137 100644 --- a/harbour/make_gcc.mak +++ b/harbour/make_gcc.mak @@ -21,9 +21,9 @@ # NOTE: You can use these envvars to configure the make process: # (note that these are all optional) # -# C_USR - Extra C compiler options for libraries and for executables -# L_USR - Extra linker options for libraries -# PRG_USR - Extra Harbour compiler options +# HB_USER_CFLAGS - Extra C compiler options for libraries and for executables +# HB_USER_LDFLAGS - Extra linker options for libraries +# HB_USER_PRGFLAGS - Extra Harbour compiler options # # HB_BUILD_DLL - If set to yes enables building harbour VM+RTL # dll in addition to normal static build (currently not working) @@ -130,7 +130,7 @@ VMMT_LIB_OBJS = $(subst $(OBJ_DIR),$(MT_OBJ_DIR),$(VM_LIB_OBJS)) # Do not perform an extra compilation phase for shared libraries # if gcc -fPIC compilation flag is already passed to a makefile -ifneq ($(findstring -fPIC,$(C_USR)),) +ifneq ($(findstring -fPIC,$(HB_USER_CFLAGS)),) DLL_OBJS = $(TMP_DLL_OBJS) $(VM_DLL_OBJS) MTDLL_OBJS = $(TMP_DLL_OBJS) $(VM_DLL_OBJS:$(OBJ_DIR)/%=$(MT_OBJ_DIR)/%) else @@ -152,7 +152,7 @@ endif # C compiler flags #********************************************************** -CFLAGS := -W -Wall -I$(INCLUDE_DIR) $(C_USR) -I$(OBJ_DIR) +CFLAGS := -W -Wall -I$(INCLUDE_DIR) $(HB_USER_CFLAGS) -I$(OBJ_DIR) CFLAGSMT := -DHB_MT_VM #----------- ifneq ($(HB_BUILD_OPTIM),no) @@ -194,7 +194,7 @@ endif endif endif -LDFLAGS := $(L_USR) $(__GROUP_LIBS_BEG__) $(STANDARD_STATIC_HBLIBS) +LDFLAGS := $(HB_USER_LDFLAGS) $(__GROUP_LIBS_BEG__) $(STANDARD_STATIC_HBLIBS) LDFLAGS += $(__GROUP_LIBS_END__) @@ -221,13 +221,13 @@ endif LDFLAGS += $(HB_OS_LIBS) -LDFLAGSDLL := -shared $(L_USR) -L$(LIB_DIR) +LDFLAGSDLL := -shared $(HB_USER_LDFLAGS) -L$(LIB_DIR) #********************************************************** # Library manager Flags #********************************************************** -ARFLAGS = rc $(A_USR) +ARFLAGS = rc $(HB_USER_AFLAGS) #********************************************************** # COMPILE Rules diff --git a/harbour/make_gcc.sh b/harbour/make_gcc.sh index 4aa022b6f3..045a0adc54 100755 --- a/harbour/make_gcc.sh +++ b/harbour/make_gcc.sh @@ -106,10 +106,10 @@ do if [ "$GTSLN" != yes ]; then if [ "$GTSLN" != no ]; then if [ -f $dir/include/slang.h ]; then - [ $dir = /usr ] || C_USR="$C_USR -I$dir/include" + [ $dir = /usr ] || HB_USER_CFLAGS="$HB_USER_CFLAGS -I$dir/include" GTSLN=yes elif [ -f $dir/include/slang/slang.h ]; then - C_USR="$C_USR -I$dir/include/slang" + HB_USER_CFLAGS="$HB_USER_CFLAGS -I$dir/include/slang" GTSLN=yes fi fi @@ -117,10 +117,10 @@ do if [ "$GTCRS" != yes ]; then if [ "$GTCRS" != no ]; then if [ -f ${dir}/include/curses.h ]; then - [ $dir = /usr ] || C_USR="$C_USR -I$dir/include" + [ $dir = /usr ] || HB_USER_CFLAGS="$HB_USER_CFLAGS -I$dir/include" GTCRS=yes elif [ -f ${dir}/include/${CRSLIB}/curses.h ]; then - C_USR="$C_USR -I$dir/include/${CRSLIB}" + HB_USER_CFLAGS="$HB_USER_CFLAGS -I$dir/include/${CRSLIB}" GTCRS=yes fi fi @@ -131,7 +131,7 @@ do [ -f ${dir}/include/X11/Xcms.h ] && \ [ -f ${dir}/include/X11/Xutil.h ] && \ [ -f ${dir}/include/X11/keysym.h ]; then - [ $dir = /usr ] || C_USR="$C_USR -I$dir/include" + [ $dir = /usr ] || HB_USER_CFLAGS="$HB_USER_CFLAGS -I$dir/include" GTXWC=yes fi fi @@ -193,5 +193,5 @@ sed -e 's/;/ /g' \ -e 's/^!include/include/g' \ common.mak > common.cf -$MAKE -r -f make_gcc.mak $MK_USR $* +$MAKE -r -f make_gcc.mak $HB_USER_MAKEFLAGS $* rm -f common.cf diff --git a/harbour/make_gnu.bat b/harbour/make_gnu.bat index 9c6dbde61b..2d01a6a19e 100644 --- a/harbour/make_gnu.bat +++ b/harbour/make_gnu.bat @@ -25,9 +25,9 @@ rem --------------------------------------------------------------- if "%HB_ARCHITECTURE%" == "" set HB_ARCHITECTURE=win if "%HB_COMPILER%" == "" set HB_COMPILER=mingw -rem set PRG_USR= -rem set C_USR= -rem set L_USR= +rem set HB_USER_PRGFLAGS= +rem set HB_USER_CFLAGS= +rem set HB_USER_LDFLAGS= rem Set to constant value to be consistent with the non-GNU make files. @@ -86,9 +86,9 @@ if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=%HB_INSTALL_PREFIX%/include echo - Use these optional envvars to configure the make process echo when using the 'all' command: echo. - echo PRG_USR - Extra Harbour compiler options - echo C_USR - Extra C compiler options - echo L_USR - Extra linker options + echo HB_USER_PRGFLAGS - Extra Harbour compiler options + echo HB_USER_CFLAGS - Extra C compiler options + echo HB_USER_LDFLAGS - Extra linker options goto END :BAD_ARCH @@ -106,7 +106,7 @@ if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=%HB_INSTALL_PREFIX%/include rem --------------------------------------------------------------- rem Start the GNU make system - make -r %MK_USR% %1 %2 %3 %4 %5 %6 %7 %8 %9 > make_gnu.log + make -r %HB_USER_MAKEFLAGS% %1 %2 %3 %4 %5 %6 %7 %8 %9 > make_gnu.log goto END :END diff --git a/harbour/make_gnu.sh b/harbour/make_gnu.sh index 895a282c88..098befc3bc 100755 --- a/harbour/make_gnu.sh +++ b/harbour/make_gnu.sh @@ -96,18 +96,18 @@ then export HB_WITHOUT_GTSLN=yes fi -# export PRG_USR= -# export C_USR= -# export L_USR= +# export HB_USER_PRGFLAGS= +# export HB_USER_CFLAGS= +# export HB_USER_LDFLAGS= if [ "$HB_ARCHITECTURE" = "linux" ] then - if [ "${C_USR}" == "${C_USR//-fPIC/}" ] + if [ "${HB_USER_CFLAGS}" == "${HB_USER_CFLAGS//-fPIC/}" ] then HB_CPU=`uname -m` case "$HB_CPU" in *[@_]64) - export C_USR="$C_USR -fPIC" + export HB_USER_CFLAGS="$HB_USER_CFLAGS -fPIC" HB_ARCH64="yes" ;; *) @@ -116,7 +116,7 @@ then fi elif [ "$HB_ARCHITECTURE" = "hpux" ] || [ "$HB_ARCHITECTURE" = "sunos" ] then - export C_USR="$C_USR -fPIC" + export HB_USER_CFLAGS="$HB_USER_CFLAGS -fPIC" fi [ -z "$HB_INSTALL_PREFIX" ] && [ -n "$PREFIX" ] && export HB_INSTALL_PREFIX="$PREFIX" @@ -193,9 +193,9 @@ if [ -z "$HB_ARCHITECTURE" ] || [ -z "$HB_COMPILER" ]; then echo " - Use these optional envvars to configure the make process" echo " when using the 'all' target:" echo - echo " PRG_USR - Extra Harbour compiler options" - echo " C_USR - Extra C compiler options" - echo " L_USR - Extra linker options" + echo " HB_USER_PRGFLAGS - Extra Harbour compiler options" + echo " HB_USER_CFLAGS - Extra C compiler options" + echo " HB_USER_LDFLAGS - Extra linker options" exit else @@ -205,9 +205,9 @@ else if [ "$HB_ARCHITECTURE" = "bsd" ] || [ "$HB_ARCHITECTURE" = "hpux" ] then - gmake $MK_USR $* + gmake $HB_USER_MAKEFLAGS $* else - make $MK_USR $* + make $HB_USER_MAKEFLAGS $* fi if [ "$*" = "clean" ]; then diff --git a/harbour/make_gnu_os2.cmd b/harbour/make_gnu_os2.cmd index 1404a10a68..8cde996df9 100644 --- a/harbour/make_gnu_os2.cmd +++ b/harbour/make_gnu_os2.cmd @@ -19,9 +19,9 @@ rem sure usr/lib/tcpipv4 is searched before usr/lib (this is to rem get the right libsocket). It is recommended to use the -D rem compiler option for the define and either the LIBRARY_PATH or rem the -L compiler/linker option for the library. -rem For building Harbour you can also use L_USR environment variable, +rem For building Harbour you can also use HB_USER_LDFLAGS environment variable, rem f.e. -rem SET L_USR=-Le:\usr\lib\tcpipv4 +rem SET HB_USER_LDFLAGS=-Le:\usr\lib\tcpipv4 rem rem If you are using newer OS2 version with tcp/ip stack >= 4.1 rem (eComStation, for example) and you do not need backward binary @@ -31,7 +31,7 @@ rem SET HB_OS2_TCP32=yes if "%HB_OS2_TCP32%" == "yes" goto tcp32 if "%HB_OS2_TCP32%" == "YES" goto tcp32 - set C_USR=-DTCPV40HDRS %C_USR% + set HB_USER_CFLAGS=-DTCPV40HDRS %HB_USER_CFLAGS% :tcp32 make -r %1 %2 %3 %4 %5 %6 %7 %8 %9 > make_gnu.log diff --git a/harbour/make_gnu_xmingw.sh b/harbour/make_gnu_xmingw.sh index d215eea6dd..1e4641bf9e 100755 --- a/harbour/make_gnu_xmingw.sh +++ b/harbour/make_gnu_xmingw.sh @@ -33,17 +33,17 @@ else esac fi -CC_PRG_USR="" +CC_HB_USER_PRGFLAGS="" if [ "$HB_HOST_ARCH" != "win" ]; then - CC_PRG_USR="-D__PLATFORM__WINDOWS -undef:__PLATFORM__UNIX -undef:__PLATFORM__$UNAMEU" + CC_HB_USER_PRGFLAGS="-D__PLATFORM__WINDOWS -undef:__PLATFORM__UNIX -undef:__PLATFORM__$UNAMEU" fi [ -z "$HB_INSTALL_PREFIX" ] && \ export HB_INSTALL_PREFIX="/usr/local/mingw32-harbour" -export CC_C_USR="" -export C_USR="$CC_C_USR $C_USR" -export CC_PRG_USR -export PRG_USR="$CC_PRG_USR $PRG_USR" +export CC_HB_USER_CFLAGS="" +export HB_USER_CFLAGS="$CC_HB_USER_CFLAGS $HB_USER_CFLAGS" +export CC_HB_USER_PRGFLAGS +export HB_USER_PRGFLAGS="$CC_HB_USER_PRGFLAGS $HB_USER_PRGFLAGS" # try to detect MinGW cross-compiler location # using some default platform settings diff --git a/harbour/make_gnu_xmingwce.sh b/harbour/make_gnu_xmingwce.sh index 04e22de796..e27d5c4f2b 100755 --- a/harbour/make_gnu_xmingwce.sh +++ b/harbour/make_gnu_xmingwce.sh @@ -33,17 +33,17 @@ else esac fi -CC_PRG_USR="-D__PLATFORM__WINCE" +CC_HB_USER_PRGFLAGS="-D__PLATFORM__WINCE" if [ "$HB_HOST_ARCH" != "win" ]; then - CC_PRG_USR="$CC_PRG_USR -D__PLATFORM__WINDOWS -undef:__PLATFORM__UNIX -undef:__PLATFORM__$UNAMEU" + CC_HB_USER_PRGFLAGS="$CC_HB_USER_PRGFLAGS -D__PLATFORM__WINDOWS -undef:__PLATFORM__UNIX -undef:__PLATFORM__$UNAMEU" fi [ -z "$HB_INSTALL_PREFIX" ] && \ export HB_INSTALL_PREFIX="/usr/local/arm-wince-mingwce-harbour" -export CC_C_USR="" -export C_USR="$CC_C_USR $C_USR" -export CC_PRG_USR -export PRG_USR="$CC_PRG_USR $PRG_USR" +export CC_HB_USER_CFLAGS="" +export HB_USER_CFLAGS="$CC_HB_USER_CFLAGS $HB_USER_CFLAGS" +export CC_HB_USER_PRGFLAGS +export HB_USER_PRGFLAGS="$CC_HB_USER_PRGFLAGS $HB_USER_PRGFLAGS" # default cegcc instalation path [ -z "$CCPATH" ] && CCPATH="/opt/mingw32ce/bin" diff --git a/harbour/make_vc.bat b/harbour/make_vc.bat index b37c2973a6..200f7da7a2 100644 --- a/harbour/make_vc.bat +++ b/harbour/make_vc.bat @@ -18,7 +18,7 @@ rem set HB_BUILD_OPTIM=no rem set HB_REBUILD_PARSER=yes rem set HB_MAKE_PROGRAM= rem set HB_SHOW_ERRORS= -rem set MK_USR= +rem set HB_USER_MAKEFLAGS= rem rem To create a WinCE build, use the following settings: rem set HB_BUILD_WINCE=yes @@ -84,14 +84,14 @@ rem --------------------------------------------------------------- :BUILD - %_HB_MAKE_PROGRAM% %MK_USR% -nologo -f %_HB_MAKEFILE% %1 %2 %3 > make_%_HB_CC_NAME%.log + %_HB_MAKE_PROGRAM% %HB_USER_MAKEFLAGS% -nologo -f %_HB_MAKEFILE% %1 %2 %3 > make_%_HB_CC_NAME%.log if errorlevel 1 set HB_EXIT_LEVEL=1 if errorlevel 1 if not "%HB_SHOW_ERRORS%" == "no" notepad make_%_HB_CC_NAME%.log goto EXIT :CLEAN - %_HB_MAKE_PROGRAM% %MK_USR% -nologo -f %_HB_MAKEFILE% CLEAN > make_%_HB_CC_NAME%.log + %_HB_MAKE_PROGRAM% %HB_USER_MAKEFLAGS% -nologo -f %_HB_MAKEFILE% CLEAN > make_%_HB_CC_NAME%.log if errorlevel 1 set HB_EXIT_LEVEL=1 if errorlevel 1 goto EXIT if exist make_%_HB_CC_NAME%.log del make_%_HB_CC_NAME%.log > nul @@ -100,7 +100,7 @@ rem --------------------------------------------------------------- :INSTALL - %_HB_MAKE_PROGRAM% %MK_USR% -nologo -f %_HB_MAKEFILE% INSTALL > nul + %_HB_MAKE_PROGRAM% %HB_USER_MAKEFLAGS% -nologo -f %_HB_MAKEFILE% INSTALL > nul if errorlevel 1 set HB_EXIT_LEVEL=1 goto EXIT diff --git a/harbour/make_vc.mak b/harbour/make_vc.mak index 768f84af6e..d12b12dd03 100644 --- a/harbour/make_vc.mak +++ b/harbour/make_vc.mak @@ -21,9 +21,9 @@ # NOTE: You can use these envvars to configure the make process: # (note that these are all optional) # -# C_USR - Extra C compiler options for libraries and for executables -# L_USR - Extra linker options for libraries -# PRG_USR - Extra Harbour compiler options +# HB_USER_CFLAGS - Extra C compiler options for libraries and for executables +# HB_USER_LDFLAGS - Extra linker options for libraries +# HB_USER_PRGFLAGS - Extra Harbour compiler options # # HB_BUILD_DLL - If set to yes enables building harbour VM+RTL # dll in addition to normal static build @@ -98,7 +98,7 @@ MTDLL_OBJS = $(TMP_DLL_OBJS:obj\vc=obj\vc\dll) $(VMMTDLL_LIB_OBJS) # C compiler, Harbour compiler and Linker flags. #********************************************************** -ARFLAGS = /nologo $(A_USR) +ARFLAGS = /nologo $(HB_USER_AFLAGS) # C Compiler Flags !if "$(HB_BUILD_WINCE)" == "yes" @@ -117,7 +117,7 @@ CFLAGS = -nologo -W3 -I$(INCLUDE_DIR) -I$(CFLAGS_VER) \ -D"_WIN32_WCE=0x420" -D"UNDER_CE=0x420" -DWIN32_PLATFORM_PSPC \ -DWINCE -D_WINCE -D_WINDOWS -DARM -D_ARM_ -DARMV4 \ -DPOCKETPC2003_UI_MODEL -D_M_ARM -DUNICODE -D_UNICODE \ - $(C_USR) -D_UWIN -I$(OBJ_DIR) + $(HB_USER_CFLAGS) -D_UWIN -I$(OBJ_DIR) #----------- !ifndef HB_WINCE_COMPILE_WITH_GTWIN @@ -141,7 +141,7 @@ CFLAGS_VER = -Ogt2yb1p -GX- -G6 -YX !endif CFLAGS = -nologo -W4 -wd4127 -Gs -I$(INCLUDE_DIR) $(CFLAGS_VER) \ - $(C_USR) -I$(OBJ_DIR) + $(HB_USER_CFLAGS) -I$(OBJ_DIR) #----------- !if "$(HB_BUILD_DEBUG)" == "yes" @@ -175,17 +175,17 @@ CEXEFLAGSDLL = $(CEXEFLAGSDLL) -MT$(DBGMARKER) LDFLAGS = /nologo /subsystem:windowsce,4.20 /machine:arm /armpadcode \ /stack:65536,4096 /nodefaultlib:"oldnames.lib" \ /nodefaultlib:"kernel32.lib" /align:4096 /opt:ref /opt:icf \ - /libpath:$(LIB_DIR) $(L_USR) + /libpath:$(LIB_DIR) $(HB_USER_LDFLAGS) !if $(HB_VISUALC_VER) >= 80 LDFLAGS = $(LDFLAGS) /manifest:no !endif LDFLAGSDLL = /dll \ /nologo /subsystem:windowsce,4.20 /machine:arm /armpadcode \ /stack:65536,4096 /nodefaultlib:"oldnames.lib" \ - /libpath:$(LIB_DIR) $(L_USR) + /libpath:$(LIB_DIR) $(HB_USER_LDFLAGS) STANDARD_SYSLIBS = coredll.lib corelibc.lib winsock.lib ws2.lib !else -LDFLAGS = /nologo /libpath:$(LIB_DIR) $(L_USR) +LDFLAGS = /nologo /libpath:$(LIB_DIR) $(HB_USER_LDFLAGS) LDFLAGSDLL = /dll $(LDFLAGS) !if $(HB_VISUALC_VER) >= 80 LDFLAGS = $(LDFLAGS) /nxcompat diff --git a/harbour/mpkg_tgz.sh b/harbour/mpkg_tgz.sh index 8b84f1bae6..e0ee5c1cc3 100755 --- a/harbour/mpkg_tgz.sh +++ b/harbour/mpkg_tgz.sh @@ -29,7 +29,7 @@ hb_pref="hb" hb_contrib="" hb_sysdir="yes" hb_exesuf="" -export C_USR="$C_USR -DHB_FM_STATISTICS_OFF" +export HB_USER_CFLAGS="$HB_USER_CFLAGS -DHB_FM_STATISTICS_OFF" [ -z "$HB_INSTALL_PREFIX" ] && [ -n "$PREFIX" ] && export HB_INSTALL_PREFIX="$PREFIX" @@ -73,7 +73,7 @@ then HB_CPU=`uname -m` case "$HB_CPU" in *[_@]64) - export C_USR="$C_USR -fPIC" + export HB_USER_CFLAGS="$HB_USER_CFLAGS -fPIC" HB_ARCH64="yes" ;; *) @@ -81,7 +81,7 @@ then esac elif [ "$HB_ARCHITECTURE" = "hpux" ] || [ "$HB_ARCHITECTURE" = "sunos" ] then - export C_USR="$C_USR -fPIC" + export HB_USER_CFLAGS="$HB_USER_CFLAGS -fPIC" fi # Select the platform-specific installation prefix and ownership @@ -271,8 +271,8 @@ then [ "${HB_WITHOUT_GTSLN}" != yes ] && ADD_LIBS="$ADD_LIBS -lslang" [ "${HB_WITHOUT_X11}" != yes ] && ADD_LIBS="$ADD_LIBS -L/usr/X11R6/$HB_LIBDIRNAME -lX11" - export L_USR="-L${HB_LIB_INSTALL} -l${name} ${ADD_LIBS} ${L_USR}" - export PRG_USR="\"-D_DEFAULT_INC_DIR='${_DEFAULT_INC_DIR}'\" ${PRG_USR}" + export HB_USER_LDFLAGS="-L${HB_LIB_INSTALL} -l${name} ${ADD_LIBS} ${HB_USER_LDFLAGS}" + export HB_USER_PRGFLAGS="\"-D_DEFAULT_INC_DIR='${_DEFAULT_INC_DIR}'\" ${HB_USER_PRGFLAGS}" for utl in hbmake hbrun hbi18n hbdoc hbtest do diff --git a/harbour/source/main/harbour.c b/harbour/source/main/harbour.c index bebd7c69c6..ddc51bbb7a 100644 --- a/harbour/source/main/harbour.c +++ b/harbour/source/main/harbour.c @@ -580,31 +580,31 @@ const char * hb_verSvnLastEntry( void ) return HB_VER_LENTRY; } -/* build time C compiler flags in C_USR envvar */ +/* build time C compiler flags in HB_USER_CFLAGS envvar */ const char * hb_verFlagsC( void ) { -#ifdef HB_VER_C_USR - return HB_VER_C_USR; +#ifdef HB_VER_HB_USER_CFLAGS + return HB_VER_HB_USER_CFLAGS; #else return ""; #endif } -/* build time linker flags in L_USR envvar */ +/* build time linker flags in HB_USER_LDFLAGS envvar */ const char * hb_verFlagsL( void ) { -#ifdef HB_VER_L_USR - return HB_VER_L_USR; +#ifdef HB_VER_HB_USER_LDFLAGS + return HB_VER_HB_USER_LDFLAGS; #else return ""; #endif } -/* build time Harbour compiler flags in PRG_USR envvar */ +/* build time Harbour compiler flags in HB_USER_PRGFLAGS envvar */ const char * hb_verFlagsPRG( void ) { -#ifdef HB_VER_PRG_USR - return HB_VER_PRG_USR; +#ifdef HB_VER_HB_USER_PRGFLAGS + return HB_VER_HB_USER_PRGFLAGS; #else return ""; #endif diff --git a/harbour/source/pp/hbpp.c b/harbour/source/pp/hbpp.c index fa9e8b8b54..dd821bddde 100644 --- a/harbour/source/pp/hbpp.c +++ b/harbour/source/pp/hbpp.c @@ -382,29 +382,29 @@ static int hb_pp_generateVerInfo( char * szVerFile, int iSVNID, char * szChangeL hb_xfree( pszEscaped ); } - pszEnv = hb_getenv( "C_USR" ); + pszEnv = hb_getenv( "HB_USER_CFLAGS" ); if( pszEnv ) { pszEscaped = hb_pp_escapeString( pszEnv ); - fprintf( fout, "\n#define HB_VER_C_USR \"%s\"\n", pszEscaped ); + fprintf( fout, "\n#define HB_VER_HB_USER_CFLAGS \"%s\"\n", pszEscaped ); hb_xfree( pszEscaped ); hb_xfree( pszEnv ); } - pszEnv = hb_getenv( "L_USR" ); + pszEnv = hb_getenv( "HB_USER_LDFLAGS" ); if( pszEnv ) { pszEscaped = hb_pp_escapeString( pszEnv ); - fprintf( fout, "\n#define HB_VER_L_USR \"%s\"\n", pszEscaped ); + fprintf( fout, "\n#define HB_VER_HB_USER_LDFLAGS \"%s\"\n", pszEscaped ); hb_xfree( pszEscaped ); hb_xfree( pszEnv ); } - pszEnv = hb_getenv( "PRG_USR" ); + pszEnv = hb_getenv( "HB_USER_PRGFLAGS" ); if( pszEnv ) { pszEscaped = hb_pp_escapeString( pszEnv ); - fprintf( fout, "\n#define HB_VER_PRG_USR \"%s\"\n", pszEscaped ); + fprintf( fout, "\n#define HB_VER_HB_USER_PRGFLAGS \"%s\"\n", pszEscaped ); hb_xfree( pszEscaped ); hb_xfree( pszEnv ); } diff --git a/harbour/source/rdd/dbffpt/Makefile b/harbour/source/rdd/dbffpt/Makefile index c3800a83b0..e1d65002e2 100644 --- a/harbour/source/rdd/dbffpt/Makefile +++ b/harbour/source/rdd/dbffpt/Makefile @@ -3,7 +3,7 @@ # ifeq ($(HB_COMPILER),xcc) -C_USR:=$(subst -Ox,,$(subst -Ot,,$(C_USR))) +HB_USER_CFLAGS:=$(subst -Ox,,$(subst -Ot,,$(HB_USER_CFLAGS))) endif ROOT = ../../../ diff --git a/harbour/source/vm/Makefile b/harbour/source/vm/Makefile index 07b662dac9..78da51a667 100644 --- a/harbour/source/vm/Makefile +++ b/harbour/source/vm/Makefile @@ -68,7 +68,7 @@ LIBNAME=hbvm ifeq ($(HB_MT),) HB_MT=MT - C_USR:=$(subst -DHB_MT_VM,,$(C_USR)) + HB_USER_CFLAGS:=$(subst -DHB_MT_VM,,$(HB_USER_CFLAGS)) endif ifeq ($(HB_MT),MT) ifneq ($(HB_ARCHITECTURE),dos) diff --git a/harbour/source/vm/cmdarg.c b/harbour/source/vm/cmdarg.c index 57b62d863e..320b02efc5 100644 --- a/harbour/source/vm/cmdarg.c +++ b/harbour/source/vm/cmdarg.c @@ -505,31 +505,31 @@ const char * hb_verSvnLastEntry( void ) return HB_VER_LENTRY; } -/* build time C compiler flags in C_USR envvar */ +/* build time C compiler flags in HB_USER_CFLAGS envvar */ const char * hb_verFlagsC( void ) { -#ifdef HB_VER_C_USR - return HB_VER_C_USR; +#ifdef HB_VER_HB_USER_CFLAGS + return HB_VER_HB_USER_CFLAGS; #else return ""; #endif } -/* build time linker flags in L_USR envvar */ +/* build time linker flags in HB_USER_LDFLAGS envvar */ const char * hb_verFlagsL( void ) { -#ifdef HB_VER_L_USR - return HB_VER_L_USR; +#ifdef HB_VER_HB_USER_LDFLAGS + return HB_VER_HB_USER_LDFLAGS; #else return ""; #endif } -/* build time Harbour compiler flags in PRG_USR envvar */ +/* build time Harbour compiler flags in HB_USER_PRGFLAGS envvar */ const char * hb_verFlagsPRG( void ) { -#ifdef HB_VER_PRG_USR - return HB_VER_PRG_USR; +#ifdef HB_VER_HB_USER_PRGFLAGS + return HB_VER_HB_USER_PRGFLAGS; #else return ""; #endif diff --git a/harbour/source/vm/vmmt/Makefile b/harbour/source/vm/vmmt/Makefile index d9ac71a5c1..f63fff018c 100644 --- a/harbour/source/vm/vmmt/Makefile +++ b/harbour/source/vm/vmmt/Makefile @@ -67,8 +67,8 @@ PRG_SOURCES=\ LIBNAME=hbvmmt -ifeq ($(C_USR),$(subst -DHB_MT_VM,,$(C_USR))) - C_USR += -DHB_MT_VM +ifeq ($(HB_USER_CFLAGS),$(subst -DHB_MT_VM,,$(HB_USER_CFLAGS))) + HB_USER_CFLAGS += -DHB_MT_VM endif include $(TOP)$(ROOT)config/lib.cf diff --git a/harbour/tests/multifnc/Makefile b/harbour/tests/multifnc/Makefile index 5197edae09..67e9c7bd4f 100644 --- a/harbour/tests/multifnc/Makefile +++ b/harbour/tests/multifnc/Makefile @@ -3,22 +3,22 @@ # ifeq ($(HB_COMPILER),gcc) -L_USR += -Wl,--allow-multiple-definition +HB_USER_LDFLAGS += -Wl,--allow-multiple-definition else ifeq ($(HB_COMPILER),gpp) -L_USR += -Wl,--allow-multiple-definition +HB_USER_LDFLAGS += -Wl,--allow-multiple-definition else ifeq ($(HB_COMPILER),djgpp) -L_USR += -Wl,--allow-multiple-definition +HB_USER_LDFLAGS += -Wl,--allow-multiple-definition else ifeq ($(HB_COMPILER),mingw) -L_USR += -Wl,--allow-multiple-definition +HB_USER_LDFLAGS += -Wl,--allow-multiple-definition else ifeq ($(HB_COMPILER),xcc) -L_USR += /FORCE:MULTIPLE +HB_USER_LDFLAGS += /FORCE:MULTIPLE else ifeq ($(HB_COMPILER),pocc) -L_USR += /FORCE:MULTIPLE +HB_USER_LDFLAGS += /FORCE:MULTIPLE endif endif endif diff --git a/harbour/tests/testid.prg b/harbour/tests/testid.prg index df6ff55344..057d6aeab8 100644 --- a/harbour/tests/testid.prg +++ b/harbour/tests/testid.prg @@ -20,7 +20,7 @@ function Main() QOut( "Fine, you have just tested the /d compiler flag" ) #else QOut( "Please change hb32.bat and include /dTEST compiler flag" ) - QOut( "Or run 'SET PRG_USR=/dTEST' if you are using the GNU Make System" ) + QOut( "Or run 'SET HB_USER_PRGFLAGS=/dTEST' if you are using the GNU Make System" ) #endif #ifdef FIRST diff --git a/harbour/utils/hbdoc/Makefile b/harbour/utils/hbdoc/Makefile index 4952860afe..02af24852e 100644 --- a/harbour/utils/hbdoc/Makefile +++ b/harbour/utils/hbdoc/Makefile @@ -36,6 +36,6 @@ LIBS=\ hbmacro \ hbcommon \ -PRG_USR += -gc0 +HB_USER_PRGFLAGS += -gc0 include $(TOP)$(ROOT)config/bin.cf diff --git a/harbour/utils/hbi18n/Makefile b/harbour/utils/hbi18n/Makefile index e8e3f0799e..ca8a8a008f 100644 --- a/harbour/utils/hbi18n/Makefile +++ b/harbour/utils/hbi18n/Makefile @@ -26,6 +26,6 @@ LIBS=\ hbcommon \ -PRG_USR += -gc0 +HB_USER_PRGFLAGS += -gc0 include $(TOP)$(ROOT)config/bin.cf diff --git a/harbour/utils/hbmake/Makefile b/harbour/utils/hbmake/Makefile index 199aa086d3..f05bd67daa 100644 --- a/harbour/utils/hbmake/Makefile +++ b/harbour/utils/hbmake/Makefile @@ -28,6 +28,6 @@ LIBS=\ hbmacro \ hbcommon \ -PRG_USR += -gc0 +HB_USER_PRGFLAGS += -gc0 include $(TOP)$(ROOT)config/bin.cf diff --git a/harbour/utils/hbmake/hbmake.prg b/harbour/utils/hbmake/hbmake.prg index 10b1d77f99..d18ed520e4 100644 --- a/harbour/utils/hbmake/hbmake.prg +++ b/harbour/utils/hbmake/hbmake.prg @@ -2710,7 +2710,7 @@ Endif // Create and compile ELSEIF s_lMSVcc FWrite( s_nMakeFileHandle, ; - "CFLAG1 = -I$(INCLUDE_DIR) -W3 -nologo $(C_USR) $(SHELL) $(CFLAGS)" +IIF( s_lMt, " -DHB_THREAD_SUPPORT " , "" ) + s_cEOL +; + "CFLAG1 = -I$(INCLUDE_DIR) -W3 -nologo $(HB_USER_CFLAGS) $(SHELL) $(CFLAGS)" +IIF( s_lMt, " -DHB_THREAD_SUPPORT " , "" ) + s_cEOL +; "CFLAG2 = -c" +" -I" + ALLTRIM( s_cUserInclude ) + " " + s_cEOL +; "RFLAGS = " + s_cEOL +; "LFLAGS = /LIBPATH:$(CC_DIR)\lib /LIBPATH1:$(HB_DIR)\lib /LIBPATH2:$(C4W)\lib" +IIF(s_lMt, " /Nodefaultlib:LIBC "," /Nodefaultlib:LIBCMT " ) + s_cEOL +; @@ -2724,7 +2724,7 @@ Endif // Create and compile ELSEIF s_lPocc FWrite( s_nMakeFileHandle, ; - "CFLAG1 = $(SHELL) /Ze /Go /Ot /Tx86-coff /I$(INCLUDE_DIR) $(C_USR) $(CFLAGS)" +IIF( s_lMt, ' /D"HB_THREAD_SUPPORT" /MT' , "" ) + s_cEOL +; + "CFLAG1 = $(SHELL) /Ze /Go /Ot /Tx86-coff /I$(INCLUDE_DIR) $(HB_USER_CFLAGS) $(CFLAGS)" +IIF( s_lMt, ' /D"HB_THREAD_SUPPORT" /MT' , "" ) + s_cEOL +; "CFLAG2 = " + s_cEOL +; "RFLAGS = " + s_cEOL +; "LFLAGS = /LIBPATH:$(CC_DIR)\lib /LIBPATH:$(CC_DIR)\lib\win /LIBPATH:$(HB_DIR)\lib /MACHINE:IX86"+IIF(!s_lGui," /SUBSYSTEM:CONSOLE"," /SUBSYSTEM:WINDOWS") + s_cEOL +; @@ -3883,7 +3883,7 @@ FUNCTION CreateLibMakeFile( cFile ) ELSEIF s_lMSVcc FWrite( s_nMakeFileHandle, ; - "CFLAG1 = -I$(INCLUDE_DIR) -W3 -nologo $(C_USR) $(SHELL) $(CFLAGS)" + s_cEOL +; + "CFLAG1 = -I$(INCLUDE_DIR) -W3 -nologo $(HB_USER_CFLAGS) $(SHELL) $(CFLAGS)" + s_cEOL +; "CFLAG2 = -c -I" + ALLTRIM( s_cUserInclude ) + s_cEOL +; "RFLAGS = " + s_cEOL +; "LFLAGS = " + s_cEOL +; diff --git a/harbour/utils/hbrun/Makefile b/harbour/utils/hbrun/Makefile index 7e0453aca3..b032a41c2c 100644 --- a/harbour/utils/hbrun/Makefile +++ b/harbour/utils/hbrun/Makefile @@ -28,16 +28,16 @@ LIBS=\ hbcplr \ hbcommon \ -ifeq ($(findstring -DHB_PCRE_REGEX, $(C_USR)),) -ifeq ($(findstring -DHB_POSIX_REGEX, $(C_USR)),) +ifeq ($(findstring -DHB_PCRE_REGEX, $(HB_USER_CFLAGS)),) +ifeq ($(findstring -DHB_POSIX_REGEX, $(HB_USER_CFLAGS)),) LIBS += hbpcre endif endif -ifeq ($(findstring -DHB_EXT_ZLIB, $(C_USR)),) +ifeq ($(findstring -DHB_EXT_ZLIB, $(HB_USER_CFLAGS)),) LIBS += hbzlib endif -PRG_USR += -gc0 +HB_USER_PRGFLAGS += -gc0 include $(TOP)$(ROOT)config/bin.cf diff --git a/harbour/utils/hbtest/Makefile b/harbour/utils/hbtest/Makefile index a814064e43..cbf6821917 100644 --- a/harbour/utils/hbtest/Makefile +++ b/harbour/utils/hbtest/Makefile @@ -40,6 +40,6 @@ LIBS=\ hbpp \ hbcommon \ -PRG_USR += -gc0 +HB_USER_PRGFLAGS += -gc0 include $(TOP)$(ROOT)config/bin.cf