← Back to branch summary

~siretart/vlc/debian-packaging

« back to all changes in this revision

Viewing changes to modules/Makefile.in

  • Committer: Sebastian Ramacher
  • Date: 2016-01-31 20:58:37 UTC
  • mfrom: (1.2.39)
  • Revision ID: git-v1:b7ac1de93ecf7cd3d86898544433974ce0af7086
Merge tag 'upstream/2.2.2'

Upstream version 2.2.2

# gpg: Signature made Sun 31 Jan 2016 21:57:53 CET using RSA key ID 6EA71993
# gpg: Good signature from "Sebastian Ramacher <sebastian@ramacher.at>"
# gpg:                 aka "Sebastian Ramacher <s.ramacher@gmail.com>"
# gpg:                 aka "Sebastian Ramacher <s.ramacher@gmx.at>"
# gpg:                 aka "Sebastian Ramacher <s.ramacher@student.tugraz.at>"
# gpg:                 aka "Sebastian Ramacher <sramacher@debian.org>"
# gpg:                 aka "Sebastian Ramacher <sebastian.ramacher@iaik.tugraz.at>"

Show diffs side-by-side

added added

removed removed

Lines of Context:
modules/Makefile.in
884
884
        $(am__DEPENDENCIES_1)
885
885
am_libhttp_plugin_la_OBJECTS = access/http.lo
886
886
libhttp_plugin_la_OBJECTS = $(am_libhttp_plugin_la_OBJECTS)
887
 
libhttplive_plugin_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
 
887
libhttplive_plugin_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
 
888
        $(am__DEPENDENCIES_1)
888
889
am_libhttplive_plugin_la_OBJECTS =  \
889
890
        stream_filter/libhttplive_plugin_la-httplive.lo
890
891
libhttplive_plugin_la_OBJECTS = $(am_libhttplive_plugin_la_OBJECTS)
3156
3157
LTLIBx265 = @LTLIBx265@
3157
3158
LTLIBxml = @LTLIBxml@
3158
3159
LTLIBzvbi = @LTLIBzvbi@
3159
 
LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
3160
3160
LUAC = @LUAC@
3161
3161
LUA_CFLAGS = @LUA_CFLAGS@
3162
3162
LUA_LIBS = @LUA_LIBS@
3326
3326
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
3327
3327
XINERAMA_CFLAGS = @XINERAMA_CFLAGS@
3328
3328
XINERAMA_LIBS = @XINERAMA_LIBS@
 
3329
XI_CFLAGS = @XI_CFLAGS@
 
3330
XI_LIBS = @XI_LIBS@
3329
3331
XMKMF = @XMKMF@
3330
3332
XPM_CFLAGS = @XPM_CFLAGS@
3331
3333
XPM_LIBS = @XPM_LIBS@
3386
3388
prefix = @prefix@
3387
3389
program_transform_name = @program_transform_name@
3388
3390
psdir = @psdir@
 
3391
runstatedir = @runstatedir@
3389
3392
sbindir = @sbindir@
3390
3393
sharedstatedir = @sharedstatedir@
3391
3394
soliddatadir = @soliddatadir@
4445
4448
libsmooth_plugin_la_CFLAGS = $(AM_CFLAGS)
4446
4449
libhttplive_plugin_la_SOURCES = stream_filter/httplive.c
4447
4450
libhttplive_plugin_la_CFLAGS = $(AM_CFLAGS) $(GCRYPT_CFLAGS)
4448
 
libhttplive_plugin_la_LIBADD = $(GCRYPT_LIBS) -lgpg-error
 
4451
libhttplive_plugin_la_LIBADD = $(GCRYPT_LIBS) -lgpg-error $(LIBPTHREAD)
4449
4452
librecord_plugin_la_SOURCES = stream_filter/record.c
4450
4453
chromadir = $(pluginsdir)/video_chroma
4451
4454
libchain_plugin_la_SOURCES = video_chroma/chain.c