vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Sun Sep 9 15:04:49 2012 +0300| [47f8ffaf94e15983e545f625ec7697956131c723] | committer: Rémi Denis-Courmont
Remove recursion into modules/demux/mp4/ > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=47f8ffaf94e15983e545f625ec7697956131c723 --- configure.ac | 7 +++---- modules/demux/Modules.am | 14 +++++++++++++- modules/demux/mp4/Modules.am | 8 -------- 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/configure.ac b/configure.ac index 72895aa..3f0c9a4 100644 --- a/configure.ac +++ b/configure.ac @@ -155,7 +155,7 @@ case "${host_os}" in CPPFLAGS="${CPPFLAGS} ${ARCH_flag}" OBJCFLAGS="${OBJCFLAGS} -D_INTL_REDIRECT_MACROS -std=gnu99 ${ARCH_flag}" LDFLAGS="${LDFLAGS} -Wl,-headerpad_max_install_names ${ARCH_flag}" - VLC_ADD_LIBS([mkv mp4 motion], [-Wl,-framework,IOKit,-framework,CoreFoundation]) + VLC_ADD_LIBS([mkv motion], [-Wl,-framework,IOKit,-framework,CoreFoundation]) VLC_ADD_LIBS([libvlc vlc],[-Wl,-undefined,dynamic_lookup,-framework,Appkit]) VLC_ADD_LIBS([avcodec avformat access_avio swscale postproc i420_rgb_mmx x264 x26410b],[-Wl,-read_only_relocs,suppress]) VLC_ADD_CFLAGS([motion],[-fconstant-cfstrings]) @@ -619,7 +619,7 @@ AC_CHECK_FUNC(getopt_long,, [ AC_SUBST(GNUGETOPT_LIBS) AC_CHECK_LIB(m,cos,[ - VLC_ADD_LIBS([adjust wave ripple psychedelic gradient a52tofloat32 dtstofloat32 x264 goom panoramix rotate noise grain scene kate flac lua chorus_flanger freetype avcodec avformat access_avio swscale postproc i420_rgb faad twolame equalizer spatializer param_eq samplerate freetype mpc dmo mp4 quicktime qt4 compressor headphone_channel_mixer normvol audiobargraph_a speex opus mono colorthres extract ball access_imem hotkeys mosaic gaussianblur x26410b hqdn3d anaglyph oldrc ncurses],[-lm]) + VLC_ADD_LIBS([adjust wave ripple psychedelic gradient a52tofloat32 dtstofloat32 x264 goom panoramix rotate noise grain scene kate flac lua chorus_flanger freetype avcodec avformat access_avio swscale postproc i420_rgb faad twolame equalizer spatializer param_eq samplerate freetype mpc dmo quicktime qt4 compressor headphone_channel_mixer normvol audiobargraph_a speex opus mono colorthres extract ball access_imem hotkeys mosaic gaussianblur x26410b hqdn3d anaglyph oldrc ncurses],[-lm]) LIBM="-lm" ], [ LIBM="" @@ -739,7 +739,7 @@ AC_CHECK_HEADERS(zlib.h, [ have_zlib=yes ], [ have_zlib=no ]) AM_CONDITIONAL(HAVE_ZLIB, [ test "${have_zlib}" = "yes" ]) if test "${have_zlib}" = "yes" then - VLC_ADD_LIBS([access_http mp4 skins2 sap mkv unzip zip],[-lz]) + VLC_ADD_LIBS([access_http skins2 sap mkv unzip zip],[-lz]) PKG_CHECK_MODULES([MINIZIP], [minizip] , [ have_minizip=yes ], [ AC_CHECK_HEADERS([unzip.h], [ have_minizip=yes @@ -4077,7 +4077,6 @@ AC_CONFIG_FILES([ modules/demux/Makefile modules/demux/avformat/Makefile modules/demux/mkv/Makefile - modules/demux/mp4/Makefile modules/demux/mpeg/Makefile modules/demux/playlist/Makefile modules/gui/Makefile diff --git a/modules/demux/Modules.am b/modules/demux/Modules.am index ac69c3d..70e96d8 100644 --- a/modules/demux/Modules.am +++ b/modules/demux/Modules.am @@ -1,4 +1,4 @@ -SUBDIRS = avformat mkv mp4 mpeg playlist +SUBDIRS = avformat mkv mpeg playlist SOURCES_flacsys = flac.c SOURCES_ogg = ogg.c ogg.h oggseek.c oggseek.h vorbis.h kate_categories.c \ kate_categories.h xiph.h @@ -42,6 +42,17 @@ libavi_plugin_la_SOURCES = avi/avi.c avi/libavi.c avi/libavi.h libavi_plugin_la_CFLAGS = $(AM_CFLAGS) libavi_plugin_la_LIBADD = $(AM_LIBADD) +libmp4_plugin_la_SOURCES = mp4/mp4.c mp4/libmp4.c mp4/libmp4.h mp4/id3genres.h +libmp4_plugin_la_CFLAGS = $(AM_CFLAGS) +libmp4_plugin_la_LIBADD = $(AM_LIBADD) $(LIBM) +libmp4_plugin_la_LDFLAGS = $(AM_LDFLAGS) +if HAVE_ZLIB +libmp4_plugin_la_LIBADD += -lz +endif +if HAVE_DARWIN +libmp4_plugin_la_LDFLAGS += -Wl,-framework,IOKit,-framework,CoreFoundation +endif + libts_plugin_la_SOURCES = ts.c ../mux/mpeg/csa.c dvb-text.h libts_plugin_la_CFLAGS = $(AM_CFLAGS) $(DVBPSI_CFLAGS) libts_plugin_la_LIBADD = $(AM_LIBADD) $(DVBPSI_LIBS) $(SOCKET_LIBS) @@ -60,6 +71,7 @@ libvlc_LTLIBRARIES += \ libdemuxdump_plugin.la \ libflacsys_plugin.la \ libmjpeg_plugin.la \ + libmp4_plugin.la \ libnsc_plugin.la \ libnsv_plugin.la \ libnuv_plugin.la \ diff --git a/modules/demux/mp4/Modules.am b/modules/demux/mp4/Modules.am deleted file mode 100644 index e9fa0b7..0000000 --- a/modules/demux/mp4/Modules.am +++ /dev/null @@ -1,8 +0,0 @@ -SOURCES_mp4 = \ - mp4.c \ - libmp4.c \ - libmp4.h \ - id3genres.h \ - $(NULL) - -libvlc_LTLIBRARIES += libmp4_plugin.la _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
