[vlc-commits] Remove recursion into modules/control/globalhotkeys/

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Sep  9 14:09:37 2012 +0300| [5700f3a79b94d621fbdf72887538f3427a98466a] | committer: Rémi Denis-Courmont

Remove recursion into modules/control/globalhotkeys/

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=5700f3a79b94d621fbdf72887538f3427a98466a
---

 configure.ac                             |    3 ---
 modules/control/Modules.am               |   11 ++++++++++-
 modules/control/globalhotkeys/Modules.am |   10 ----------
 3 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/configure.ac b/configure.ac
index 5ac5368..5f72eba 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2973,8 +2973,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.])
@@ -4076,7 +4074,6 @@ AC_CONFIG_FILES([
   modules/codec/spudec/Makefile
   modules/codec/wmafixed/Makefile
   modules/control/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 0f3c572..96fc60a 100644
--- a/modules/control/Modules.am
+++ b/modules/control/Modules.am
@@ -1,4 +1,3 @@
-SUBDIRS = globalhotkeys
 SOURCES_dummy = dummy.c
 SOURCES_gestures = gestures.c
 SOURCES_netsync = netsync.c
@@ -36,9 +35,19 @@ 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)
+
 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)
-