vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Sun Sep 9 14:42:41 2012 +0300| [2376deda67279d6f7a237e3e040ad2cc19038449] | committer: Rémi Denis-Courmont
Remove recursion into modules/misc/osd/ > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=2376deda67279d6f7a237e3e040ad2cc19038449 --- configure.ac | 1 - modules/misc/Modules.am | 9 +++++++-- modules/misc/osd/Modules.am | 8 -------- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/configure.ac b/configure.ac index e8b7d29..3aed30a 100644 --- a/configure.ac +++ b/configure.ac @@ -4091,7 +4091,6 @@ AC_CONFIG_FILES([ modules/lua/Makefile modules/meta_engine/Makefile modules/misc/Makefile - modules/misc/osd/Makefile modules/media_library/Makefile modules/mux/Makefile modules/notify/Makefile diff --git a/modules/misc/Modules.am b/modules/misc/Modules.am index a6164e2..03dad06 100644 --- a/modules/misc/Modules.am +++ b/modules/misc/Modules.am @@ -1,5 +1,3 @@ -SUBDIRS = osd - SOURCES_vod_rtsp = rtsp.c SOURCES_audioscrobbler = audioscrobbler.c SOURCES_sqlite = sqlite.c @@ -30,6 +28,13 @@ if HAVE_DBUS libvlc_LTLIBRARIES += libinhibit_plugin.la endif +libosd_parser_plugin_la_SOURCES = \ + osd/parser.c osd/osd_menu.c osd/osd_menu.h osd/simple.c osd/xml.c +libosd_parser_plugin_la_CFLAGS = $(AM_CFLAGS) +libosd_parser_plugin_la_LIBADD = $(AM_LIBADD) +EXTRA_LTLIBRARIES += libosd_parser_plugin.la +libvlc_LTLIBRARIES += $(LTLIBosd_parser) + libxdg_screensaver_plugin_la_SOURCES = inhibit/xdg.c libxdg_screensaver_plugin_la_CFLAGS = $(AM_CFLAGS) libxdg_screensaver_plugin_la_LIBADD = $(AM_LIBADD) diff --git a/modules/misc/osd/Modules.am b/modules/misc/osd/Modules.am deleted file mode 100644 index ac3c7ca..0000000 --- a/modules/misc/osd/Modules.am +++ /dev/null @@ -1,8 +0,0 @@ -SOURCES_osd_parser = \ - parser.c \ - osd_menu.c \ - osd_menu.h \ - simple.c \ - xml.c \ - $(NULL) - _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
