Revision e89b8b0a

View differences:

configure
235 235
ffserver="yes"
236 236
ffplay="yes"
237 237
LIBOBJFLAGS=""
238
LDFLAGS=-Wl,--warn-common
238
FFLDFLAGS=-Wl,--warn-common
239 239
FFSLDFLAGS=-Wl,-E
240 240
LDCONFIG="ldconfig"
241 241
LIBPREF="lib"
......
299 299
audio_oss="no"
300 300
dv1394="no"
301 301
make="gmake"
302
LDFLAGS=""
302
FFLDFLAGS=""
303 303
FFSLDFLAGS=""
304 304
need_inet_aton="yes"
305 305
extralibs="$extralibs -lsocket -lnsl"
......
311 311
audio_oss="yes"
312 312
dv1394="no"
313 313
make="gmake"
314
LDFLAGS="$LDFLAGS -export-dynamic"
314
FFLDFLAGS="$FFLDFLAGS -export-dynamic"
315 315
extralibs="$extralibs -lossaudio"
316 316
;;
317 317
OpenBSD)
......
322 322
dv1394="no"
323 323
make="gmake"
324 324
LIBOBJFLAGS="\$(PIC)"
325
LDFLAGS="$LDFLAGS -export-dynamic -pthread"
325
FFLDFLAGS="$FFLDFLAGS -export-dynamic -pthread"
326 326
LDCONFIG="ldconfig -m \$(libdir)"
327 327
extralibs="$extralibs -lossaudio"
328 328
;;
......
334 334
dv1394="no"
335 335
make="gmake"
336 336
CFLAGS="$CFLAGS -pthread"
337
LDFLAGS="$LDFLAGS -export-dynamic -pthread"
337
FFLDFLAGS="$FFLDFLAGS -export-dynamic -pthread"
338 338
;;
339 339
BSD/OS)
340 340
v4l="no"
......
358 358
darwin="yes"
359 359
strip="strip -x"
360 360
installstrip=""
361
LDFLAGS="-Wl,-dynamic,-search_paths_first"
361
FFLDFLAGS="-Wl,-dynamic,-search_paths_first"
362 362
SLIBSUF=".dylib"
363 363
SLIBNAME_WITH_FULLVERSION='$(SLIBPREF)$(NAME).$(LIBVERSION)$(SLIBSUF)'
364 364
SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(NAME).$(LIBMAJOR)$(SLIBSUF)'
......
380 380
EXESUF=".exe"
381 381
;;
382 382
Linux)
383
LDFLAGS="$LDFLAGS -rdynamic -Wl,--as-needed -Wl,-rpath-link,\$(BUILD_ROOT)/libavcodec -Wl,-rpath-link,\$(BUILD_ROOT)/libavformat -Wl,-rpath-link,\$(BUILD_ROOT)/libavutil"
383
FFLDFLAGS="$FFLDFLAGS -rdynamic -Wl,--as-needed -Wl,-rpath-link,\$(BUILD_ROOT)/libavcodec -Wl,-rpath-link,\$(BUILD_ROOT)/libavformat -Wl,-rpath-link,\$(BUILD_ROOT)/libavutil"
384 384
;;
385 385
IRIX*)
386 386
ranlib="echo ignoring ranlib"
......
395 395
ranlib="echo ignoring ranlib"
396 396
strip="echo ignoring strip"
397 397
CFLAGS="$CFLAGS -Zomf"
398
LDFLAGS="-Zomf -Zstack 16384 -s"
398
FFLDFLAGS="-Zomf -Zstack 16384 -s"
399 399
SHFLAGS="-Zdll -Zomf"
400 400
FFSLDFLAGS=""
401 401
LIBPREF=""
......
475 475
  ;;
476 476
  --extra-cflags=*) CFLAGS="$CFLAGS ${opt#--extra-cflags=}"
477 477
  ;;
478
  --extra-ldflags=*) LDFLAGS="$LDFLAGS ${opt#--extra-ldflags=}"
478
  --extra-ldflags=*) FFLDFLAGS="$FFLDFLAGS ${opt#--extra-ldflags=}"
479 479
  ;;
480 480
  --extra-libs=*) extralibs=${opt#--extra-libs=}
481 481
  ;;
......
630 630
  esac
631 631
done
632 632

  
633

  
634
# Combine FFLDFLAGS and the LDFLAGS environment variable
635
LDFLAGS="$FFLDFLAGS $LDFLAGS"
636

  
633 637
# we need to build at least one lib type
634 638
if test "$lstatic" = "no" && test "$lshared" = "no" ; then
635 639
    cat <<EOF

Also available in: Unified diff