vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Sun Sep 9 12:37:29 2012 +0300| [ad2d4c2a91a049f0b6a282acef0f8d6bb3639de0] | committer: Rémi Denis-Courmont
Remove recursion into modules/mux/mpeg/ > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=ad2d4c2a91a049f0b6a282acef0f8d6bb3639de0 --- configure.ac | 1 - modules/mux/Modules.am | 8 +++++++- modules/mux/mpeg/Modules.am | 6 ------ 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/configure.ac b/configure.ac index 9257c9c..66d6d06 100644 --- 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 beb6dd8..dec871c 100644 --- 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 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 _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
