Commit 8034e01d authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

packetizer: remove Makefile recursion

Also fix dependency on codec/h264_nal.lo
parent 7e19ed8b
...@@ -4150,7 +4150,6 @@ AC_CONFIG_FILES([ ...@@ -4150,7 +4150,6 @@ AC_CONFIG_FILES([
modules/gui/qt4/Makefile modules/gui/qt4/Makefile
modules/gui/skins2/Makefile modules/gui/skins2/Makefile
modules/mux/Makefile modules/mux/Makefile
modules/packetizer/Makefile
modules/stream_out/Makefile modules/stream_out/Makefile
modules/text_renderer/Makefile modules/text_renderer/Makefile
modules/video_filter/Makefile modules/video_filter/Makefile
......
...@@ -7,7 +7,6 @@ BASE_SUBDIRS = \ ...@@ -7,7 +7,6 @@ BASE_SUBDIRS = \
audio_filter \ audio_filter \
control \ control \
gui \ gui \
packetizer \
text_renderer \ text_renderer \
video_filter \ video_filter \
visualization visualization
...@@ -46,6 +45,7 @@ include lua/Makefile.am ...@@ -46,6 +45,7 @@ include lua/Makefile.am
include meta_engine/Makefile.am include meta_engine/Makefile.am
include misc/Makefile.am include misc/Makefile.am
include notify/Makefile.am include notify/Makefile.am
include packetizer/Makefile.am
include services_discovery/Makefile.am include services_discovery/Makefile.am
include stream_filter/Makefile.am include stream_filter/Makefile.am
include video_chroma/Makefile.am include video_chroma/Makefile.am
......
SOURCES_packetizer_copy = copy.c packetizerdir = $(pluginsdir)/packetizer
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 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
packetizer_LTLIBRARIES += \ noinst_HEADERS += packetizer/packetizer_helper.h
packetizer_LTLIBRARIES = \
libpacketizer_mpegvideo_plugin.la \ libpacketizer_mpegvideo_plugin.la \
libpacketizer_mpeg4video_plugin.la \ libpacketizer_mpeg4video_plugin.la \
libpacketizer_mpeg4audio_plugin.la \ libpacketizer_mpeg4audio_plugin.la \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment