Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
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
Commits
edba5bbd
Commit
edba5bbd
authored
Feb 12, 2015
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
configure: move LIBM to Makefiles
parent
8cb900ec
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
6 additions
and
7 deletions
+6
-7
configure.ac
configure.ac
+0
-1
modules/codec/Makefile.am
modules/codec/Makefile.am
+3
-3
modules/demux/Makefile.am
modules/demux/Makefile.am
+1
-1
modules/gui/qt4/Makefile.am
modules/gui/qt4/Makefile.am
+1
-1
modules/video_chroma/Makefile.am
modules/video_chroma/Makefile.am
+1
-1
No files found.
configure.ac
View file @
edba5bbd
...
@@ -699,7 +699,6 @@ AC_CHECK_FUNC(getopt_long,, [
...
@@ -699,7 +699,6 @@ AC_CHECK_FUNC(getopt_long,, [
AC_SUBST(GNUGETOPT_LIBS)
AC_SUBST(GNUGETOPT_LIBS)
AC_CHECK_LIB(m,cos,[
AC_CHECK_LIB(m,cos,[
VLC_ADD_LIBS([x264 swscale mpc qt4 x262 x26410b glspectrum smooth],[-lm])
LIBM="-lm"
LIBM="-lm"
], [
], [
LIBM=""
LIBM=""
...
...
modules/codec/Makefile.am
View file @
edba5bbd
...
@@ -419,7 +419,7 @@ libx262_plugin_la_SOURCES = codec/x264.c
...
@@ -419,7 +419,7 @@ libx262_plugin_la_SOURCES = codec/x264.c
libx262_plugin_la_CPPFLAGS
=
$(AM_CPPFLAGS)
-DMODULE_NAME_IS_x262
libx262_plugin_la_CPPFLAGS
=
$(AM_CPPFLAGS)
-DMODULE_NAME_IS_x262
libx262_plugin_la_CFLAGS
=
$(AM_CFLAGS)
$(CFLAGS_x262)
libx262_plugin_la_CFLAGS
=
$(AM_CFLAGS)
$(CFLAGS_x262)
libx262_plugin_la_LDFLAGS
=
$(AM_LDFLAGS)
$(LDFLAGS_x262)
-rpath
'
$(codecdir)
'
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
EXTRA_LTLIBRARIES
+=
libx262_plugin.la
codec_LTLIBRARIES
+=
$(LTLIBx262)
codec_LTLIBRARIES
+=
$(LTLIBx262)
...
@@ -427,7 +427,7 @@ libx264_plugin_la_SOURCES = codec/x264.c
...
@@ -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_CPPFLAGS
=
$(AM_CPPFLAGS)
$(CPPFLAGS_x264)
-DMODULE_NAME_IS_x264
libx264_plugin_la_CFLAGS
=
$(AM_CFLAGS)
$(CFLAGS_x264)
libx264_plugin_la_CFLAGS
=
$(AM_CFLAGS)
$(CFLAGS_x264)
libx264_plugin_la_LDFLAGS
=
$(AM_LDFLAGS)
$(LDFLAGS_x264)
-rpath
'
$(codecdir)
'
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
EXTRA_LTLIBRARIES
+=
libx264_plugin.la
codec_LTLIBRARIES
+=
$(LTLIBx264)
codec_LTLIBRARIES
+=
$(LTLIBx264)
...
@@ -435,7 +435,7 @@ libx26410b_plugin_la_SOURCES = codec/x264.c
...
@@ -435,7 +435,7 @@ libx26410b_plugin_la_SOURCES = codec/x264.c
libx26410b_plugin_la_CPPFLAGS
=
$(AM_CPPFLAGS)
-DMODULE_NAME_IS_x26410b
libx26410b_plugin_la_CPPFLAGS
=
$(AM_CPPFLAGS)
-DMODULE_NAME_IS_x26410b
libx26410b_plugin_la_CFLAGS
=
$(AM_CFLAGS)
$(CFLAGS_x26410b)
libx26410b_plugin_la_CFLAGS
=
$(AM_CFLAGS)
$(CFLAGS_x26410b)
libx26410b_plugin_la_LDFLAGS
=
$(AM_LDFLAGS)
$(LDFLAGS_x26410b)
-rpath
'
$(codecdir)
'
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
EXTRA_LTLIBRARIES
+=
libx26410b_plugin.la
codec_LTLIBRARIES
+=
$(LTLIBx26410b)
codec_LTLIBRARIES
+=
$(LTLIBx26410b)
...
...
modules/demux/Makefile.am
View file @
edba5bbd
...
@@ -80,7 +80,7 @@ demux_LTLIBRARIES += libnsc_plugin.la
...
@@ -80,7 +80,7 @@ demux_LTLIBRARIES += libnsc_plugin.la
libmpc_plugin_la_SOURCES
=
demux/mpc.c
libmpc_plugin_la_SOURCES
=
demux/mpc.c
libmpc_plugin_la_LDFLAGS
=
$(AM_LDFLAGS)
-rpath
'
$(demuxdir)
'
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
EXTRA_LTLIBRARIES
+=
libmpc_plugin.la
demux_LTLIBRARIES
+=
$(LTLIBmpc)
demux_LTLIBRARIES
+=
$(LTLIBmpc)
...
...
modules/gui/qt4/Makefile.am
View file @
edba5bbd
...
@@ -15,7 +15,7 @@ guidir = $(pluginsdir)/gui
...
@@ -15,7 +15,7 @@ guidir = $(pluginsdir)/gui
SUFFIXES
+=
.ui .h .hpp .moc.cpp
SUFFIXES
+=
.ui .h .hpp .moc.cpp
libqt4_plugin_la_CXXFLAGS
=
$(AM_CXXFLAGS)
$(QT_CFLAGS)
$(CXXFLAGS_qt4)
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)
'
libqt4_plugin_la_LDFLAGS
=
$(AM_LDFLAGS)
-rpath
'
$(guidir)
'
if
HAVE_OS2
if
HAVE_OS2
else
else
...
...
modules/video_chroma/Makefile.am
View file @
edba5bbd
...
@@ -8,7 +8,7 @@ libchroma_omx_plugin_la_LIBADD = $(OMXIP_LIBS)
...
@@ -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_SOURCES
=
video_chroma/swscale.c codec/avcodec/chroma.c
libswscale_plugin_la_CFLAGS
=
$(AM_CFLAGS)
$(SWSCALE_CFLAGS)
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)
'
libswscale_plugin_la_LDFLAGS
=
$(AM_LDFLAGS)
-rpath
'
$(chromadir)
'
libgrey_yuv_plugin_la_SOURCES
=
video_chroma/grey_yuv.c
libgrey_yuv_plugin_la_SOURCES
=
video_chroma/grey_yuv.c
...
...
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