Changeset 14815d2cc5501b7417a34b96957c726e253bdeb2

Show
Ignore:
Timestamp:
06/04/06 19:35:56 (2 years ago)
Author:
Rémi Denis-Courmont <rem@videolan.org>
git-committer:
Rémi Denis-Courmont <rem@videolan.org> 1149442556 +0000
git-parent:

[5b369300e5f7093ac99f2f626533e7f9bc9b66fb]

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

Remove PIC stuff too

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • vlc-config.in.in

    rca4e3e3 r14815d2  
    201201      ;; 
    202202    pic) 
    203       echo_pic=yes 
     203      echo "Warning: vlc-config does not use \"pic\" anymore." >&2 
    204204      ;; 
    205205    builtin) 
    …… 
    211211    external) 
    212212      echo_external=yes 
    213       if test "x${echo_pic}" = "xno" 
    214       then 
    215         ldflags="${ldflags} -lvlc" 
    216       else 
    217         ldflags="${ldflags} -lvlc_pic" 
    218       fi 
     213      ldflags="${ldflags} -lvlc" 
    219214      ;;       
    220215    *) 
    …… 
    271266      register_targets "${module}" 
    272267    done 
    273     if test "${echo_pic}" = yes; then 
    274       for target in `echo "${list}"`; do printf "${top_builddir}modules/${target}_pic.a "; done 
    275     else 
    276       for target in `echo "${list}"`; do printf "${top_builddir}modules/${target}.a "; done 
    277     fi 
     268    for target in `echo "${list}"`; do printf "${top_builddir}modules/${target}.a "; done 
    278269    printf '\n' 
    279270  fi 
    …… 
    316307#  - We are a plugin or a builtin 
    317308#  - We are building from the outside (external): 
    318 #   - Give full libvlc linkflags + -lvlc(_pic) (in libdir) 
     309#   - Give full libvlc linkflags + -lvlc (in libdir) 
    319310#   - Link with builtins in libdir 
    320311#  - We are building something from the inside (builtin) 
    …… 
    328319      register_flags "${module}" 
    329320    done 
    330     if test "${echo_pic}" = yes; then 
    331       for target in `echo "${list}"`; do printf "${top_builddir}modules/${target}_pic.a "; done 
    332     else 
    333       for target in `echo "${list}"`; do printf "${top_builddir}modules/${target}.a "; done 
    334     fi 
     321    for target in `echo "${list}"`; do printf "${top_builddir}modules/${target}.a "; done 
    335322  fi 
    336323  if test "${echo_external}" = yes; then 
    337     if test "${echo_pic}" = yes; then 
    338       for module in `echo "${builtins}"`; do 
    339         ldflags="${ldflags} @libdir@/vlc/lib${module}_pic.a" 
    340       done 
    341     else 
    342       for module in `echo "${builtins}"`; do 
    343         ldflags="${ldflags} @libdir@/vlc/lib${module}.a" 
    344       done 
    345     fi 
     324    for module in `echo "${builtins}"`; do 
     325      ldflags="${ldflags} @libdir@/vlc/lib${module}.a" 
     326    done 
    346327    for module in `echo "${builtins}"`; do 
    347328      register_flags "${module}"