Commit 2585f1d9 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

codec: remove makefile recursion

parent ee8376da
...@@ -4219,7 +4219,6 @@ AC_CONFIG_FILES([ ...@@ -4219,7 +4219,6 @@ AC_CONFIG_FILES([
modules/audio_filter/Makefile modules/audio_filter/Makefile
modules/audio_mixer/Makefile modules/audio_mixer/Makefile
modules/audio_output/Makefile modules/audio_output/Makefile
modules/codec/Makefile
modules/control/Makefile modules/control/Makefile
modules/demux/Makefile modules/demux/Makefile
modules/gui/Makefile modules/gui/Makefile
......
noinst_LTLIBRARIES = noinst_LTLIBRARIES =
noinst_HEADERS =
BASE_SUBDIRS = \ BASE_SUBDIRS = \
access/rtp \ access/rtp \
audio_filter \ audio_filter \
audio_mixer \ audio_mixer \
audio_output \ audio_output \
codec \
control \ control \
demux \ demux \
gui \ gui \
...@@ -57,6 +57,7 @@ endif ...@@ -57,6 +57,7 @@ endif
include common.am include common.am
include access/Makefile.am include access/Makefile.am
include codec/Makefile.am
if HAVE_WIN32 if HAVE_WIN32
module.rc: $(top_builddir)/modules/module.rc.in $(top_builddir)/config.status module.rc: $(top_builddir)/modules/module.rc.in $(top_builddir)/config.status
......
This diff is collapsed.
...@@ -63,7 +63,7 @@ demux_LTLIBRARIES += libavformat_plugin.la ...@@ -63,7 +63,7 @@ demux_LTLIBRARIES += libavformat_plugin.la
endif endif
libes_plugin_la_SOURCES = mpeg/es.c libes_plugin_la_SOURCES = mpeg/es.c
libes_plugin_la_LIBADD = ../codec/libvlc_dts_header.la libes_plugin_la_LIBADD = ../libvlc_dts_header.la
if HAVE_WIN32 if HAVE_WIN32
libes_plugin_la_DEPENDENCIES = libes_plugin.rc.o libes_plugin_la_DEPENDENCIES = libes_plugin.rc.o
endif endif
......
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