control: remove Makefile recursion
authorRémi Denis-Courmont <remi@remlab.net>
Tue, 10 Feb 2015 16:15:33 +0000 (18:15 +0200)
committerRémi Denis-Courmont <remi@remlab.net>
Tue, 10 Feb 2015 21:12:26 +0000 (23:12 +0200)
configure.ac
modules/Makefile.am
modules/control/.gitignore [deleted file]
modules/control/Makefile.am [new file with mode: 0644]
modules/control/Modules.am [deleted file]
modules/video_filter/Modules.am

index e0d0cc0..7d662be 100644 (file)
@@ -4136,7 +4136,6 @@ AC_CONFIG_FILES([
   bin/Makefile
   test/Makefile
   modules/access_output/Makefile
-  modules/control/Makefile
   modules/gui/Makefile
   modules/gui/ios_dialog_provider/Makefile
   modules/gui/macosx/Makefile
index 704582a..16a81be 100644 (file)
@@ -4,7 +4,6 @@ check_PROGRAMS =
 EXTRA_DIST =
 
 BASE_SUBDIRS = \
-       control \
        gui \
        video_filter \
        visualization
@@ -37,6 +36,7 @@ include audio_filter/Makefile.am
 include audio_mixer/Makefile.am
 include audio_output/Makefile.am
 include codec/Makefile.am
+include control/Makefile.am
 include demux/Makefile.am
 include hw/vdpau/Makefile.am
 include logger/Makefile.am
diff --git a/modules/control/.gitignore b/modules/control/.gitignore
deleted file mode 100644 (file)
index 08a6d72..0000000
+++ /dev/null
@@ -1 +0,0 @@
-Makefile.am
diff --git a/modules/control/Makefile.am b/modules/control/Makefile.am
new file mode 100644 (file)
index 0000000..f4d0d6a
--- /dev/null
@@ -0,0 +1,71 @@
+controldir = $(pluginsdir)/control
+
+libdummy_plugin_la_SOURCES = control/dummy.c
+libgestures_plugin_la_SOURCES = control/gestures.c
+libhotkeys_plugin_la_SOURCES = control/hotkeys.c
+libhotkeys_plugin_la_LIBADD = $(LIBM)
+libnetsync_plugin_la_SOURCES = control/netsync.c
+libnetsync_plugin_la_LIBADD = $(SOCKET_LIBS)
+liboldrc_plugin_la_SOURCES = control/rc.c
+liboldrc_plugin_la_LIBADD = $(SOCKET_LIBS) $(LIBM)
+
+control_LTLIBRARIES = \
+       libdummy_plugin.la \
+       libgestures_plugin.la \
+       libhotkeys_plugin.la \
+       libnetsync_plugin.la \
+       liboldrc_plugin.la
+
+liblirc_plugin_la_SOURCES = control/lirc.c
+liblirc_plugin_la_LIBADD = -llirc_client
+if HAVE_LIRC
+control_LTLIBRARIES += liblirc_plugin.la
+endif
+
+libvlc_motion_la_SOURCES = control/motionlib.c control/motionlib.h
+if HAVE_DARWIN
+libvlc_motion_la_SOURCES += control/unimotion.c control/unimotion.h
+libvlc_motion_la_CFLAGS = $(AM_CFLAGS) -fconstant-cfstrings
+endif
+libvlc_motion_la_LDFLAGS = -static
+noinst_LTLIBRARIES += libvlc_motion.la
+
+libmotion_plugin_la_SOURCES = control/motion.c
+libmotion_plugin_la_LIBADD = libvlc_motion.la
+libmotion_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(controldir)'
+if HAVE_DARWIN
+libmotion_plugin_la_LDFLAGS += -Wl,-framework,IOKit,-framework,CoreFoundation
+endif
+if !HAVE_WIN32
+control_LTLIBRARIES += libmotion_plugin.la
+endif
+
+libdbus_plugin_la_SOURCES = \
+       control/dbus/dbus_introspect.h control/dbus/dbus_common.h \
+       control/dbus/dbus_root.c control/dbus/dbus_root.h \
+       control/dbus/dbus_player.c control/dbus/dbus_player.h \
+       control/dbus/dbus_tracklist.c control/dbus/dbus_tracklist.h \
+       control/dbus/dbus.c
+libdbus_plugin_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS)
+libdbus_plugin_la_LIBADD = $(DBUS_LIBS) $(LIBM)
+if HAVE_DBUS
+control_LTLIBRARIES += libdbus_plugin.la
+endif
+
+libxcb_hotkeys_plugin_la_SOURCES = control/globalhotkeys/xcb.c
+libxcb_hotkeys_plugin_la_CFLAGS = $(AM_CFLAGS) \
+       $(XCB_KEYSYMS_CFLAGS) $(XCB_CFLAGS)
+libxcb_hotkeys_plugin_la_LIBADD = $(XCB_KEYSYMS_LIBS) $(XCB_LIBS)
+if HAVE_XCB_KEYSYMS
+control_LTLIBRARIES += libxcb_hotkeys_plugin.la
+endif
+
+libntservice_plugin_la_SOURCES = control/ntservice.c
+libwin_hotkeys_plugin_la_SOURCES = control/globalhotkeys/win32.c
+libwin_msg_plugin_la_SOURCES = control/win_msg.c
+if HAVE_WIN32
+control_LTLIBRARIES += libntservice_plugin.la
+if !HAVE_WINSTORE
+control_LTLIBRARIES += libwin_hotkeys_plugin.la libwin_msg_plugin.la
+endif
+endif
diff --git a/modules/control/Modules.am b/modules/control/Modules.am
deleted file mode 100644 (file)
index 1b1f0d9..0000000
+++ /dev/null
@@ -1,69 +0,0 @@
-libdummy_plugin_la_SOURCES = dummy.c
-libgestures_plugin_la_SOURCES = gestures.c
-libhotkeys_plugin_la_SOURCES = hotkeys.c
-libhotkeys_plugin_la_LIBADD = $(LIBM)
-libnetsync_plugin_la_SOURCES = netsync.c
-libnetsync_plugin_la_LIBADD = $(SOCKET_LIBS)
-liboldrc_plugin_la_SOURCES = rc.c
-liboldrc_plugin_la_LIBADD = $(SOCKET_LIBS) $(LIBM)
-
-control_LTLIBRARIES += \
-       libdummy_plugin.la \
-       libgestures_plugin.la \
-       libhotkeys_plugin.la \
-       libnetsync_plugin.la \
-       liboldrc_plugin.la
-
-liblirc_plugin_la_SOURCES = lirc.c
-liblirc_plugin_la_LIBADD = -llirc_client
-if HAVE_LIRC
-control_LTLIBRARIES += liblirc_plugin.la
-endif
-
-libvlc_motion_la_SOURCES = motionlib.c motionlib.h
-if HAVE_DARWIN
-libvlc_motion_la_SOURCES += unimotion.c unimotion.h
-libvlc_motion_la_CFLAGS = $(AM_CFLAGS) -fconstant-cfstrings
-endif
-libvlc_motion_la_LDFLAGS = -static
-noinst_LTLIBRARIES = libvlc_motion.la
-
-libmotion_plugin_la_SOURCES = motion.c
-libmotion_plugin_la_LIBADD = libvlc_motion.la
-libmotion_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(controldir)'
-if HAVE_DARWIN
-libmotion_plugin_la_LDFLAGS += -Wl,-framework,IOKit,-framework,CoreFoundation
-endif
-if !HAVE_WIN32
-control_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 \
-       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 = $(DBUS_LIBS) $(LIBM)
-if HAVE_DBUS
-control_LTLIBRARIES += libdbus_plugin.la
-endif
-
-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 = $(XCB_KEYSYMS_LIBS) $(XCB_LIBS)
-if HAVE_XCB_KEYSYMS
-control_LTLIBRARIES += libxcb_hotkeys_plugin.la
-endif
-
-libntservice_plugin_la_SOURCES = ntservice.c
-libwin_hotkeys_plugin_la_SOURCES = globalhotkeys/win32.c
-libwin_msg_plugin_la_SOURCES = win_msg.c
-if HAVE_WIN32
-control_LTLIBRARIES += libntservice_plugin.la
-if !HAVE_WINSTORE
-control_LTLIBRARIES += libwin_hotkeys_plugin.la libwin_msg_plugin.la
-endif
-endif
index b823e9d..c93a33d 100644 (file)
@@ -69,7 +69,7 @@ SOURCES_opencv_wrapper = opencv_wrapper.c
 SOURCES_opencv_example = opencv_example.cpp filter_event_info.h
 
 librotate_plugin_la_SOURCES = rotate.c
-librotate_plugin_la_LIBADD = ../control/libvlc_motion.la $(LIBM)
+librotate_plugin_la_LIBADD = ../libvlc_motion.la $(LIBM)
 librotate_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(video_filterdir)'
 if HAVE_DARWIN
 librotate_plugin_la_LDFLAGS += -Wl,-framework,IOKit,-framework,CoreFoundation