Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-2-2
Commits
0892e085
Commit
0892e085
authored
Sep 22, 2013
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
modules: link to pthread only when needed
parent
05332465
Changes
11
Show whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
15 additions
and
13 deletions
+15
-13
modules/access/Makefile.am
modules/access/Makefile.am
+3
-3
modules/access/rtp/Makefile.am
modules/access/rtp/Makefile.am
+2
-2
modules/access_output/Modules.am
modules/access_output/Modules.am
+1
-1
modules/common.am
modules/common.am
+1
-1
modules/lua/Makefile.am
modules/lua/Makefile.am
+1
-1
modules/misc/Modules.am
modules/misc/Modules.am
+2
-2
modules/services_discovery/Makefile.am
modules/services_discovery/Makefile.am
+1
-0
modules/stream_filter/Makefile.am
modules/stream_filter/Makefile.am
+1
-0
modules/stream_out/Modules.am
modules/stream_out/Modules.am
+1
-1
modules/video_filter/Modules.am
modules/video_filter/Modules.am
+1
-1
modules/visualization/Modules.am
modules/visualization/Modules.am
+1
-1
No files found.
modules/access/Makefile.am
View file @
0892e085
...
@@ -108,7 +108,7 @@ EXTRA_LTLIBRARIES += libdc1394_plugin.la
...
@@ -108,7 +108,7 @@ EXTRA_LTLIBRARIES += libdc1394_plugin.la
libdv1394_plugin_la_SOURCES
=
access/dv.c
libdv1394_plugin_la_SOURCES
=
access/dv.c
libdv1394_plugin_la_CFLAGS
=
$(AM_CFLAGS)
$(DV1394_CFLAGS)
libdv1394_plugin_la_CFLAGS
=
$(AM_CFLAGS)
$(DV1394_CFLAGS)
libdv1394_plugin_la_LIBADD
=
$(DV1394_LIBS)
libdv1394_plugin_la_LIBADD
=
$(DV1394_LIBS)
$(LIBPTHREAD)
libdv1394_plugin_la_LDFLAGS
=
$(AM_LDFLAGS)
-rpath
'
$(accessdir)
'
libdv1394_plugin_la_LDFLAGS
=
$(AM_LDFLAGS)
-rpath
'
$(accessdir)
'
access_LTLIBRARIES
+=
$(LTLIBdv1394)
access_LTLIBRARIES
+=
$(LTLIBdv1394)
EXTRA_LTLIBRARIES
+=
libdv1394_plugin.la
EXTRA_LTLIBRARIES
+=
libdv1394_plugin.la
...
@@ -158,7 +158,7 @@ libv4l2_plugin_la_SOURCES = \
...
@@ -158,7 +158,7 @@ libv4l2_plugin_la_SOURCES = \
access/v4l2/v4l2.h
access/v4l2/v4l2.h
libv4l2_plugin_la_CPPFLAGS
=
$(AM_CPPFLAGS)
-I
$(srcdir)
/access/v4l2
libv4l2_plugin_la_CPPFLAGS
=
$(AM_CPPFLAGS)
-I
$(srcdir)
/access/v4l2
libv4l2_plugin_la_CFLAGS
=
$(AM_CFLAGS)
$(ZVBI_CFLAGS)
libv4l2_plugin_la_CFLAGS
=
$(AM_CFLAGS)
$(ZVBI_CFLAGS)
libv4l2_plugin_la_LIBADD
=
$(LIBDL)
$(LIBM)
$(ZVBI_LIBS)
libv4l2_plugin_la_LIBADD
=
$(LIBDL)
$(LIBM)
$(ZVBI_LIBS)
$(LIBPTHREAD)
if
HAVE_V4L2
if
HAVE_V4L2
access_LTLIBRARIES
+=
libv4l2_plugin.la
access_LTLIBRARIES
+=
libv4l2_plugin.la
endif
endif
...
@@ -373,7 +373,7 @@ libtcp_plugin_la_LIBADD = $(SOCKET_LIBS)
...
@@ -373,7 +373,7 @@ libtcp_plugin_la_LIBADD = $(SOCKET_LIBS)
access_LTLIBRARIES
+=
libtcp_plugin.la
access_LTLIBRARIES
+=
libtcp_plugin.la
libudp_plugin_la_SOURCES
=
access/udp.c
libudp_plugin_la_SOURCES
=
access/udp.c
libudp_plugin_la_LIBADD
=
$(SOCKET_LIBS)
libudp_plugin_la_LIBADD
=
$(SOCKET_LIBS)
$(LIBPTHREAD)
access_LTLIBRARIES
+=
libudp_plugin.la
access_LTLIBRARIES
+=
libudp_plugin.la
libsftp_plugin_la_SOURCES
=
access/sftp.c
libsftp_plugin_la_SOURCES
=
access/sftp.c
...
...
modules/access/rtp/Makefile.am
View file @
0892e085
...
@@ -10,14 +10,14 @@ librtp_plugin_la_SOURCES = \
...
@@ -10,14 +10,14 @@ librtp_plugin_la_SOURCES = \
session.c
\
session.c
\
xiph.c
xiph.c
librtp_plugin_la_CFLAGS
=
$(AM_CFLAGS)
librtp_plugin_la_CFLAGS
=
$(AM_CFLAGS)
librtp_plugin_la_LIBADD
=
$(SOCKET_LIBS)
librtp_plugin_la_LIBADD
=
$(SOCKET_LIBS)
$(LIBPTHREAD)
# Secure RTP library
# Secure RTP library
libvlc_srtp_la_SOURCES
=
srtp.c
libvlc_srtp_la_SOURCES
=
srtp.c
libvlc_srtp_la_CPPFLAGS
=
libvlc_srtp_la_CPPFLAGS
=
libvlc_srtp_la_CFLAGS
=
$(GCRYPT_CFLAGS)
libvlc_srtp_la_CFLAGS
=
$(GCRYPT_CFLAGS)
libvlc_srtp_la_LDFLAGS
=
-static
libvlc_srtp_la_LDFLAGS
=
-static
libvlc_srtp_la_LIBADD
=
$(GCRYPT_LIBS)
libvlc_srtp_la_LIBADD
=
$(GCRYPT_LIBS)
$(LIBPTHREAD)
srtp_test_recv_CPPFLAGS
=
srtp_test_recv_CPPFLAGS
=
srtp_test_recv_LDADD
=
libvlc_srtp.la
srtp_test_recv_LDADD
=
libvlc_srtp.la
srtp_test_aes_CPPFLAGS
=
srtp_test_aes_CPPFLAGS
=
...
...
modules/access_output/Modules.am
View file @
0892e085
...
@@ -9,7 +9,7 @@ access_output_LTLIBRARIES += \
...
@@ -9,7 +9,7 @@ access_output_LTLIBRARIES += \
libaccess_output_http_plugin.la
libaccess_output_http_plugin.la
libaccess_output_udp_plugin_la_SOURCES = udp.c
libaccess_output_udp_plugin_la_SOURCES = udp.c
libaccess_output_udp_plugin_la_LIBADD = $(SOCKET_LIBS)
libaccess_output_udp_plugin_la_LIBADD = $(SOCKET_LIBS)
$(LIBPTHREAD)
access_output_LTLIBRARIES += libaccess_output_udp_plugin.la
access_output_LTLIBRARIES += libaccess_output_udp_plugin.la
libaccess_output_livehttp_plugin_la_SOURCES = livehttp.c
libaccess_output_livehttp_plugin_la_SOURCES = livehttp.c
...
...
modules/common.am
View file @
0892e085
...
@@ -31,7 +31,7 @@ AM_LDFLAGS = \
...
@@ -31,7 +31,7 @@ AM_LDFLAGS = \
-export-symbols-regex ^vlc_entry \
-export-symbols-regex ^vlc_entry \
-shrext $(LIBEXT) \
-shrext $(LIBEXT) \
-no-undefined \
-no-undefined \
$(LTLIBVLCCORE) $(top_builddir)/compat/libcompat.la
$(LIBPTHREAD)
$(LTLIBVLCCORE) $(top_builddir)/compat/libcompat.la
if HAVE_WIN32
if HAVE_WIN32
AM_LDFLAGS += $(top_builddir)/modules/module.rc.lo
AM_LDFLAGS += $(top_builddir)/modules/module.rc.lo
endif
endif
modules/lua/Makefile.am
View file @
0892e085
...
@@ -35,7 +35,7 @@ if HAVE_WIN32
...
@@ -35,7 +35,7 @@ if HAVE_WIN32
liblua_plugin_la_SOURCES
+=
libs/win.c
liblua_plugin_la_SOURCES
+=
libs/win.c
endif
endif
liblua_plugin_la_CFLAGS
=
$(AM_CFLAGS)
$(LUA_CFLAGS)
liblua_plugin_la_CFLAGS
=
$(AM_CFLAGS)
$(LUA_CFLAGS)
liblua_plugin_la_LIBADD
=
$(LUA_LIBS)
$(SOCKET_LIBS)
$(LIBDL)
$(LIBM)
liblua_plugin_la_LIBADD
=
$(LUA_LIBS)
$(SOCKET_LIBS)
$(LIBDL)
$(LIBM)
$(LIBPTHREAD)
#if BUILD_LUA
#if BUILD_LUA
lua_LTLIBRARIES
=
liblua_plugin.la
lua_LTLIBRARIES
=
liblua_plugin.la
#endif
#endif
modules/misc/Modules.am
View file @
0892e085
...
@@ -3,7 +3,7 @@ SOURCES_vod_rtsp = rtsp.c
...
@@ -3,7 +3,7 @@ SOURCES_vod_rtsp = rtsp.c
SOURCES_xml = xml/libxml.c
SOURCES_xml = xml/libxml.c
libaudioscrobbler_plugin_la_SOURCES = audioscrobbler.c
libaudioscrobbler_plugin_la_SOURCES = audioscrobbler.c
libaudioscrobbler_plugin_la_LIBADD = $(SOCKET_LIBS)
libaudioscrobbler_plugin_la_LIBADD = $(SOCKET_LIBS)
$(LIBPTHREAD)
misc_LTLIBRARIES += libaudioscrobbler_plugin.la
misc_LTLIBRARIES += libaudioscrobbler_plugin.la
libexport_plugin_la_SOURCES = \
libexport_plugin_la_SOURCES = \
...
@@ -16,7 +16,7 @@ misc_LTLIBRARIES += libexport_plugin.la
...
@@ -16,7 +16,7 @@ misc_LTLIBRARIES += libexport_plugin.la
libfingerprinter_plugin_la_SOURCES = fingerprinter.c \
libfingerprinter_plugin_la_SOURCES = fingerprinter.c \
webservices/acoustid.c webservices/acoustid.h \
webservices/acoustid.c webservices/acoustid.h \
webservices/json.c webservices/json.h
webservices/json.c webservices/json.h
libfingerprinter_plugin_la_LIBADD = $(LIBM)
libfingerprinter_plugin_la_LIBADD = $(LIBM)
$(LIBPTHREAD)
misc_LTLIBRARIES += libfingerprinter_plugin.la
misc_LTLIBRARIES += libfingerprinter_plugin.la
libgnutls_plugin_la_SOURCES = gnutls.c dhparams.h
libgnutls_plugin_la_SOURCES = gnutls.c dhparams.h
...
...
modules/services_discovery/Makefile.am
View file @
0892e085
...
@@ -5,6 +5,7 @@ libmediadirs_plugin_la_SOURCES = services_discovery/mediadirs.c
...
@@ -5,6 +5,7 @@ libmediadirs_plugin_la_SOURCES = services_discovery/mediadirs.c
sd_LTLIBRARIES
+=
libmediadirs_plugin.la
sd_LTLIBRARIES
+=
libmediadirs_plugin.la
libpodcast_plugin_la_SOURCES
=
services_discovery/podcast.c
libpodcast_plugin_la_SOURCES
=
services_discovery/podcast.c
libpodcast_plugin_la_LIBADD
=
$(LIBPTHREAD)
sd_LTLIBRARIES
+=
libpodcast_plugin.la
sd_LTLIBRARIES
+=
libpodcast_plugin.la
libsap_plugin_la_SOURCES
=
services_discovery/sap.c
libsap_plugin_la_SOURCES
=
services_discovery/sap.c
...
...
modules/stream_filter/Makefile.am
View file @
0892e085
...
@@ -4,6 +4,7 @@ stream_filterdir = $(pluginsdir)/stream_filter
...
@@ -4,6 +4,7 @@ stream_filterdir = $(pluginsdir)/stream_filter
stream_filter_LTLIBRARIES
=
stream_filter_LTLIBRARIES
=
libdecomp_plugin_la_SOURCES
=
decomp.c
libdecomp_plugin_la_SOURCES
=
decomp.c
libdecomp_plugin_la_LIBADD
=
$(LIBPTHREAD)
if
!HAVE_WIN32
if
!HAVE_WIN32
stream_filter_LTLIBRARIES
+=
libdecomp_plugin.la
stream_filter_LTLIBRARIES
+=
libdecomp_plugin.la
endif
endif
...
...
modules/stream_out/Modules.am
View file @
0892e085
...
@@ -45,7 +45,7 @@ stream_out_LTLIBRARIES += \
...
@@ -45,7 +45,7 @@ stream_out_LTLIBRARIES += \
libstream_out_rtp_plugin_la_SOURCES = \
libstream_out_rtp_plugin_la_SOURCES = \
rtp.c rtp.h rtpfmt.c rtcp.c rtsp.c vod.c
rtp.c rtp.h rtpfmt.c rtcp.c rtsp.c vod.c
libstream_out_rtp_plugin_la_CFLAGS = $(AM_CFLAGS)
libstream_out_rtp_plugin_la_CFLAGS = $(AM_CFLAGS)
libstream_out_rtp_plugin_la_LIBADD = $(SOCKET_LIBS)
libstream_out_rtp_plugin_la_LIBADD = $(SOCKET_LIBS)
$(LIBPTHREAD)
if HAVE_GCRYPT
if HAVE_GCRYPT
SRTP_CFLAGS = -I$(top_srcdir)/modules/access/rtp
SRTP_CFLAGS = -I$(top_srcdir)/modules/access/rtp
SRTP_LIBS = $(top_builddir)/modules/access/rtp/libvlc_srtp.la
SRTP_LIBS = $(top_builddir)/modules/access/rtp/libvlc_srtp.la
...
...
modules/video_filter/Modules.am
View file @
0892e085
...
@@ -43,7 +43,7 @@ endif
...
@@ -43,7 +43,7 @@ endif
libremoteosd_plugin_la_SOURCES = remoteosd.c remoteosd_rfbproto.h
libremoteosd_plugin_la_SOURCES = remoteosd.c remoteosd_rfbproto.h
libremoteosd_plugin_la_CFLAGS = $(AM_CFLAGS) $(GCRYPT_CFLAGS)
libremoteosd_plugin_la_CFLAGS = $(AM_CFLAGS) $(GCRYPT_CFLAGS)
libremoteosd_plugin_la_LIBADD = $(GCRYPT_LIBS) $(LIBS_remoteosd)
libremoteosd_plugin_la_LIBADD = $(GCRYPT_LIBS) $(LIBS_remoteosd)
$(LIBPTHREAD)
if HAVE_GCRYPT
if HAVE_GCRYPT
video_filter_LTLIBRARIES += libremoteosd_plugin.la
video_filter_LTLIBRARIES += libremoteosd_plugin.la
endif
endif
...
...
modules/visualization/Modules.am
View file @
0892e085
...
@@ -2,7 +2,7 @@ SOURCES_goom = goom.c
...
@@ -2,7 +2,7 @@ SOURCES_goom = goom.c
libprojectm_plugin_la_SOURCES = projectm.cpp
libprojectm_plugin_la_SOURCES = projectm.cpp
libprojectm_plugin_la_CXXFLAGS = $(AM_CXXFLAGS) $(PROJECTM_CFLAGS)
libprojectm_plugin_la_CXXFLAGS = $(AM_CXXFLAGS) $(PROJECTM_CFLAGS)
libprojectm_plugin_la_LIBADD = $(PROJECTM_LIBS)
libprojectm_plugin_la_LIBADD = $(PROJECTM_LIBS)
$(LIBPTHREAD)
EXTRA_LTLIBRARIES += libprojectm_plugin.la
EXTRA_LTLIBRARIES += libprojectm_plugin.la
visualization_LTLIBRARIES += $(LTLIBprojectm)
visualization_LTLIBRARIES += $(LTLIBprojectm)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment