vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Sun Sep 9 14:38:42 2012 +0300| [f369524f69cd42ada642b16868bcd54c10308217] | committer: Rémi Denis-Courmont
Remove recursion into modules/misc/stats/ > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=f369524f69cd42ada642b16868bcd54c10308217 --- configure.ac | 1 - modules/misc/Modules.am | 13 +++++++++++-- modules/misc/stats/Modules.am | 9 --------- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/configure.ac b/configure.ac index cfc09a6..e8b7d29 100644 --- a/configure.ac +++ b/configure.ac @@ -4092,7 +4092,6 @@ AC_CONFIG_FILES([ modules/meta_engine/Makefile modules/misc/Makefile modules/misc/osd/Makefile - modules/misc/stats/Makefile modules/media_library/Makefile modules/mux/Makefile modules/notify/Makefile diff --git a/modules/misc/Modules.am b/modules/misc/Modules.am index 6c1d336..a6164e2 100644 --- a/modules/misc/Modules.am +++ b/modules/misc/Modules.am @@ -1,4 +1,4 @@ -SUBDIRS = stats osd +SUBDIRS = osd SOURCES_vod_rtsp = rtsp.c SOURCES_audioscrobbler = audioscrobbler.c @@ -55,9 +55,18 @@ if HAVE_ANDROID liblogger_plugin_la_LIBADD += -llog endif +libstats_plugin_la_SOURCES = \ + stats/demux.c \ + stats/decoder.c \ + stats/encoder.c \ + stats/stats.c stats/stats.h +libstats_plugin_la_CFLAGS = $(AM_CFLAGS) +libstats_plugin_la_LIBADD = $(AM_LIBADD) + libvlc_LTLIBRARIES += \ libaudioscrobbler_plugin.la \ - liblogger_plugin.la + liblogger_plugin.la \ + libstats_plugin.la if ENABLE_SOUT libvlc_LTLIBRARIES += \ diff --git a/modules/misc/stats/Modules.am b/modules/misc/stats/Modules.am deleted file mode 100644 index bd09f78..0000000 --- a/modules/misc/stats/Modules.am +++ /dev/null @@ -1,9 +0,0 @@ -SOURCES_stats = \ - stats.c \ - stats.h \ - decoder.c \ - demux.c \ - encoder.c \ - $(NULL) - -libvlc_LTLIBRARIES += libstats_plugin.la _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
