vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Sun Sep 9 14:09:37 2012 +0300| [c6935785a06ee67ff3134f30b20c200ec9d73ebf] | committer: Rémi Denis-Courmont
Remove recursion into modules/control/globalhotkeys/ > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c6935785a06ee67ff3134f30b20c200ec9d73ebf --- configure.ac | 3 --- modules/control/Modules.am | 12 +++++++++++- modules/control/globalhotkeys/Modules.am | 10 ---------- 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/configure.ac b/configure.ac index e75a6c1..e2e356f 100644 --- a/configure.ac +++ b/configure.ac @@ -2989,8 +2989,6 @@ AS_IF([test "${enable_xcb}" != "no"], [ PKG_CHECK_MODULES(XCB_KEYSYMS, [xcb-keysyms >= 0.3.4], [ PKG_CHECK_MODULES(XPROTO, [xproto]) VLC_ADD_PLUGIN([globalhotkeys]) - VLC_ADD_CFLAGS([globalhotkeys], [${XCB_KEYSYMS_CFLAGS} ${XCB_CFLAGS}]) - VLC_ADD_LIBS([globalhotkeys], [${XCB_KEYSYMS_LIBS} ${XCB_LIBS}]) VLC_ADD_CFLAGS([xcb_window], [-DHAVE_XCB_KEYSYMS]) ], [ AC_MSG_WARN([${XCB_KEYSYMS_PKG_ERRORS}. Hotkeys will not work.]) @@ -4093,7 +4091,6 @@ AC_CONFIG_FILES([ modules/codec/wmafixed/Makefile modules/control/Makefile modules/control/dbus/Makefile - modules/control/globalhotkeys/Makefile modules/demux/Makefile modules/demux/asf/Makefile modules/demux/avformat/Makefile diff --git a/modules/control/Modules.am b/modules/control/Modules.am index d0f09e9..faab544 100644 --- a/modules/control/Modules.am +++ b/modules/control/Modules.am @@ -1,4 +1,4 @@ -SUBDIRS = globalhotkeys dbus +SUBDIRS = dbus SOURCES_dummy = dummy.c SOURCES_gestures = gestures.c SOURCES_netsync = netsync.c @@ -23,9 +23,19 @@ libvlc_LTLIBRARIES += \ libhotkeys_plugin.la \ liboldrc_plugin.la if !HAVE_WIN32 +libglobalhotkeys_plugin_la_SOURCES = globalhotkeys/xcb.c +libglobalhotkeys_plugin_la_CFLAGS = $(AM_CFLAGS) $(XCB_KEYSYMS_CFLAGS) $(XCB_CFLAGS) +libglobalhotkeys_plugin_la_LIBADD = $(AM_LIBADD) $(XCB_KEYSYMS_LIBS) $(XCB_LIBS) + libvlc_LTLIBRARIES += \ + $(LTLIBglobalhotkeys) \ libmotion_plugin.la else +libglobalhotkeys_plugin_la_SOURCES = globalhotkeys/win32.c +libglobalhotkeys_plugin_la_CFLAGS = $(AM_CFLAGS) +libglobalhotkeys_plugin_la_LIBADD = $(AM_LIBADD) + libvlc_LTLIBRARIES += \ + libglobalhotkeys_plugin.la \ libntservice_plugin.la endif diff --git a/modules/control/globalhotkeys/Modules.am b/modules/control/globalhotkeys/Modules.am deleted file mode 100644 index 9313114..0000000 --- a/modules/control/globalhotkeys/Modules.am +++ /dev/null @@ -1,10 +0,0 @@ -if HAVE_WIN32 -globalhotkeys_extra = win32.c -else -globalhotkeys_extra = xcb.c -endif - -SOURCES_globalhotkeys = \ - $(globalhotkeys_extra) \ - $(NULL) - _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
