globalhotkeys: use different names for Win32 and XCB targets

This works around an automake limitation with multiple directory
prefixes.

diff --git a/configure.ac b/configure.ac
index 4633b568aab7211934c78c7474b68c3d31b2630d..8b1de34a6938db098853d5e4f0c6f029e7deb998 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3059,7 +3059,7 @@ AS_IF([test "${enable_xcb}" != "no"], [
 
     dnl xcb-utils
     PKG_CHECK_MODULES(XCB_KEYSYMS, [xcb-keysyms >= 0.3.4], [
-      VLC_ADD_PLUGIN([globalhotkeys])
+      VLC_ADD_PLUGIN([xcb_hotkeys])
       VLC_ADD_CFLAGS([xcb_window], [-DHAVE_XCB_KEYSYMS])
     ], [
       AC_MSG_WARN([${XCB_KEYSYMS_PKG_ERRORS}. Hotkeys will not work.])

diff --git a/modules/control/Modules.am b/modules/control/Modules.am
index 30549d883ee8da8f5e33506413ea308a242d2b7b..37b93579d7095b4db1925be7c14bdc56f28c869c 100644 (file)
--- a/modules/control/Modules.am
+++ b/modules/control/Modules.am
@@ -24,6 +24,12 @@ libvlc_LTLIBRARIES += \
        libhotkeys_plugin.la \
        liboldrc_plugin.la
 
+if HAVE_WIN32
+libvlc_LTLIBRARIES += libntservice_plugin.la
+else
+libvlc_LTLIBRARIES += libmotion_plugin.la
+endif
+
 libdbus_plugin_la_SOURCES = \
        dbus/dbus_introspect.h dbus/dbus_common.h \
        dbus/dbus_root.c dbus/dbus_root.h \
@@ -36,21 +42,16 @@ if HAVE_DBUS
 libvlc_LTLIBRARIES += libdbus_plugin.la
 endif
 
-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)
-libglobalhotkeys_plugin_la_DEPENDENCIES = libglobalhotkeys_plugin.rc.o
+libxcb_hotkeys_plugin_la_SOURCES = globalhotkeys/xcb.c
+libxcb_hotkeys_plugin_la_CFLAGS = $(AM_CFLAGS) \
+       $(XCB_KEYSYMS_CFLAGS) $(XCB_CFLAGS)
+libxcb_hotkeys_plugin_la_LIBADD = $(AM_LIBADD) $(XCB_KEYSYMS_LIBS) $(XCB_LIBS)
+EXTRA_LTLIBRARIES += libxcb_hotkeys_plugin.la
+libvlc_LTLIBRARIES += $(LTLIBxcb_hotkeys)
 
-libvlc_LTLIBRARIES += \
-       libglobalhotkeys_plugin.la \
-       libntservice_plugin.la
-endif  
+libwin_hotkeys_plugin_la_SOURCES = globalhotkeys/win32.c
+libwin_hotkeys_plugin_la_CFLAGS = $(AM_CFLAGS)
+libwin_hotkeys_plugin_la_LIBADD = $(AM_LIBADD)
+if HAVE_WIN32
+libvlc_LTLIBRARIES += libwin_hotkeys_plugin.la
+endif

diff --git a/modules/control/globalhotkeys/win32.c b/modules/control/globalhotkeys/win32.c
index b67ec2f0791d6a980b0c3c15c36bb500c845a694..f80510ed82305183afea465d7ce16f73f68e8066 100644 (file)
--- a/modules/control/globalhotkeys/win32.c
+++ b/modules/control/globalhotkeys/win32.c
@@ -49,6 +49,7 @@ vlc_module_begin()
     set_description( N_("Global Hotkeys interface") )
     set_capability( "interface", 0 )
     set_callbacks( Open, Close )
+    add_shortcut( "globalhotkeys" )
 vlc_module_end()
 
 struct intf_sys_t

diff --git a/modules/control/globalhotkeys/xcb.c b/modules/control/globalhotkeys/xcb.c
index 05e5a05b8e4e8996bfea08dea122ae8918a993a8..8a4cca9da54822e92670c1b2d8549fd7a847b81d 100644 (file)
--- a/modules/control/globalhotkeys/xcb.c
+++ b/modules/control/globalhotkeys/xcb.c
@@ -52,6 +52,7 @@ vlc_module_begin()
     set_description( N_("Global Hotkeys interface") )
     set_capability( "interface", 0 )
     set_callbacks( Open, Close )
+    add_shortcut( "globalhotkeys" )
 vlc_module_end()
 
 typedef struct