From: Bruno H. <br...@cl...> - 2008-05-31 12:23:29
|
Sam wrote: > 4 -rw-rw-r-- 1 sds src 821 Apr 29 2002 cc-cppaux.m4 Gone like this: 2008-05-31 Bruno Haible <br...@cl...> * configure.in: Remove CL_CC_NEED_CCPAUX invocation. * m4/cc-cppaux.m4: Remove file. * makemake.in (CC_NEED_CCPAUX, XCC_NEED_CCPAUX): Remove variables. (*asm*.c): Fix dependency to use XASMCCPAUX. diff -c -3 -r1.139 configure.in *** src/configure.in 31 May 2008 12:04:33 -0000 1.139 --- src/configure.in 31 May 2008 12:20:06 -0000 *************** *** 52,58 **** CL_CC_GCC dnl sets variables CC_GCC, GCC_X_NONE CL_CC_SUNPRO dnl sets variable CC_SUNPRO CL_CC_CPLUSPLUS dnl sets variable CC_CPLUSPLUS - CL_CC_NEED_CCPAUX dnl sets variable CC_NEED_CCPAUX CL_CC_NEED_DEEMA dnl sets variable CC_NEED_DEEMA CL_AS_UNDERSCORE dnl sets variable AS_UNDERSCORE, DEFS ASM_UNDERSCORE CL_IRIX_SUN dnl LIBS -lsun --- 52,57 ---- diff -c -3 -r1.748 makemake.in *** src/makemake.in 27 May 2008 21:05:19 -0000 1.748 --- src/makemake.in 31 May 2008 12:20:08 -0000 *************** *** 510,516 **** CC_GCC='@CC_GCC@' # either true or false CC_SUNPRO='@CC_SUNPRO@' # either true or false CC_CPLUSPLUS='@CC_CPLUSPLUS@' # either true or false - CC_NEED_CCPAUX='@CC_NEED_CCPAUX@' # either true or false CC_NEED_DEEMA='@CC_NEED_DEEMA@' # either true or false AS_UNDERSCORE='@AS_UNDERSCORE@' # either true or false RANLIB='@RANLIB@' # either 'ranlib' or ':' --- 510,515 ---- *************** *** 600,606 **** CC='cl' CC_GCC=false CFLAGS='$(MFLAGS)' - CC_NEED_CCPAUX=false AS_UNDERSCORE=false CC_NEED_DEEMA=true FFCALL_LIBS='avcall.lib callback.lib' --- 599,604 ---- *************** *** 630,636 **** XCFLAGS='' XLDFLAGS='' XCC_GCC=true - XCC_NEED_CCPAUX=false XCC_NEED_DEEMA=false else TSYS="$HSYS" --- 628,633 ---- *************** *** 641,647 **** XCFLAGS="${CFLAGS}" XLDFLAGS="${LDFLAGS}" XCC_GCC="${CC_GCC}" - XCC_NEED_CCPAUX="${CC_NEED_CCPAUX}" XCC_NEED_DEEMA="${CC_NEED_DEEMA}" fi XCC_UNUSABLE_CPP=false --- 638,643 ---- *************** *** 2156,2165 **** if [ -n "$XCC_SUNPRO" ] ; then XASM_NEED_CCPAUX=true else ! XASM_NEED_CCPAUX=$XCC_NEED_CCPAUX fi ! if [ $CC_NEED_CCPAUX = true -o $XCC_NEED_CCPAUX = true -o $XASM_NEED_CCPAUX = true ] ; then NEED_CCPAUX=true else NEED_CCPAUX=false --- 2152,2161 ---- if [ -n "$XCC_SUNPRO" ] ; then XASM_NEED_CCPAUX=true else ! XASM_NEED_CCPAUX=false fi ! if [ $XASM_NEED_CCPAUX = true ] ; then NEED_CCPAUX=true else NEED_CCPAUX=false *************** *** 2169,2188 **** echol "GCTRIGGER = ${HERE}gctrigger" echol "VARBRACE = ${HERE}varbrace" - if [ $CC_NEED_CCPAUX = true ] ; then - CCPAUX='ccpaux'$HEXE - CCPAUX_FILTER=' | '$HERE'ccpaux' - else - CCPAUX='' - CCPAUX_FILTER='' - fi - if [ $XCC_NEED_CCPAUX = true ] ; then - XCCPAUX='ccpaux'$HEXE - XCCPAUX_FILTER=' | '$HERE'ccpaux' - else - XCCPAUX='' - XCCPAUX_FILTER='' - fi if [ $XASM_NEED_CCPAUX = true ] ; then XASMCCPAUX='ccpaux'$HEXE XASMCCPAUX_FILTER=' | '$HERE'ccpaux' --- 2165,2170 ---- *************** *** 2430,2447 **** for util in ${UTILS} ; do case ${util} in comment5 ) ! if [ $CC_NEED_CCPAUX = true ] ; then ! echol "${util}${HEXE} : ${UTILDIR_M}${util}.c ${CCPAUX}" ! echotab "${HERE}ccpaux${HEXE} < ${UTILDIR_}${util}.c > ${util}.c" ! echotab_to_HEXE "${UTILCOMPILE}" "${util}.c" "${util}" ! echotab "\$(RM) ${util}.c" ! echol ! OBSOLETE=$OBSOLETE" ${util}.c" ! else ! echol "${util}${HEXE} : ${UTILDIR_M}${util}.c" ! echotab_to_HEXE "${UTILCOMPILE}" "${UTILDIR_CC}${util}.c" "${util}" ! echol ! fi ;; * ) echol "${util}${HEXE} : ${UTILDIR_M}${util}.c" --- 2412,2420 ---- for util in ${UTILS} ; do case ${util} in comment5 ) ! echol "${util}${HEXE} : ${UTILDIR_M}${util}.c" ! echotab_to_HEXE "${UTILCOMPILE}" "${UTILDIR_CC}${util}.c" "${util}" ! echol ;; * ) echol "${util}${HEXE} : ${UTILDIR_M}${util}.c" *************** *** 2499,2505 **** done for f in $ARI_ASMD $SP_ASMD ; do ! echol "${f}.c : ${SRCDIR}${f}.d comment5${HEXE} ${XCCPAUX}" echotabpipe "\$(COMMENT5) ${SRCDIR}${f}.d${XASMCCPAUX_FILTER} > ${f}.c" echol done --- 2472,2478 ---- done for f in $ARI_ASMD $SP_ASMD ; do ! echol "${f}.c : ${SRCDIR}${f}.d comment5${HEXE} ${XASMCCPAUX}" echotabpipe "\$(COMMENT5) ${SRCDIR}${f}.d${XASMCCPAUX_FILTER} > ${f}.c" echol done |