vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Sun Sep 9 15:46:35 2012 +0300| [b894ea273d3d3b42bb906acc722e153691f7678b] | committer: Rémi Denis-Courmont
Remove recursion into modules/codec/omxil/ > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b894ea273d3d3b42bb906acc722e153691f7678b --- configure.ac | 2 -- modules/codec/Modules.am | 31 ++++++++++++++++++++++++++++++- modules/codec/omxil/Modules.am | 7 ------- 3 files changed, 30 insertions(+), 10 deletions(-) diff --git a/configure.ac b/configure.ac index cc69c87..0fcd602 100644 --- a/configure.ac +++ b/configure.ac @@ -2112,7 +2112,6 @@ AC_ARG_ENABLE(omxil, if test "${enable_omxil}" = "yes" then VLC_ADD_PLUGIN([omxil]) - VLC_ADD_LIBS([omxil], [$LIBDL]) fi dnl @@ -4068,7 +4067,6 @@ AC_CONFIG_FILES([ modules/codec/Makefile modules/codec/avcodec/Makefile modules/codec/loader/Makefile - modules/codec/omxil/Makefile modules/control/Makefile modules/demux/Makefile modules/gui/Makefile diff --git a/modules/codec/Modules.am b/modules/codec/Modules.am index 48b5b4c..0638c23 100644 --- a/modules/codec/Modules.am +++ b/modules/codec/Modules.am @@ -1,4 +1,6 @@ -SUBDIRS = loader avcodec omxil +SUBDIRS = loader avcodec +noinst_HEADERS = + SOURCES_a52 = a52.c a52.h SOURCES_dts = dts.c SOURCES_flac = flac.c @@ -78,3 +80,30 @@ libvlc_LTLIBRARIES += \ libt140_plugin.la \ libstl_plugin.la \ $(NULL) + +### OpenMAX ### +noinst_HEADERS += \ + omxil/OMX_Component.h \ + omxil/OMX_Core.h \ + omxil/OMX_Image.h \ + omxil/OMX_IVCommon.h \ + omxil/OMX_Types.h \ + omxil/OMX_Audio.h \ + omxil/OMX_Index.h \ + omxil/OMX_Other.h \ + omxil/OMX_Video.h + +libomxil_plugin_la_SOURCES = \ + omxil/utils.c omxil_utils.h \ + omxil/h264_nal.h \ + omxil/qcom.c omxil/qcom.h \ + omxil/omxil.c omxil/omxil.h +libomxil_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/omxil +libomxil_plugin_la_LIBADD = $(AM_LIBADD) $(LIBDL) + +libiomx_plugin_la_SOURCES = $(libomxil_plugin_la_SOURCES) +libiomx_plugin_la_CPPFLAGS = $(libomxil_plugin_la_CPPFLAGS) -DUSE_IOMX +libiomx_plugin_la_LIBADD = $(libomxil_plugin_la_LIBADD) + +libvlc_LTLIBRARIES += $(LTLIBomxil) $(LTLIBiomx) +EXTRA_LTLIBRARIES += libomxil_plugin.la libiomx_plugin.la diff --git a/modules/codec/omxil/Modules.am b/modules/codec/omxil/Modules.am deleted file mode 100644 index b22c0a9..0000000 --- a/modules/codec/omxil/Modules.am +++ /dev/null @@ -1,7 +0,0 @@ -SOURCES_omxil = omxil.c utils.c omxil.h omxil_utils.h \ - OMX_Component.h OMX_Core.h OMX_Image.h OMX_IVCommon.h OMX_Types.h \ - OMX_Audio.h OMX_Index.h OMX_Other.h OMX_Video.h ../h264_nal.h \ - qcom.h qcom.c - -CPPFLAGS_iomx = -DUSE_IOMX -SOURCES_iomx = $(SOURCES_omxil) _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
