~ubuntu-branches/ubuntu/lucid/vlc/lucid

« back to all changes in this revision

Viewing changes to modules/demux/mkv/Makefile.in

  • Committer: Bazaar Package Importer
  • Author(s): Reinhard Tartler
  • Date: 2009-11-12 15:29:11 UTC
  • mfrom: (3.5.2 squeeze)
  • Revision ID: james.westby@ubuntu.com-20091112152911-skpz5ubpg18zjedp
Tags: 1.0.3-1ubuntu1
* Merge from Debian unstable (LP: #435524), remaining changes:
  - build against xulrunner-dev instead of iceape-dev
  - build against libx264-dev and install libx264 plugin
  - add Xb-Npp header to vlc package
  - recommend vlc-plugin-pulse for vlc
  - backport patch "402_increase_pulseaudio_score.diff"

Show diffs side-by-side

added added

removed removed

Lines of Context:
479
479
LTLIBtremor = @LTLIBtremor@
480
480
LTLIBts = @LTLIBts@
481
481
LTLIBtwolame = @LTLIBtwolame@
 
482
LTLIBudev = @LTLIBudev@
482
483
LTLIBunzip = @LTLIBunzip@
483
484
LTLIBupnp_cc = @LTLIBupnp_cc@
484
485
LTLIBupnp_intel = @LTLIBupnp_intel@
592
593
TAGLIB_LIBS = @TAGLIB_LIBS@
593
594
TIGER_CFLAGS = @TIGER_CFLAGS@
594
595
TIGER_LIBS = @TIGER_LIBS@
 
596
UDEV_CFLAGS = @UDEV_CFLAGS@
 
597
UDEV_LIBS = @UDEV_LIBS@
595
598
UIC = @UIC@
596
599
USE_NLS = @USE_NLS@
597
600
VCDINFO_CFLAGS = @VCDINFO_CFLAGS@