vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Thu Jan 12 15:22:40 2017 +0200| [8e03c54a4bc1c3e5418e9472ead34cc506c54db6] | committer: Rémi Denis-Courmont
skins2: undo makefile recursion > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=8e03c54a4bc1c3e5418e9472ead34cc506c54db6 --- configure.ac | 1 - modules/gui/Makefile.am | 7 +- modules/gui/skins2/Makefile.am | 483 ++++++++++++++++++++--------------------- 3 files changed, 243 insertions(+), 248 deletions(-) diff --git a/configure.ac b/configure.ac index 750f1cf..63e8b18 100644 --- a/configure.ac +++ b/configure.ac @@ -4244,7 +4244,6 @@ AC_CONFIG_FILES([ test/Makefile modules/gui/macosx/Makefile modules/gui/qt/Makefile - modules/gui/skins2/Makefile modules/hw/mmal/Makefile share/vlc.appdata.xml.in ]) diff --git a/modules/gui/Makefile.am b/modules/gui/Makefile.am index a2a2628..1b4295b 100644 --- a/modules/gui/Makefile.am +++ b/modules/gui/Makefile.am @@ -1,7 +1,7 @@ guidir = $(pluginsdir)/gui gui_LTLIBRARIES = -DIST_SUBDIRS += gui/macosx gui/qt gui/skins2 +DIST_SUBDIRS += gui/macosx gui/qt if ENABLE_MACOSX_UI SUBDIRS += gui/macosx @@ -9,9 +9,6 @@ endif if ENABLE_QT SUBDIRS += gui/qt endif -if BUILD_SKINS -SUBDIRS += gui/skins2 -endif libncurses_plugin_la_SOURCES = gui/ncurses.c libncurses_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(NCURSES_CFLAGS) @@ -31,3 +28,5 @@ libminimal_macosx_plugin_la_OBJCFLAGS = $(AM_OBJCFLAGS) -fobjc-arc -fobjc-except libminimal_macosx_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(guidir)' -Wl,-framework,Cocoa EXTRA_LTLIBRARIES += libminimal_macosx_plugin.la gui_LTLIBRARIES += $(LTLIBminimal_macosx) + +include gui/skins2/Makefile.am diff --git a/modules/gui/skins2/Makefile.am b/modules/gui/skins2/Makefile.am index 45b942d..b893fc6 100644 --- a/modules/gui/skins2/Makefile.am +++ b/modules/gui/skins2/Makefile.am @@ -1,262 +1,259 @@ -include $(top_srcdir)/modules/common.am -guidir = $(pluginsdir)/gui - libskins2_plugin_la_SOURCES = \ - commands/async_queue.cpp \ - commands/async_queue.hpp \ - commands/cmd_add_item.cpp \ - commands/cmd_add_item.hpp \ - commands/cmd_audio.cpp \ - commands/cmd_audio.hpp \ - commands/cmd_dummy.hpp \ - commands/cmd_dvd.cpp \ - commands/cmd_dvd.hpp \ - commands/cmd_generic.hpp \ - commands/cmd_callbacks.hpp \ - commands/cmd_change_skin.cpp \ - commands/cmd_change_skin.hpp \ - commands/cmd_dialogs.hpp \ - commands/cmd_fullscreen.cpp \ - commands/cmd_fullscreen.hpp \ - commands/cmd_input.cpp \ - commands/cmd_input.hpp \ - commands/cmd_layout.cpp \ - commands/cmd_layout.hpp \ - commands/cmd_muxer.cpp \ - commands/cmd_muxer.hpp \ - commands/cmd_on_top.cpp \ - commands/cmd_on_top.hpp \ - commands/cmd_playlist.cpp \ - commands/cmd_playlist.hpp \ - commands/cmd_playtree.cpp \ - commands/cmd_playtree.hpp \ - commands/cmd_minimize.cpp \ - commands/cmd_minimize.hpp \ - commands/cmd_quit.cpp \ - commands/cmd_quit.hpp \ - commands/cmd_resize.cpp \ - commands/cmd_resize.hpp \ - commands/cmd_snapshot.cpp \ - commands/cmd_snapshot.hpp \ - commands/cmd_show_window.hpp \ - commands/cmd_vars.cpp \ - commands/cmd_vars.hpp \ + gui/skins2/commands/async_queue.cpp \ + gui/skins2/commands/async_queue.hpp \ + gui/skins2/commands/cmd_add_item.cpp \ + gui/skins2/commands/cmd_add_item.hpp \ + gui/skins2/commands/cmd_audio.cpp \ + gui/skins2/commands/cmd_audio.hpp \ + gui/skins2/commands/cmd_dummy.hpp \ + gui/skins2/commands/cmd_dvd.cpp \ + gui/skins2/commands/cmd_dvd.hpp \ + gui/skins2/commands/cmd_generic.hpp \ + gui/skins2/commands/cmd_callbacks.hpp \ + gui/skins2/commands/cmd_change_skin.cpp \ + gui/skins2/commands/cmd_change_skin.hpp \ + gui/skins2/commands/cmd_dialogs.hpp \ + gui/skins2/commands/cmd_fullscreen.cpp \ + gui/skins2/commands/cmd_fullscreen.hpp \ + gui/skins2/commands/cmd_input.cpp \ + gui/skins2/commands/cmd_input.hpp \ + gui/skins2/commands/cmd_layout.cpp \ + gui/skins2/commands/cmd_layout.hpp \ + gui/skins2/commands/cmd_muxer.cpp \ + gui/skins2/commands/cmd_muxer.hpp \ + gui/skins2/commands/cmd_on_top.cpp \ + gui/skins2/commands/cmd_on_top.hpp \ + gui/skins2/commands/cmd_playlist.cpp \ + gui/skins2/commands/cmd_playlist.hpp \ + gui/skins2/commands/cmd_playtree.cpp \ + gui/skins2/commands/cmd_playtree.hpp \ + gui/skins2/commands/cmd_minimize.cpp \ + gui/skins2/commands/cmd_minimize.hpp \ + gui/skins2/commands/cmd_quit.cpp \ + gui/skins2/commands/cmd_quit.hpp \ + gui/skins2/commands/cmd_resize.cpp \ + gui/skins2/commands/cmd_resize.hpp \ + gui/skins2/commands/cmd_snapshot.cpp \ + gui/skins2/commands/cmd_snapshot.hpp \ + gui/skins2/commands/cmd_show_window.hpp \ + gui/skins2/commands/cmd_vars.cpp \ + gui/skins2/commands/cmd_vars.hpp \ \ - controls/ctrl_button.cpp \ - controls/ctrl_button.hpp \ - controls/ctrl_checkbox.cpp \ - controls/ctrl_checkbox.hpp \ - controls/ctrl_flat.hpp \ - controls/ctrl_generic.cpp \ - controls/ctrl_generic.hpp \ - controls/ctrl_image.cpp \ - controls/ctrl_image.hpp \ - controls/ctrl_list.cpp \ - controls/ctrl_list.hpp \ - controls/ctrl_tree.cpp \ - controls/ctrl_tree.hpp \ - controls/ctrl_move.cpp \ - controls/ctrl_move.hpp \ - controls/ctrl_resize.cpp \ - controls/ctrl_resize.hpp \ - controls/ctrl_slider.cpp \ - controls/ctrl_slider.hpp \ - controls/ctrl_radialslider.cpp \ - controls/ctrl_radialslider.hpp \ - controls/ctrl_text.hpp \ - controls/ctrl_text.cpp \ - controls/ctrl_video.cpp \ - controls/ctrl_video.hpp \ + gui/skins2/controls/ctrl_button.cpp \ + gui/skins2/controls/ctrl_button.hpp \ + gui/skins2/controls/ctrl_checkbox.cpp \ + gui/skins2/controls/ctrl_checkbox.hpp \ + gui/skins2/controls/ctrl_flat.hpp \ + gui/skins2/controls/ctrl_generic.cpp \ + gui/skins2/controls/ctrl_generic.hpp \ + gui/skins2/controls/ctrl_image.cpp \ + gui/skins2/controls/ctrl_image.hpp \ + gui/skins2/controls/ctrl_list.cpp \ + gui/skins2/controls/ctrl_list.hpp \ + gui/skins2/controls/ctrl_tree.cpp \ + gui/skins2/controls/ctrl_tree.hpp \ + gui/skins2/controls/ctrl_move.cpp \ + gui/skins2/controls/ctrl_move.hpp \ + gui/skins2/controls/ctrl_resize.cpp \ + gui/skins2/controls/ctrl_resize.hpp \ + gui/skins2/controls/ctrl_slider.cpp \ + gui/skins2/controls/ctrl_slider.hpp \ + gui/skins2/controls/ctrl_radialslider.cpp \ + gui/skins2/controls/ctrl_radialslider.hpp \ + gui/skins2/controls/ctrl_text.hpp \ + gui/skins2/controls/ctrl_text.cpp \ + gui/skins2/controls/ctrl_video.cpp \ + gui/skins2/controls/ctrl_video.hpp \ \ - events/evt_enter.hpp \ - events/evt_focus.hpp \ - events/evt_generic.hpp \ - events/evt_input.cpp \ - events/evt_input.hpp \ - events/evt_key.cpp \ - events/evt_key.hpp \ - events/evt_leave.hpp \ - events/evt_menu.hpp \ - events/evt_motion.hpp \ - events/evt_mouse.cpp \ - events/evt_mouse.hpp \ - events/evt_refresh.hpp \ - events/evt_special.cpp \ - events/evt_special.hpp \ - events/evt_scroll.cpp \ - events/evt_scroll.hpp \ - events/evt_dragndrop.hpp \ + gui/skins2/events/evt_enter.hpp \ + gui/skins2/events/evt_focus.hpp \ + gui/skins2/events/evt_generic.hpp \ + gui/skins2/events/evt_input.cpp \ + gui/skins2/events/evt_input.hpp \ + gui/skins2/events/evt_key.cpp \ + gui/skins2/events/evt_key.hpp \ + gui/skins2/events/evt_leave.hpp \ + gui/skins2/events/evt_menu.hpp \ + gui/skins2/events/evt_motion.hpp \ + gui/skins2/events/evt_mouse.cpp \ + gui/skins2/events/evt_mouse.hpp \ + gui/skins2/events/evt_refresh.hpp \ + gui/skins2/events/evt_special.cpp \ + gui/skins2/events/evt_special.hpp \ + gui/skins2/events/evt_scroll.cpp \ + gui/skins2/events/evt_scroll.hpp \ + gui/skins2/events/evt_dragndrop.hpp \ \ - parser/builder.cpp \ - parser/builder.hpp \ - parser/builder_data.hpp \ - parser/expr_evaluator.cpp \ - parser/expr_evaluator.hpp \ - parser/interpreter.cpp \ - parser/interpreter.hpp \ - parser/skin_parser.cpp \ - parser/skin_parser.hpp \ - parser/xmlparser.cpp \ - parser/xmlparser.hpp \ + gui/skins2/parser/builder.cpp \ + gui/skins2/parser/builder.hpp \ + gui/skins2/parser/builder_data.hpp \ + gui/skins2/parser/expr_evaluator.cpp \ + gui/skins2/parser/expr_evaluator.hpp \ + gui/skins2/parser/interpreter.cpp \ + gui/skins2/parser/interpreter.hpp \ + gui/skins2/parser/skin_parser.cpp \ + gui/skins2/parser/skin_parser.hpp \ + gui/skins2/parser/xmlparser.cpp \ + gui/skins2/parser/xmlparser.hpp \ \ - src/anchor.cpp \ - src/anchor.hpp \ - src/anim_bitmap.cpp \ - src/anim_bitmap.hpp \ - src/bitmap_font.cpp \ - src/bitmap_font.hpp \ - src/dialogs.cpp \ - src/dialogs.hpp \ - src/file_bitmap.cpp \ - src/file_bitmap.hpp \ - src/art_manager.cpp \ - src/art_manager.hpp \ - src/ft2_bitmap.cpp \ - src/ft2_bitmap.hpp \ - src/ft2_font.cpp \ - src/ft2_font.hpp \ - src/ft2_err.c \ - src/ft2_err.h \ - src/generic_bitmap.cpp \ - src/generic_bitmap.hpp \ - src/generic_font.hpp \ - src/generic_layout.cpp \ - src/generic_layout.hpp \ - src/generic_window.cpp \ - src/generic_window.hpp \ - src/ini_file.cpp \ - src/ini_file.hpp \ - src/logger.cpp \ - src/logger.hpp \ - src/os_factory.cpp \ - src/os_factory.hpp \ - src/os_graphics.hpp \ - src/os_loop.hpp \ - src/os_popup.hpp \ - src/os_timer.hpp \ - src/os_window.hpp \ - src/os_tooltip.hpp \ - src/popup.cpp \ - src/popup.hpp \ - src/scaled_bitmap.cpp \ - src/scaled_bitmap.hpp \ - src/skin_main.cpp \ - src/skin_common.hpp \ - src/theme.cpp \ - src/theme.hpp \ - src/theme_loader.cpp \ - src/theme_loader.hpp \ - src/theme_repository.cpp \ - src/theme_repository.hpp \ - src/tooltip.cpp \ - src/tooltip.hpp \ - src/top_window.cpp \ - src/top_window.hpp \ - src/fsc_window.cpp \ - src/fsc_window.hpp \ - src/var_manager.cpp \ - src/var_manager.hpp \ - src/vlcproc.cpp \ - src/vlcproc.hpp \ - src/vout_window.cpp \ - src/vout_window.hpp \ - src/vout_manager.cpp \ - src/vout_manager.hpp \ - src/window_manager.cpp \ - src/window_manager.hpp \ + gui/skins2/src/anchor.cpp \ + gui/skins2/src/anchor.hpp \ + gui/skins2/src/anim_bitmap.cpp \ + gui/skins2/src/anim_bitmap.hpp \ + gui/skins2/src/bitmap_font.cpp \ + gui/skins2/src/bitmap_font.hpp \ + gui/skins2/src/dialogs.cpp \ + gui/skins2/src/dialogs.hpp \ + gui/skins2/src/file_bitmap.cpp \ + gui/skins2/src/file_bitmap.hpp \ + gui/skins2/src/art_manager.cpp \ + gui/skins2/src/art_manager.hpp \ + gui/skins2/src/ft2_bitmap.cpp \ + gui/skins2/src/ft2_bitmap.hpp \ + gui/skins2/src/ft2_font.cpp \ + gui/skins2/src/ft2_font.hpp \ + gui/skins2/src/ft2_err.c \ + gui/skins2/src/ft2_err.h \ + gui/skins2/src/generic_bitmap.cpp \ + gui/skins2/src/generic_bitmap.hpp \ + gui/skins2/src/generic_font.hpp \ + gui/skins2/src/generic_layout.cpp \ + gui/skins2/src/generic_layout.hpp \ + gui/skins2/src/generic_window.cpp \ + gui/skins2/src/generic_window.hpp \ + gui/skins2/src/ini_file.cpp \ + gui/skins2/src/ini_file.hpp \ + gui/skins2/src/logger.cpp \ + gui/skins2/src/logger.hpp \ + gui/skins2/src/os_factory.cpp \ + gui/skins2/src/os_factory.hpp \ + gui/skins2/src/os_graphics.hpp \ + gui/skins2/src/os_loop.hpp \ + gui/skins2/src/os_popup.hpp \ + gui/skins2/src/os_timer.hpp \ + gui/skins2/src/os_window.hpp \ + gui/skins2/src/os_tooltip.hpp \ + gui/skins2/src/popup.cpp \ + gui/skins2/src/popup.hpp \ + gui/skins2/src/scaled_bitmap.cpp \ + gui/skins2/src/scaled_bitmap.hpp \ + gui/skins2/src/skin_main.cpp \ + gui/skins2/src/skin_common.hpp \ + gui/skins2/src/theme.cpp \ + gui/skins2/src/theme.hpp \ + gui/skins2/src/theme_loader.cpp \ + gui/skins2/src/theme_loader.hpp \ + gui/skins2/src/theme_repository.cpp \ + gui/skins2/src/theme_repository.hpp \ + gui/skins2/src/tooltip.cpp \ + gui/skins2/src/tooltip.hpp \ + gui/skins2/src/top_window.cpp \ + gui/skins2/src/top_window.hpp \ + gui/skins2/src/fsc_window.cpp \ + gui/skins2/src/fsc_window.hpp \ + gui/skins2/src/var_manager.cpp \ + gui/skins2/src/var_manager.hpp \ + gui/skins2/src/vlcproc.cpp \ + gui/skins2/src/vlcproc.hpp \ + gui/skins2/src/vout_window.cpp \ + gui/skins2/src/vout_window.hpp \ + gui/skins2/src/vout_manager.cpp \ + gui/skins2/src/vout_manager.hpp \ + gui/skins2/src/window_manager.cpp \ + gui/skins2/src/window_manager.hpp \ \ - utils/bezier.cpp \ - utils/bezier.hpp \ - utils/fsm.cpp \ - utils/fsm.hpp \ - utils/observer.hpp \ - utils/pointer.hpp \ - utils/position.cpp \ - utils/position.hpp \ - utils/ustring.cpp \ - utils/ustring.hpp \ - utils/variable.hpp \ - utils/var_bool.cpp \ - utils/var_bool.hpp \ - utils/var_list.cpp \ - utils/var_list.hpp \ - utils/var_percent.cpp \ - utils/var_percent.hpp \ - utils/var_text.cpp \ - utils/var_text.hpp \ - utils/var_string.cpp \ - utils/var_string.hpp \ - utils/var_tree.cpp \ - utils/var_tree.hpp \ + gui/skins2/utils/bezier.cpp \ + gui/skins2/utils/bezier.hpp \ + gui/skins2/utils/fsm.cpp \ + gui/skins2/utils/fsm.hpp \ + gui/skins2/utils/observer.hpp \ + gui/skins2/utils/pointer.hpp \ + gui/skins2/utils/position.cpp \ + gui/skins2/utils/position.hpp \ + gui/skins2/utils/ustring.cpp \ + gui/skins2/utils/ustring.hpp \ + gui/skins2/utils/variable.hpp \ + gui/skins2/utils/var_bool.cpp \ + gui/skins2/utils/var_bool.hpp \ + gui/skins2/utils/var_list.cpp \ + gui/skins2/utils/var_list.hpp \ + gui/skins2/utils/var_percent.cpp \ + gui/skins2/utils/var_percent.hpp \ + gui/skins2/utils/var_text.cpp \ + gui/skins2/utils/var_text.hpp \ + gui/skins2/utils/var_string.cpp \ + gui/skins2/utils/var_string.hpp \ + gui/skins2/utils/var_tree.cpp \ + gui/skins2/utils/var_tree.hpp \ \ - vars/equalizer.cpp \ - vars/equalizer.hpp \ - vars/playtree.cpp \ - vars/playtree.hpp \ - vars/time.cpp \ - vars/time.hpp \ - vars/volume.cpp \ - vars/volume.hpp + gui/skins2/vars/equalizer.cpp \ + gui/skins2/vars/equalizer.hpp \ + gui/skins2/vars/playtree.cpp \ + gui/skins2/vars/playtree.hpp \ + gui/skins2/vars/time.cpp \ + gui/skins2/vars/time.hpp \ + gui/skins2/vars/volume.cpp \ + gui/skins2/vars/volume.hpp if HAVE_WIN32 libskins2_plugin_la_SOURCES += \ - win32/win32_dragdrop.cpp \ - win32/win32_dragdrop.hpp \ - win32/win32_factory.cpp \ - win32/win32_factory.hpp \ - win32/win32_graphics.cpp \ - win32/win32_graphics.hpp \ - win32/win32_loop.cpp \ - win32/win32_loop.hpp \ - win32/win32_popup.cpp \ - win32/win32_popup.hpp \ - win32/win32_timer.cpp \ - win32/win32_timer.hpp \ - win32/win32_tooltip.cpp \ - win32/win32_tooltip.hpp \ - win32/win32_window.cpp \ - win32/win32_window.hpp \ + gui/skins2/win32/win32_dragdrop.cpp \ + gui/skins2/win32/win32_dragdrop.hpp \ + gui/skins2/win32/win32_factory.cpp \ + gui/skins2/win32/win32_factory.hpp \ + gui/skins2/win32/win32_graphics.cpp \ + gui/skins2/win32/win32_graphics.hpp \ + gui/skins2/win32/win32_loop.cpp \ + gui/skins2/win32/win32_loop.hpp \ + gui/skins2/win32/win32_popup.cpp \ + gui/skins2/win32/win32_popup.hpp \ + gui/skins2/win32/win32_timer.cpp \ + gui/skins2/win32/win32_timer.hpp \ + gui/skins2/win32/win32_tooltip.cpp \ + gui/skins2/win32/win32_tooltip.hpp \ + gui/skins2/win32/win32_window.cpp \ + gui/skins2/win32/win32_window.hpp \ $(NULL) else if HAVE_OS2 libskins2_plugin_la_SOURCES += \ - os2/os2_dragdrop.cpp \ - os2/os2_dragdrop.hpp \ - os2/os2_factory.cpp \ - os2/os2_factory.hpp \ - os2/os2_graphics.cpp \ - os2/os2_graphics.hpp \ - os2/os2_loop.cpp \ - os2/os2_loop.hpp \ - os2/os2_popup.cpp \ - os2/os2_popup.hpp \ - os2/os2_timer.cpp \ - os2/os2_timer.hpp \ - os2/os2_tooltip.cpp \ - os2/os2_tooltip.hpp \ - os2/os2_window.cpp \ - os2/os2_window.hpp \ + gui/skins2/os2/os2_dragdrop.cpp \ + gui/skins2/os2/os2_dragdrop.hpp \ + gui/skins2/os2/os2_factory.cpp \ + gui/skins2/os2/os2_factory.hpp \ + gui/skins2/os2/os2_graphics.cpp \ + gui/skins2/os2/os2_graphics.hpp \ + gui/skins2/os2/os2_loop.cpp \ + gui/skins2/os2/os2_loop.hpp \ + gui/skins2/os2/os2_popup.cpp \ + gui/skins2/os2/os2_popup.hpp \ + gui/skins2/os2/os2_timer.cpp \ + gui/skins2/os2/os2_timer.hpp \ + gui/skins2/os2/os2_tooltip.cpp \ + gui/skins2/os2/os2_tooltip.hpp \ + gui/skins2/os2/os2_window.cpp \ + gui/skins2/os2/os2_window.hpp \ $(NULL) else libskins2_plugin_la_SOURCES += \ - x11/x11_display.cpp \ - x11/x11_display.hpp \ - x11/x11_dragdrop.cpp \ - x11/x11_dragdrop.hpp \ - x11/x11_factory.cpp \ - x11/x11_factory.hpp \ - x11/x11_graphics.cpp \ - x11/x11_graphics.hpp \ - x11/x11_loop.cpp \ - x11/x11_loop.hpp \ - x11/x11_popup.cpp \ - x11/x11_popup.hpp \ - x11/x11_timer.cpp \ - x11/x11_timer.hpp \ - x11/x11_window.cpp \ - x11/x11_window.hpp \ - x11/x11_tooltip.cpp \ - x11/x11_tooltip.hpp \ + gui/skins2/x11/x11_display.cpp \ + gui/skins2/x11/x11_display.hpp \ + gui/skins2/x11/x11_dragdrop.cpp \ + gui/skins2/x11/x11_dragdrop.hpp \ + gui/skins2/x11/x11_factory.cpp \ + gui/skins2/x11/x11_factory.hpp \ + gui/skins2/x11/x11_graphics.cpp \ + gui/skins2/x11/x11_graphics.hpp \ + gui/skins2/x11/x11_loop.cpp \ + gui/skins2/x11/x11_loop.hpp \ + gui/skins2/x11/x11_popup.cpp \ + gui/skins2/x11/x11_popup.hpp \ + gui/skins2/x11/x11_timer.cpp \ + gui/skins2/x11/x11_timer.hpp \ + gui/skins2/x11/x11_window.cpp \ + gui/skins2/x11/x11_window.hpp \ + gui/skins2/x11/x11_tooltip.cpp \ + gui/skins2/x11/x11_tooltip.hpp \ $(NULL) endif endif @@ -266,5 +263,5 @@ libskins2_plugin_la_CXXFLAGS = $(AM_CXXFLAGS) -O2 -fno-rtti libskins2_plugin_la_LIBADD = $(LIBS_skins2) if BUILD_SKINS -gui_LTLIBRARIES = libskins2_plugin.la +gui_LTLIBRARIES += libskins2_plugin.la endif _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
