vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Mon Feb 9 20:18:54 2015 +0200| [8034e01d877ad75d8d9e2caf0657edbee6ba40cc] | committer: Rémi Denis-Courmont
packetizer: remove Makefile recursion Also fix dependency on codec/h264_nal.lo > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=8034e01d877ad75d8d9e2caf0657edbee6ba40cc --- configure.ac | 1 - modules/Makefile.am | 2 +- modules/packetizer/.gitignore | 1 - modules/packetizer/Makefile.am | 31 +++++++++++++++++++++++++++++++ modules/packetizer/Modules.am | 27 --------------------------- 5 files changed, 32 insertions(+), 30 deletions(-) diff --git a/configure.ac b/configure.ac index 2fcbd4c..007b99f 100644 --- a/configure.ac +++ b/configure.ac @@ -4150,7 +4150,6 @@ AC_CONFIG_FILES([ modules/gui/qt4/Makefile modules/gui/skins2/Makefile modules/mux/Makefile - modules/packetizer/Makefile modules/stream_out/Makefile modules/text_renderer/Makefile modules/video_filter/Makefile diff --git a/modules/Makefile.am b/modules/Makefile.am index c5d59b2..5aa6b23 100644 --- a/modules/Makefile.am +++ b/modules/Makefile.am @@ -7,7 +7,6 @@ BASE_SUBDIRS = \ audio_filter \ control \ gui \ - packetizer \ text_renderer \ video_filter \ visualization @@ -46,6 +45,7 @@ include lua/Makefile.am include meta_engine/Makefile.am include misc/Makefile.am include notify/Makefile.am +include packetizer/Makefile.am include services_discovery/Makefile.am include stream_filter/Makefile.am include video_chroma/Makefile.am diff --git a/modules/packetizer/.gitignore b/modules/packetizer/.gitignore deleted file mode 100644 index 08a6d72..0000000 --- a/modules/packetizer/.gitignore +++ /dev/null @@ -1 +0,0 @@ -Makefile.am diff --git a/modules/packetizer/Makefile.am b/modules/packetizer/Makefile.am new file mode 100644 index 0000000..ff28b08 --- /dev/null +++ b/modules/packetizer/Makefile.am @@ -0,0 +1,31 @@ +packetizerdir = $(pluginsdir)/packetizer + +libpacketizer_copy_plugin_la_SOURCES = packetizer/copy.c +libpacketizer_mpegvideo_plugin_la_SOURCES = packetizer/mpegvideo.c +libpacketizer_mpeg4video_plugin_la_SOURCES = packetizer/mpeg4video.c +libpacketizer_mpeg4audio_plugin_la_SOURCES = packetizer/mpeg4audio.c +libpacketizer_h264_plugin_la_SOURCES = \ + codec/h264_nal.c codec/h264_nal.h \ + packetizer/h264.c +libpacketizer_vc1_plugin_la_SOURCES = packetizer/vc1.c +libpacketizer_mlp_plugin_la_SOURCES = packetizer/mlp.c +libpacketizer_dirac_plugin_la_SOURCES = packetizer/dirac.c +libpacketizer_flac_plugin_la_SOURCES = packetizer/flac.c +libpacketizer_hevc_plugin_la_SOURCES = packetizer/hevc.c + +noinst_HEADERS += packetizer/packetizer_helper.h + +packetizer_LTLIBRARIES = \ + libpacketizer_mpegvideo_plugin.la \ + libpacketizer_mpeg4video_plugin.la \ + libpacketizer_mpeg4audio_plugin.la \ + libpacketizer_h264_plugin.la \ + libpacketizer_vc1_plugin.la \ + libpacketizer_mlp_plugin.la \ + libpacketizer_dirac_plugin.la \ + libpacketizer_flac_plugin.la \ + libpacketizer_hevc_plugin.la \ + $(NULL) +if ENABLE_SOUT +packetizer_LTLIBRARIES += libpacketizer_copy_plugin.la +endif diff --git a/modules/packetizer/Modules.am b/modules/packetizer/Modules.am deleted file mode 100644 index cc93ea1..0000000 --- a/modules/packetizer/Modules.am +++ /dev/null @@ -1,27 +0,0 @@ -SOURCES_packetizer_copy = copy.c -SOURCES_packetizer_mpegvideo = mpegvideo.c -SOURCES_packetizer_mpeg4video = mpeg4video.c -SOURCES_packetizer_mpeg4audio = mpeg4audio.c -SOURCES_packetizer_h264 = h264.c ../codec/h264_nal.c ../codec/h264_nal.h -SOURCES_packetizer_vc1 = vc1.c -SOURCES_packetizer_mlp = mlp.c -SOURCES_packetizer_dirac = dirac.c -SOURCES_packetizer_flac = flac.c -SOURCES_packetizer_hevc = hevc.c - -noinst_HEADERS = packetizer_helper.h - -packetizer_LTLIBRARIES += \ - libpacketizer_mpegvideo_plugin.la \ - libpacketizer_mpeg4video_plugin.la \ - libpacketizer_mpeg4audio_plugin.la \ - libpacketizer_h264_plugin.la \ - libpacketizer_vc1_plugin.la \ - libpacketizer_mlp_plugin.la \ - libpacketizer_dirac_plugin.la \ - libpacketizer_flac_plugin.la \ - libpacketizer_hevc_plugin.la \ - $(NULL) -if ENABLE_SOUT -packetizer_LTLIBRARIES += libpacketizer_copy_plugin.la -endif _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
