Changeset 9b007c13bd82a29ae60e4aae9da26487ecaa89f7

Show
Ignore:
Timestamp:
07/18/07 21:47:29 (1 year ago)
Author:
Rémi Denis-Courmont <rem@videolan.org>
git-committer:
Rémi Denis-Courmont <rem@videolan.org> 1184788049 +0000
git-parent:

[91287e977e4efc1220ae6f663e093f416b8c8183]

git-author:
Rémi Denis-Courmont <rem@videolan.org> 1184788049 +0000
Message:

Remove some useless cruft

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • bootstrap

    r81657c9 r9b007c1  
    170170fi 
    171171 
    172 rm -f m4/private.m4-tmp1 && cat > m4/private.m4-tmp1 << EOF 
    173 dnl  The required AM_CONDITIONAL calls 
    174 dnl  XXX: too many conditionals make the build very slow, disabled them 
    175 AC_DEFUN([VLC_CONDITIONALS], [ 
    176 EOF 
    177 rm -f m4/private.m4-tmp2 && cat > m4/private.m4-tmp2 << EOF 
    178 dnl  The required AC_SUBST calls 
    179 AC_DEFUN([VLC_SUBSTS], [ 
    180 EOF 
    181 rm -f m4/private.m4-tmp3 && cat > m4/private.m4-tmp3 << EOF 
    182 dnl  The required AC_OUTPUT calls 
    183 dnl  XXX: this feature is only supported starting from automake-1.7 
    184 AC_DEFUN([VLC_MAKEFILES], [AC_OUTPUT([ 
    185 EOF 
    186 rm -f m4/private.m4-tmp4 && cat > m4/private.m4-tmp4 << EOF 
     172cat >> m4/private.m4 << EOF 
    187173dnl  Helper macro for vlc-config generation 
    188174AC_DEFUN([VLC_CONFIG_HELPER], [ 
    …… 
    344330        NODIST=''; else 
    345331        NODIST='#'; fi 
    346     cat >> m4/private.m4-tmp4 << EOF 
     332    cat >> m4/private.m4 << EOF 
    347333    ${mod}) list="\\\${list} ${dir}/lib${mod}" ;; 
    348334EOF 
    …… 
    405391done 
    406392 
    407 cat >> m4/private.m4-tmp1 << EOF 
    408 ]) 
    409 EOF 
    410 cat m4/private.m4-tmp1 >> m4/private.m4 && rm -f m4/private.m4-tmp1 
    411 cat >> m4/private.m4-tmp2 << EOF 
    412 ]) 
    413 EOF 
    414 cat m4/private.m4-tmp2 >> m4/private.m4 && rm -f m4/private.m4-tmp2 
    415 cat >> m4/private.m4-tmp3 << EOF 
    416 ])]) 
    417 EOF 
    418 cat m4/private.m4-tmp3 >> m4/private.m4 && rm -f m4/private.m4-tmp3 
    419 cat >> m4/private.m4-tmp4 << EOF 
     393cat >> m4/private.m4 << EOF 
    420394BLAH 
    421395]) 
    422396EOF 
    423 cat m4/private.m4-tmp4 >> m4/private.m4 && rm -f m4/private.m4-tmp4 
    424  
    425 echo " done." 
    426397 
    427398### 

  • configure.ac

    rff3a0f6 r9b007c1  
    59515951]) 
    59525952 
    5953  dnl Import conditional variables generated by bootstrap 
    5954 VLC_CONDITIONALS 
    5955  
    59565953dnl 
    59575954dnl  Stuff used by the program 
    …… 
    60196016AC_SUBST(MACOSX_DEPLOYMENT_TARGET) 
    60206017AC_SUBST(FILE_LIBVLC_DLL) 
    6021  
    6022 dnl Import substitutions generated by bootstrap 
    6023 VLC_SUBSTS 
    60246018 
    60256019dnl Create vlc-config.in