vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Sun Sep 9 15:28:31 2012 +0300| [77e35f3dda1eef3cf961f14fe77e1e07e5ad2716] | committer: Rémi Denis-Courmont
Remove recursion into modules/demux/avformat/ > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=77e35f3dda1eef3cf961f14fe77e1e07e5ad2716 --- configure.ac | 11 +++++------ modules/demux/Modules.am | 24 +++++++++++++++++++++++- modules/demux/avformat/Modules.am | 16 ---------------- 3 files changed, 28 insertions(+), 23 deletions(-) diff --git a/configure.ac b/configure.ac index eb36a68..c88e76b 100644 --- a/configure.ac +++ b/configure.ac @@ -157,7 +157,7 @@ case "${host_os}" in LDFLAGS="${LDFLAGS} -Wl,-headerpad_max_install_names ${ARCH_flag}" VLC_ADD_LIBS([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_LIBS([avcodec access_avio swscale postproc i420_rgb_mmx x264 x26410b],[-Wl,-read_only_relocs,suppress]) VLC_ADD_CFLAGS([motion],[-fconstant-cfstrings]) VLC_ADD_LIBS([libvlccore],[-Wl,-framework,CoreFoundation]) @@ -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 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 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="" @@ -2393,10 +2393,10 @@ then AC_CHECK_HEADERS(libavutil/avutil.h) AS_IF([test "$enable_merge_ffmpeg" = "no"], [ VLC_ADD_PLUGIN([avformat access_avio]) - VLC_ADD_LIBS([avformat access_avio],[$AVFORMAT_LIBS $AVUTIL_LIBS]) - VLC_ADD_CFLAGS([avformat access_avio],[$AVFORMAT_CFLAGS $AVUTIL_CFLAGS]) + VLC_ADD_LIBS([access_avio],[$AVFORMAT_LIBS $AVUTIL_LIBS]) + VLC_ADD_CFLAGS([access_avio],[$AVFORMAT_CFLAGS $AVUTIL_CFLAGS]) AS_IF([test "${ac_cv_ld_bsymbolic}" != "no"], [ - VLC_ADD_LIBS([avformat access_avio],[-Wl,-Bsymbolic]) + VLC_ADD_LDFLAGS([avformat access_avio],[-Wl,-Bsymbolic]) ]) ], [ VLC_ADD_LIBS([avcodec],[$AVFORMAT_LIBS $AVUTIL_LIBS]) @@ -4075,7 +4075,6 @@ AC_CONFIG_FILES([ modules/codec/wmafixed/Makefile modules/control/Makefile modules/demux/Makefile - modules/demux/avformat/Makefile modules/gui/Makefile modules/gui/macosx/Makefile modules/gui/minimal_macosx/Makefile diff --git a/modules/demux/Modules.am b/modules/demux/Modules.am index 69caa3e..2b7ee6e 100644 --- a/modules/demux/Modules.am +++ b/modules/demux/Modules.am @@ -1,4 +1,3 @@ -SUBDIRS = avformat 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 +41,29 @@ 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) +libavformat_plugin_la_SOURCES = avformat/demux.c \ + ../codec/avcodec/fourcc.c \ + ../codec/avcodec/chroma.c \ + ../codec/avcodec/avcommon.h \ + vobsub.h \ + avformat/avformat.c avformat/avformat.h +if ENABLE_SOUT +libavformat_plugin_la_SOURCES += avformat/mux.c +endif +libavformat_plugin_la_CFLAGS = $(AM_CFLAGS) $(AVFORMAT_CFLAGS) $(AVUTIL_CFLAGS) +libavformat_plugin_la_LIBADD = $(AM_LIBADD) $(AVFORMAT_LIBS) $(AVUTIL_LIBS) \ + $(LIBM) +libavformat_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_avformat) +if HAVE_ZLIB +libavformat_plugin_la_LIBADD += -lz +endif +if HAVE_DARWIN +libavformat_plugin_la_LDFLAGS += -Wl,-read_only_relocs,suppress +endif + +libvlc_LTLIBRARIES += $(LTLIBavformat) +EXTRA_LTLIBRARIES += libavformat_plugin.la + libes_plugin_la_SOURCES = mpeg/es.c libes_plugin_la_CFLAGS = $(AM_CFLAGS) libes_plugin_la_LIBADD = $(AM_LIBADD) diff --git a/modules/demux/avformat/Modules.am b/modules/demux/avformat/Modules.am deleted file mode 100644 index d460c79..0000000 --- a/modules/demux/avformat/Modules.am +++ /dev/null @@ -1,16 +0,0 @@ -SOURCES_avformat = \ - avformat.c \ - avformat.h \ - demux.c \ - ../../codec/avcodec/fourcc.c \ - ../../codec/avcodec/chroma.c \ - ../../codec/avcodec/avcommon.h \ - ../vobsub.h \ - $(NULL) -if ENABLE_SOUT -SOURCES_avformat += mux.c -endif -EXTRA_libavformat_plugin_la_SOURCES = mux.c - -libvlc_LTLIBRARIES += $(LTLIBavformat) -EXTRA_LTLIBRARIES += libavformat_plugin.la _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
