[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-766-gca16602

[Julien B a. A. <ar...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  ca1660236707924badf62eb50bad81239cf160e1 (commit)
      from  c0ca4e8c0d6626eba8c1daea64403ace0ce785ed (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit ca1660236707924badf62eb50bad81239cf160e1
Author: Julien Boibessot <jul...@ar...>
Date:   Tue Jun 16 09:16:48 2015 +0200

    [BUILDROOT] Fixes build of music_player & show_image demos

-----------------------------------------------------------------------

Summary of changes:
 buildroot/package/armadeus/demos/demos.mk |   11 ++---------
 1 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/buildroot/package/armadeus/demos/demos.mk b/buildroot/package/armadeus/demos/demos.mk
index f8d5a36..eb022ce 100644
--- a/buildroot/package/armadeus/demos/demos.mk
+++ b/buildroot/package/armadeus/demos/demos.mk
@@ -51,7 +51,7 @@ endif
 
 ifeq ($(BR2_PACKAGE_ARMADEUS_DEMOS_MUSIC_PLAYER),y)
 ARMADEUS-DEMOS_SUBDIRS += music_player
-DEMOS_DEPENDENCIES += sdl
+DEMOS_DEPENDENCIES += sdl sdl_mixer sdl_ttf
 endif
 
 ifeq ($(BR2_PACKAGE_ARMADEUS_DEMOS_OSCILLO),y)
@@ -60,7 +60,7 @@ endif
 
 ifeq ($(BR2_PACKAGE_ARMADEUS_DEMOS_SHOW_IMAGE),y)
 ARMADEUS-DEMOS_SUBDIRS += show_image
-DEMOS_DEPENDENCIES += sdl
+DEMOS_DEPENDENCIES += sdl sdl_image
 endif
 
 ifeq ($(BR2_PACKAGE_ARMADEUS_DEMOS_TEST_LCD),y)
@@ -68,13 +68,6 @@ ARMADEUS-DEMOS_SUBDIRS += test_lcd
 DEMOS_DEPENDENCIES += sdl
 endif
 
-ifeq ($(BR2_PACKAGE_ARMADEUS_DEMOS_MUSIC_PLAYER),y)
-ARMADEUS-DEMOS_DEPS += sdl_ttf sdl_mixer
-endif
-ifeq ($(BR2_PACKAGE_ARMADEUS_DEMOS_SHOW_IMAGE),y)
-ARMADEUS-DEMOS_DEPS += sdl_image
-endif
-
 ifeq ($(BR2_PACKAGE_ARMADEUS_DEMOS_MCP25020),y)
 ARMADEUS-DEMOS_SUBDIRS += mcp25020_ctrl
 endif


hooks/post-receive
-- 
armadeus