hotkeys: Fix test (was always true)

[vlc] / modules / control / Modules.am

diff --git a/modules/control/Modules.am b/modules/control/Modules.am
index 406618e0276d05191a884a3603f80a5a007dffe7..30549d883ee8da8f5e33506413ea308a242d2b7b 100644 (file)
--- a/modules/control/Modules.am
+++ b/modules/control/Modules.am
@@ -1,13 +1,10 @@
-SUBDIRS = http
+SOURCES_dummy = dummy.c
 SOURCES_gestures = gestures.c
-SOURCES_showintf = showintf.c
-SOURCES_telnet = telnet.c
 SOURCES_netsync = netsync.c
 SOURCES_ntservice = ntservice.c
 SOURCES_hotkeys = hotkeys.c
 SOURCES_lirc = lirc.c
-SOURCES_rc = rc.c
-SOURCES_dbus = dbus.c dbus.h
+SOURCES_oldrc = rc.c
 if HAVE_DARWIN
 motion_extra = unimotion.c unimotion.h
 else
@@ -15,6 +12,45 @@ motion_extra = $(NULL)
 endif
 SOURCES_motion = \
         motion.c \
+        motionlib.c \
+        motionlib.h \
         $(motion_extra) \
         $(NULL)
 
+libvlc_LTLIBRARIES += \
+       libdummy_plugin.la \
+       libgestures_plugin.la \
+       libnetsync_plugin.la \
+       libhotkeys_plugin.la \
+       liboldrc_plugin.la
+
+libdbus_plugin_la_SOURCES = \
+       dbus/dbus_introspect.h dbus/dbus_common.h \
+       dbus/dbus_root.c dbus/dbus_root.h \
+       dbus/dbus_player.c dbus/dbus_player.h \
+       dbus/dbus_tracklist.c dbus/dbus_tracklist.h \
+       dbus/dbus.c
+libdbus_plugin_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS)
+libdbus_plugin_la_LIBADD = $(AM_LIBADD) $(DBUS_LIBS) $(LIBM)
+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
+
+libvlc_LTLIBRARIES += \
+       libglobalhotkeys_plugin.la \
+       libntservice_plugin.la
+endif