From 0892e0857298b9a189dcd2e16c6e830ef6b1f7d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net> Date: Sun, 22 Sep 2013 18:52:25 +0300 Subject: [PATCH] modules: link to pthread only when needed --- modules/access/Makefile.am | 6 +++--- modules/access/rtp/Makefile.am | 4 ++-- modules/access_output/Modules.am | 2 +- modules/common.am | 2 +- modules/lua/Makefile.am | 2 +- modules/misc/Modules.am | 4 ++-- modules/services_discovery/Makefile.am | 1 + modules/stream_filter/Makefile.am | 1 + modules/stream_out/Modules.am | 2 +- modules/video_filter/Modules.am | 2 +- modules/visualization/Modules.am | 2 +- 11 files changed, 15 insertions(+), 13 deletions(-) diff --git a/modules/access/Makefile.am b/modules/access/Makefile.am index eef8e38bcbb2..6b48799579ac 100644 --- a/modules/access/Makefile.am +++ b/modules/access/Makefile.am @@ -108,7 +108,7 @@ EXTRA_LTLIBRARIES += libdc1394_plugin.la libdv1394_plugin_la_SOURCES = access/dv.c 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)' access_LTLIBRARIES += $(LTLIBdv1394) EXTRA_LTLIBRARIES += libdv1394_plugin.la @@ -158,7 +158,7 @@ libv4l2_plugin_la_SOURCES = \ access/v4l2/v4l2.h libv4l2_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/access/v4l2 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 access_LTLIBRARIES += libv4l2_plugin.la endif @@ -373,7 +373,7 @@ libtcp_plugin_la_LIBADD = $(SOCKET_LIBS) access_LTLIBRARIES += libtcp_plugin.la 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 libsftp_plugin_la_SOURCES = access/sftp.c diff --git a/modules/access/rtp/Makefile.am b/modules/access/rtp/Makefile.am index 235822a921e7..634b2f3af871 100644 --- a/modules/access/rtp/Makefile.am +++ b/modules/access/rtp/Makefile.am @@ -10,14 +10,14 @@ librtp_plugin_la_SOURCES = \ session.c \ xiph.c librtp_plugin_la_CFLAGS = $(AM_CFLAGS) -librtp_plugin_la_LIBADD = $(SOCKET_LIBS) +librtp_plugin_la_LIBADD = $(SOCKET_LIBS) $(LIBPTHREAD) # Secure RTP library libvlc_srtp_la_SOURCES = srtp.c libvlc_srtp_la_CPPFLAGS = libvlc_srtp_la_CFLAGS = $(GCRYPT_CFLAGS) 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_LDADD = libvlc_srtp.la srtp_test_aes_CPPFLAGS = diff --git a/modules/access_output/Modules.am b/modules/access_output/Modules.am index fdb4b068804c..9bf25fc20fc1 100644 --- a/modules/access_output/Modules.am +++ b/modules/access_output/Modules.am @@ -9,7 +9,7 @@ access_output_LTLIBRARIES += \ libaccess_output_http_plugin.la 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 libaccess_output_livehttp_plugin_la_SOURCES = livehttp.c diff --git a/modules/common.am b/modules/common.am index e6d03ddb7eed..94fb399bd067 100644 --- a/modules/common.am +++ b/modules/common.am @@ -31,7 +31,7 @@ AM_LDFLAGS = \ -export-symbols-regex ^vlc_entry \ -shrext $(LIBEXT) \ -no-undefined \ - $(LTLIBVLCCORE) $(top_builddir)/compat/libcompat.la $(LIBPTHREAD) + $(LTLIBVLCCORE) $(top_builddir)/compat/libcompat.la if HAVE_WIN32 AM_LDFLAGS += $(top_builddir)/modules/module.rc.lo endif diff --git a/modules/lua/Makefile.am b/modules/lua/Makefile.am index 006587b98a04..9f83626a918f 100644 --- a/modules/lua/Makefile.am +++ b/modules/lua/Makefile.am @@ -35,7 +35,7 @@ if HAVE_WIN32 liblua_plugin_la_SOURCES += libs/win.c endif 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 lua_LTLIBRARIES = liblua_plugin.la #endif diff --git a/modules/misc/Modules.am b/modules/misc/Modules.am index aa317c3d1c3a..e5a082b9a2af 100644 --- a/modules/misc/Modules.am +++ b/modules/misc/Modules.am @@ -3,7 +3,7 @@ SOURCES_vod_rtsp = rtsp.c SOURCES_xml = xml/libxml.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 libexport_plugin_la_SOURCES = \ @@ -16,7 +16,7 @@ misc_LTLIBRARIES += libexport_plugin.la libfingerprinter_plugin_la_SOURCES = fingerprinter.c \ webservices/acoustid.c webservices/acoustid.h \ webservices/json.c webservices/json.h -libfingerprinter_plugin_la_LIBADD = $(LIBM) +libfingerprinter_plugin_la_LIBADD = $(LIBM) $(LIBPTHREAD) misc_LTLIBRARIES += libfingerprinter_plugin.la libgnutls_plugin_la_SOURCES = gnutls.c dhparams.h diff --git a/modules/services_discovery/Makefile.am b/modules/services_discovery/Makefile.am index 71358431d9be..11fca94cb33d 100644 --- a/modules/services_discovery/Makefile.am +++ b/modules/services_discovery/Makefile.am @@ -5,6 +5,7 @@ libmediadirs_plugin_la_SOURCES = services_discovery/mediadirs.c sd_LTLIBRARIES += libmediadirs_plugin.la libpodcast_plugin_la_SOURCES = services_discovery/podcast.c +libpodcast_plugin_la_LIBADD = $(LIBPTHREAD) sd_LTLIBRARIES += libpodcast_plugin.la libsap_plugin_la_SOURCES = services_discovery/sap.c diff --git a/modules/stream_filter/Makefile.am b/modules/stream_filter/Makefile.am index 159e823983b7..def48039e0a8 100644 --- a/modules/stream_filter/Makefile.am +++ b/modules/stream_filter/Makefile.am @@ -4,6 +4,7 @@ stream_filterdir = $(pluginsdir)/stream_filter stream_filter_LTLIBRARIES = libdecomp_plugin_la_SOURCES = decomp.c +libdecomp_plugin_la_LIBADD = $(LIBPTHREAD) if !HAVE_WIN32 stream_filter_LTLIBRARIES += libdecomp_plugin.la endif diff --git a/modules/stream_out/Modules.am b/modules/stream_out/Modules.am index 9e2403397fca..0d9cd8a5326a 100644 --- a/modules/stream_out/Modules.am +++ b/modules/stream_out/Modules.am @@ -45,7 +45,7 @@ stream_out_LTLIBRARIES += \ libstream_out_rtp_plugin_la_SOURCES = \ 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_LIBADD = $(SOCKET_LIBS) +libstream_out_rtp_plugin_la_LIBADD = $(SOCKET_LIBS) $(LIBPTHREAD) if HAVE_GCRYPT SRTP_CFLAGS = -I$(top_srcdir)/modules/access/rtp SRTP_LIBS = $(top_builddir)/modules/access/rtp/libvlc_srtp.la diff --git a/modules/video_filter/Modules.am b/modules/video_filter/Modules.am index 9caf978ab67e..9e329c87e493 100644 --- a/modules/video_filter/Modules.am +++ b/modules/video_filter/Modules.am @@ -43,7 +43,7 @@ endif libremoteosd_plugin_la_SOURCES = remoteosd.c remoteosd_rfbproto.h 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 video_filter_LTLIBRARIES += libremoteosd_plugin.la endif diff --git a/modules/visualization/Modules.am b/modules/visualization/Modules.am index 37fe765352be..b5de5b49dc48 100644 --- a/modules/visualization/Modules.am +++ b/modules/visualization/Modules.am @@ -2,7 +2,7 @@ SOURCES_goom = goom.c libprojectm_plugin_la_SOURCES = projectm.cpp 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 visualization_LTLIBRARIES += $(LTLIBprojectm) -- GitLab