demux: remove makefile recursion

configure.ac

@@ -4220,7 +4220,6 @@ AC_CONFIG_FILES([
   modules/audio_mixer/Makefile
   modules/audio_output/Makefile
   modules/control/Makefile
-  modules/demux/Makefile
   modules/gui/Makefile
   modules/gui/macosx/Makefile
   modules/gui/minimal_macosx/Makefile

modules/Makefile.am

 noinst_LTLIBRARIES =
 noinst_HEADERS =
+
 BASE_SUBDIRS = \
 	access/rtp \
 	audio_filter \
 	audio_mixer \
 	audio_output \
 	control \
-	demux \
 	gui \
 	meta_engine \
 	misc \
@@ -58,6 +58,12 @@ endif
 include common.am
 include access/Makefile.am
 include codec/Makefile.am
+include demux/Makefile.am
+
+BUILT_SOURCES += dummy.cpp
+
+dummy.cpp:
+	touch dummy.cpp
 
 if HAVE_WIN32
 module.rc: $(top_builddir)/modules/module.rc.in $(top_builddir)/config.status

modules/codec/Makefile.am

@@ -26,14 +26,9 @@ codec_LTLIBRARIES += libaes3_plugin.la
 libaraw_plugin_la_SOURCES = codec/araw.c
 codec_LTLIBRARIES += libaraw_plugin.la
 
-libdts_plugin_la_SOURCES = codec/dts.c
-libdts_plugin_la_LIBADD = libvlc_dts_header.la
+libdts_plugin_la_SOURCES = codec/dts.c codec/dts_header.c codec/dts_header.h
 codec_LTLIBRARIES += libdts_plugin.la
 
-libvlc_dts_header_la_SOURCES = codec/dts_header.c codec/dts_header.h
-libvlc_dts_header_la_LDFLAGS = -static
-noinst_LTLIBRARIES += libvlc_dts_header.la
-
 libfaad_plugin_la_SOURCES = codec/faad.c
 libfaad_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_faad)
 libfaad_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)'