vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Thu Feb 12 08:36:46 2015 +0200| [edba5bbd4520656678c30ebf2ec5a5f85dfce42f] | committer: Rémi Denis-Courmont
configure: move LIBM to Makefiles > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=edba5bbd4520656678c30ebf2ec5a5f85dfce42f --- configure.ac | 1 - modules/codec/Makefile.am | 6 +++--- modules/demux/Makefile.am | 2 +- modules/gui/qt4/Makefile.am | 2 +- modules/video_chroma/Makefile.am | 2 +- 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/configure.ac b/configure.ac index d126790..be35d70 100644 --- a/configure.ac +++ b/configure.ac @@ -699,7 +699,6 @@ AC_CHECK_FUNC(getopt_long,, [ AC_SUBST(GNUGETOPT_LIBS) AC_CHECK_LIB(m,cos,[ - VLC_ADD_LIBS([x264 swscale mpc qt4 x262 x26410b glspectrum smooth],[-lm]) LIBM="-lm" ], [ LIBM="" diff --git a/modules/codec/Makefile.am b/modules/codec/Makefile.am index 0de32a0..9aacefc 100644 --- a/modules/codec/Makefile.am +++ b/modules/codec/Makefile.am @@ -419,7 +419,7 @@ libx262_plugin_la_SOURCES = codec/x264.c libx262_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -DMODULE_NAME_IS_x262 libx262_plugin_la_CFLAGS = $(AM_CFLAGS) $(CFLAGS_x262) libx262_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_x262) -rpath '$(codecdir)' -libx262_plugin_la_LIBADD = $(LIBS_x262) +libx262_plugin_la_LIBADD = $(LIBS_x262) $(LIBM) EXTRA_LTLIBRARIES += libx262_plugin.la codec_LTLIBRARIES += $(LTLIBx262) @@ -427,7 +427,7 @@ libx264_plugin_la_SOURCES = codec/x264.c libx264_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_x264) -DMODULE_NAME_IS_x264 libx264_plugin_la_CFLAGS = $(AM_CFLAGS) $(CFLAGS_x264) libx264_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_x264) -rpath '$(codecdir)' -libx264_plugin_la_LIBADD = $(LIBS_x264) +libx264_plugin_la_LIBADD = $(LIBS_x264) $(LIBM) EXTRA_LTLIBRARIES += libx264_plugin.la codec_LTLIBRARIES += $(LTLIBx264) @@ -435,7 +435,7 @@ libx26410b_plugin_la_SOURCES = codec/x264.c libx26410b_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -DMODULE_NAME_IS_x26410b libx26410b_plugin_la_CFLAGS = $(AM_CFLAGS) $(CFLAGS_x26410b) libx26410b_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_x26410b) -rpath '$(codecdir)' -libx26410b_plugin_la_LIBADD = $(LIBS_x26410b) +libx26410b_plugin_la_LIBADD = $(LIBS_x26410b) $(LIBM) EXTRA_LTLIBRARIES += libx26410b_plugin.la codec_LTLIBRARIES += $(LTLIBx26410b) diff --git a/modules/demux/Makefile.am b/modules/demux/Makefile.am index cc9de91..9744282 100644 --- a/modules/demux/Makefile.am +++ b/modules/demux/Makefile.am @@ -80,7 +80,7 @@ demux_LTLIBRARIES += libnsc_plugin.la libmpc_plugin_la_SOURCES = demux/mpc.c libmpc_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(demuxdir)' -libmpc_plugin_la_LIBADD = $(LIBS_mpc) +libmpc_plugin_la_LIBADD = $(LIBS_mpc) $(LIBM) EXTRA_LTLIBRARIES += libmpc_plugin.la demux_LTLIBRARIES += $(LTLIBmpc) diff --git a/modules/gui/qt4/Makefile.am b/modules/gui/qt4/Makefile.am index 1a564cf..b21b756 100644 --- a/modules/gui/qt4/Makefile.am +++ b/modules/gui/qt4/Makefile.am @@ -15,7 +15,7 @@ guidir = $(pluginsdir)/gui SUFFIXES += .ui .h .hpp .moc.cpp libqt4_plugin_la_CXXFLAGS = $(AM_CXXFLAGS) $(QT_CFLAGS) $(CXXFLAGS_qt4) -libqt4_plugin_la_LIBADD = $(QT_LIBS) $(LIBS_qt4) +libqt4_plugin_la_LIBADD = $(QT_LIBS) $(LIBS_qt4) $(LIBM) libqt4_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(guidir)' if HAVE_OS2 else diff --git a/modules/video_chroma/Makefile.am b/modules/video_chroma/Makefile.am index aa1a826..3aa874c 100644 --- a/modules/video_chroma/Makefile.am +++ b/modules/video_chroma/Makefile.am @@ -8,7 +8,7 @@ libchroma_omx_plugin_la_LIBADD = $(OMXIP_LIBS) libswscale_plugin_la_SOURCES = video_chroma/swscale.c codec/avcodec/chroma.c libswscale_plugin_la_CFLAGS = $(AM_CFLAGS) $(SWSCALE_CFLAGS) -libswscale_plugin_la_LIBADD = $(SWSCALE_LIBS) +libswscale_plugin_la_LIBADD = $(SWSCALE_LIBS) $(LIBM) libswscale_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(chromadir)' libgrey_yuv_plugin_la_SOURCES = video_chroma/grey_yuv.c _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
