dnl FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
dnl DEALINGS IN THE SOFTWARE.
dnl
-dnl $Id$
+dnl $Id: bakefile.m4 1322 2009-10-21 07:37:18Z vaclavslavik $
dnl
dnl Support macros for makefiles generated by BAKEFILE.
dnl
PLATFORM_BEOS=1
;;
* )
- dnl wxWidgets-specific: allow unknown Unix systems
+ dnl wxWidgets-specific: allow unknown Unix systems
dnl AC_MSG_ERROR([Unknown platform: $BAKEFILE_FORCE_PLATFORM])
;;
esac
dlldir="$libdir"
case "${BAKEFILE_HOST}" in
+ dnl PA-RISC HP systems used .sl but IA64 use ELF-64 and so use the
+ dnl standard .so extension
+ ia64-hp-hpux* )
+ ;;
*-hp-hpux* )
SO_SUFFIX="sl"
SO_SUFFIX_MODULE="sl"
;;
*-*-linux* )
- if test "$INTELCC" = "yes"; then
+ dnl newer icc versions use -fPIC just as gcc does and, in fact, the
+ dnl newest (v10+) ones don't even understand -KPIC any longer
+ if test "$INTELCC" = "yes" -a "$INTELCC8" != "yes"; then
PIC_FLAG="-KPIC"
elif test "x$SUNCXX" = "xyes"; then
SHARED_LD_CC="${CC} -G -o"
chmod +x shared-ld-sh
SHARED_LD_MODULE_CC="`pwd`/shared-ld-sh -bundle -headerpad_max_install_names -o"
- SHARED_LD_MODULE_CXX="CXX=\$(CXX) $SHARED_LD_MODULE_CC"
+ SHARED_LD_MODULE_CXX="CXX=\"\$(CXX)\" $SHARED_LD_MODULE_CC"
dnl Most apps benefit from being fully binded (its faster and static
dnl variables initialized at startup work).
USE_SOVERLINUX=0
USE_SOVERSOLARIS=0
USE_SOVERCYGWIN=0
- USE_SOSYMLINKS=0
+ USE_SOTWOSYMLINKS=0
USE_MACVERSION=0
SONAME_FLAG=
fi
USE_SOVERSION=1
USE_SOVERLINUX=1
- USE_SOSYMLINKS=1
+ USE_SOTWOSYMLINKS=1
;;
*-*-solaris2* )
SONAME_FLAG="-h "
USE_SOVERSION=1
USE_SOVERSOLARIS=1
- USE_SOSYMLINKS=1
;;
*-*-darwin* )
USE_MACVERSION=1
USE_SOVERSION=1
- USE_SOSYMLINKS=1
+ USE_SOTWOSYMLINKS=1
;;
*-*-cygwin* )
AC_SUBST(USE_SOVERSOLARIS)
AC_SUBST(USE_SOVERCYGWIN)
AC_SUBST(USE_MACVERSION)
- AC_SUBST(USE_SOSYMLINKS)
+ AC_SUBST(USE_SOTWOSYMLINKS)
AC_SUBST(SONAME_FLAG)
])
GCC_PCH=1
],
[
- AC_TRY_COMPILE([],
- [
- #if !defined(__INTEL_COMPILER) || \
- (__INTEL_COMPILER < 800)
- There is no PCH support
- #endif
- ],
- [
- AC_MSG_RESULT([yes])
- ICC_PCH=1
- ],
- [
- AC_MSG_RESULT([no])
- ])
+ if test "$INTELCXX8" = "yes"; then
+ AC_MSG_RESULT([yes])
+ ICC_PCH=1
+ if test "$INTELCXX10" = "yes"; then
+ ICC_PCH_CREATE_SWITCH="-pch-create"
+ ICC_PCH_USE_SWITCH="-pch-use"
+ else
+ ICC_PCH_CREATE_SWITCH="-create-pch"
+ ICC_PCH_USE_SWITCH="-use-pch"
+ fi
+ else
+ AC_MSG_RESULT([no])
+ fi
])
if test $GCC_PCH = 1 -o $ICC_PCH = 1 ; then
USE_PCH=1
AC_SUBST(GCC_PCH)
AC_SUBST(ICC_PCH)
+ AC_SUBST(ICC_PCH_CREATE_SWITCH)
+ AC_SUBST(ICC_PCH_USE_SWITCH)
AC_SUBST(BK_MAKE_PCH)
])
AC_BAKEFILE_DEPS
AC_BAKEFILE_RES_COMPILERS
- BAKEFILE_BAKEFILE_M4_VERSION="0.2.3"
+ dnl OBJCFLAGS is set by Autoconf, but OBJCXXFLAGS is not:
+ AC_SUBST(OBJCXXFLAGS)
+
+
+ BAKEFILE_BAKEFILE_M4_VERSION="0.2.7"
dnl includes autoconf_inc.m4:
$1
# Permission is given to use this file in any way.
DEPSMODE=${DEPSMODE}
-DEPSDIR=.deps
DEPSFLAG="${DEPSFLAG}"
-
-mkdir -p ${D}DEPSDIR
+DEPSDIRBASE=.deps
if test ${D}DEPSMODE = gcc ; then
${D}* ${D}{DEPSFLAG}
esac
shift
done
+ objfilebase=\`basename ${D}objfile\`
+ builddir=\`dirname ${D}objfile\`
depfile=\`basename ${D}srcfile | sed -e 's/\\..*${D}/.d/g'\`
depobjname=\`echo ${D}depfile |sed -e 's/\\.d/.o/g'\`
-
+ depsdir=${D}builddir/${D}DEPSDIRBASE
+ mkdir -p ${D}depsdir
+
# if the compiler failed, we're done:
if test ${D}{status} != 0 ; then
rm -f ${D}depfile
# move created file to the location we want it in:
if test -f ${D}depfile ; then
- sed -e "s,${D}depobjname:,${D}objfile:,g" ${D}depfile >${D}{DEPSDIR}/${D}{objfile}.d
+ sed -e "s,${D}depobjname:,${D}objfile:,g" ${D}depfile >${D}{depsdir}/${D}{objfilebase}.d
rm -f ${D}depfile
else
# "g++ -MMD -o fooobj.o foosrc.cpp" produces fooobj.d
- depfile=\`basename ${D}objfile | sed -e 's/\\..*${D}/.d/g'\`
+ depfile=\`echo "${D}objfile" | sed -e 's/\\..*${D}/.d/g'\`
if test ! -f ${D}depfile ; then
# "cxx -MD -o fooobj.o foosrc.cpp" creates fooobj.o.d (Compaq C++)
depfile="${D}objfile.d"
fi
if test -f ${D}depfile ; then
- sed -e "/^${D}objfile/!s,${D}depobjname:,${D}objfile:,g" ${D}depfile >${D}{DEPSDIR}/${D}{objfile}.d
+ sed -e "\\,^${D}objfile,!s,${D}depobjname:,${D}objfile:,g" ${D}depfile >${D}{depsdir}/${D}{objfilebase}.d
rm -f ${D}depfile
fi
fi
exit 0
+
elif test ${D}DEPSMODE = mwcc ; then
${D}* || exit ${D}?
# Run mwcc again with -MM and redirect into the dep file we want
fi
prevarg="${D}arg"
done
- ${D}* ${D}DEPSFLAG >${D}{DEPSDIR}/${D}{objfile}.d
+
+ objfilebase=\`basename ${D}objfile\`
+ builddir=\`dirname ${D}objfile\`
+ depsdir=${D}builddir/${D}DEPSDIRBASE
+ mkdir -p ${D}depsdir
+
+ ${D}* ${D}DEPSFLAG >${D}{depsdir}/${D}{objfilebase}.d
exit 0
+
elif test ${D}DEPSMODE = unixcc; then
${D}* || exit ${D}?
# Run compiler again with deps flag and redirect into the dep file.
esac
shift
done
- eval "${D}cmd ${D}DEPSFLAG" | sed "s|.*:|${D}objfile:|" >${D}{DEPSDIR}/${D}{objfile}.d
+
+ objfilebase=\`basename ${D}objfile\`
+ builddir=\`dirname ${D}objfile\`
+ depsdir=${D}builddir/${D}DEPSDIRBASE
+ mkdir -p ${D}depsdir
+
+ eval "${D}cmd ${D}DEPSFLAG" | sed "s|.*:|${D}objfile:|" >${D}{depsdir}/${D}{objfilebase}.d
exit 0
+
else
${D}*
exit ${D}?
shift
shift
+builddir=\`echo ${D}outfile | sed -e 's,/\\.pch/.*${D},,g'\`
+
compiler=""
headerfile=""
headerfile="${D}{incdir}/${D}{header}"
fi
;;
- -use-pch|-use_pch )
+ -use-pch|-use_pch|-pch-use )
shift
add_to_cmdline=0
;;
else
mkdir -p \`dirname ${D}{outfile}\`
fi
- depsfile=".deps/\`echo ${D}{outfile} | tr '/.' '__'\`.d"
- mkdir -p .deps
+ depsfile="${D}{builddir}/.deps/\`echo ${D}{outfile} | tr '/.' '__'\`.d"
+ mkdir -p ${D}{builddir}/.deps
if test "x${GCC_PCH}" = "x1" ; then
# can do this because gcc is >= 3.4:
${D}{compiler} -o ${D}{outfile} -MMD -MF "${D}{depsfile}" "${D}{headerfile}"
#include "${D}header"
EOT
# using -MF icc complains about differing command lines in creation/use
- ${D}compiler -c -create_pch ${D}outfile -MMD ${D}file && \\
+ ${D}compiler -c ${ICC_PCH_CREATE_SWITCH} ${D}outfile -MMD ${D}file && \\
sed -e "s,^.*:,${D}outfile:," -e "s, ${D}file,," < ${D}dfile > ${D}depsfile && \\
rm -f ${D}file ${D}dfile ${D}{filename}.o
fi
projects / wxWidgets.git / blobdiff