Remove recursion into modules/mux/mpeg/

diff --git a/configure.ac b/configure.ac
index 9257c9c333d61e08c41cbe2efdf2c30c9d78ad26..66d6d0621c1bde7c548c4adf9aaefedb01694436 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4156,7 +4156,6 @@ AC_CONFIG_FILES([
   modules/misc/stats/Makefile
   modules/media_library/Makefile
   modules/mux/Makefile
-  modules/mux/mpeg/Makefile
   modules/notify/Makefile
   modules/packetizer/Makefile
   modules/services_discovery/Makefile

diff --git a/modules/mux/Modules.am b/modules/mux/Modules.am
index beb6dd82b241c97dc48f9685e5aa791dcef692b5..dec871c0300db29a6a850b1e326d36023dd40919 100644 (file)
--- a/modules/mux/Modules.am
+++ b/modules/mux/Modules.am
@@ -1,4 +1,3 @@
-SUBDIRS = mpeg
 SOURCES_mux_dummy = dummy.c
 SOURCES_mux_avi = avi.c
 SOURCES_mux_ogg = ogg.c
@@ -16,6 +15,13 @@ libvlc_LTLIBRARIES += \
        libmux_mpjpeg_plugin.la \
        $(NULL)
 
+libmux_ps_plugin_la_SOURCES = \
+       mpeg/pes.c mpeg/pes.h \
+       mpeg/ps.c mpeg/bits.h
+libmux_ps_plugin_la_CFLAGS = $(AM_CLFAGS)
+libmux_ps_plugin_la_LIBADD = $(AM_LIBADD)
+libvlc_LTLIBRARIES += libmux_ps_plugin.la
+
 libmux_ts_plugin_la_SOURCES = \
        mpeg/pes.c mpeg/pes.h \
        mpeg/csa.c mpeg/csa.h \

diff --git a/modules/mux/mpeg/Modules.am b/modules/mux/mpeg/Modules.am
deleted file mode 100644 (file)
index 3fccb60..0000000
--- a/modules/mux/mpeg/Modules.am
+++ /dev/null
@@ -1,6 +0,0 @@
-SOURCES_mux_ps = ps.c \
-                 pes.c \
-                 pes.h \
-                 bits.h \
-                 $(NULL)
-libvlc_LTLIBRARIES += libmux_ps_plugin.la