[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.0-2501-g4896e6c

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

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  4896e6cab4def29ea72fbfe574ebdeabf082f396 (commit)
       via  7cf2b02f5c649e553c9f7f36a1c81c64560a750d (commit)
      from  ade70346d29ce358127f500526d1ff8fde1122ea (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 4896e6cab4def29ea72fbfe574ebdeabf082f396
Author: Julien Boibessot <jul...@ar...>
Date:   Thu Sep 15 17:37:48 2011 +0200

    [DEMOS] Fixes STAGING_DIR usage in SDL based apps

commit 7cf2b02f5c649e553c9f7f36a1c81c64560a750d
Author: Julien Boibessot <jul...@ar...>
Date:   Thu Sep 15 17:36:24 2011 +0200

    [BUILD] Fixes ARMADEUS_STAGING_DIR, ARMADEUS_TOOLCHAIN_PATH, ARMADEUS_SDL_VERSION, ARMADEUS_QT_VERSION, & ARMADEUS_XENOMAI_VERSION in Makefile.in

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

Summary of changes:
 Makefile                             |    1 +
 Makefile.in                          |   29 +++++++++++++++++++----------
 target/demos/camera/capture/Makefile |    2 +-
 target/demos/input_test/Makefile     |    2 +-
 target/demos/music_player/Makefile   |    6 ++----
 target/demos/show_image/Makefile     |    4 ++--
 6 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/Makefile b/Makefile
index 4a37fe0..e94c2f3 100644
--- a/Makefile
+++ b/Makefile
@@ -215,6 +215,7 @@ shell_env:
 	@echo ARMADEUS_TOOLCHAIN_PATH=$(ARMADEUS_TOOLCHAIN_PATH) >> $(ARMADEUS_ENV_FILE)
 	@echo ARMADEUS_XENOMAI_DIR=$(ARMADEUS_XENOMAI_DIR) >> $(ARMADEUS_ENV_FILE)
 	@echo ARMADEUS_QT_DIR=$(ARMADEUS_QT_DIR) >> $(ARMADEUS_ENV_FILE)
+	@echo ARMADEUS_SDL_DIR=$(ARMADEUS_SDL_DIR) >> $(ARMADEUS_ENV_FILE)
 
 
 PHONY_TARGETS+=dummy all linux-menuconfig linux26 linux26-clean buildroot-clean buildroot-dirclean
diff --git a/Makefile.in b/Makefile.in
index 2120b04..05bc4d7 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -4,6 +4,7 @@
 # calling directory before including this file !!
 #
 
+
 ifeq ($(ARMADEUS_BASE_DIR),)
 ARMADEUS_BASE_DIR:=$(shell pwd)
 endif
@@ -19,25 +20,33 @@ ARMADEUS_BUSYBOX_VERSION:=$(shell echo $(BR2_BUSYBOX_VERSION))
 ARMADEUS_BOARD_NAME:=$(shell echo $(BR2_BOARD_NAME))
 ARMADEUS_TARGET_ARCH:=$(shell echo $(BR2_GCC_TARGET_ARCH))
 
+ifeq ($(BR2_PACKAGE_SDL),y)
 ARMADEUS_SDL_VERSION:=$(shell grep "SDL_VERSION:=" $(BUILDROOT_DIR)/package/sdl/sdl.mk 2>/dev/null | cut -d = -f 2)
-ifeq ($(ARMADEUS_SDL_VERSION),)
+else
 ARMADEUS_SDL_VERSION:=SDL_NOT_INSTALLED
 endif
 
+ifeq ($(BR2_PACKAGE_XENOMAI),y)
 ARMADEUS_XENOMAI_VERSION:=$(shell grep "XENOMAI_VERSION:=" $(BUILDROOT_DIR)/package/xenomai/xenomai.mk 2>/dev/null | cut -d = -f 2)
+else
+ARMADEUS_XENOMAI_VERSION:=XENOMAI_NOT_INSTALLED
+endif
 
+ifeq ($(BR2_PACKAGE_QT),y)
 ARMADEUS_QT_MAKEFILE:=package/qt/qt.mk
-ARMADEUS_QT_VERSION:=$(shell grep "QT_VERSION:=" $(BUILDROOT_DIR)/$(ARMADEUS_QT_MAKEFILE) 2>/dev/null | cut -d = -f 2)
-ifeq ($(ARMADEUS_QT_VERSION),)
+ARMADEUS_QT_VERSION:=$(shell grep "QT_VERSION =" $(BUILDROOT_DIR)/$(ARMADEUS_QT_MAKEFILE) 2>/dev/null | cut -d = -f 2)
+ARMADEUS_QT_VERSION:=$(strip $(ARMADEUS_QT_VERSION))
+else
 ARMADEUS_QT_VERSION:=QT_NOT_INSTALLED
 endif
 
 ARMADEUS_PATCH_DIR=$(ARMADEUS_BASE_DIR)/patches
-BUILDROOT_PROJECT_BUILD_DIR:=$(BUILDROOT_DIR)/output/build
-BUILDROOT_TOOLCHAIN_BUILD_DIR:=$(BUILDROOT_DIR)/output/toolchain
-BUILDROOT_BUILD_DIR:=$(BUILDROOT_DIR)/output/build
-ARMADEUS_BINARIES:=$(BUILDROOT_DIR)/output/images
-ARMADEUS_ROOTFS_DIR:=$(BUILDROOT_DIR)/output/target
+BUILDROOT_OUTPUT_DIR:=$(BUILDROOT_DIR)/output
+BUILDROOT_PROJECT_BUILD_DIR:=$(BUILDROOT_OUTPUT_DIR)/build
+BUILDROOT_TOOLCHAIN_BUILD_DIR:=$(BUILDROOT_OUTPUT_DIR)/toolchain
+BUILDROOT_BUILD_DIR:=$(BUILDROOT_OUTPUT_DIR)/build
+ARMADEUS_BINARIES:=$(BUILDROOT_OUTPUT_DIR)/images
+ARMADEUS_ROOTFS_DIR:=$(BUILDROOT_OUTPUT_DIR)/target
 ARMADEUS_ROOTFS_TAR:=$(ARMADEUS_BINARIES)/$(ARMADEUS_BOARD_NAME)-rootfs.tar
 
 ARMADEUS_LINUX_DIR:=$(BUILDROOT_PROJECT_BUILD_DIR)/linux-$(ARMADEUS_LINUX_VERSION)
@@ -45,8 +54,8 @@ ARMADEUS_LINUX_PATCH_DIR:=$(ARMADEUS_PATCH_DIR)/linux/$(ARMADEUS_LINUX_VERSION)
 ARMADEUS_U_BOOT_DIR:=$(BUILDROOT_PROJECT_BUILD_DIR)/u-boot-$(ARMADEUS_U_BOOT_VERSION)
 ARMADEUS_UCLIBC_DIR:=$(BUILDROOT_TOOLCHAIN_BUILD_DIR)/uClibc-$(ARMADEUS_UCLIBC_VERSION)
 ARMADEUS_BOARD_DIR:=$(BUILDROOT_DIR)/target/device/armadeus/$(ARMADEUS_BOARD_NAME)
-ARMADEUS_STAGING_DIR:=$(BUILDROOT_BUILD_DIR)/staging_dir
-ARMADEUS_TOOLCHAIN_PATH:=$(ARMADEUS_STAGING_DIR)/usr/bin
+ARMADEUS_STAGING_DIR:=$(BUILDROOT_OUTPUT_DIR)/staging
+ARMADEUS_TOOLCHAIN_PATH:=$(BUILDROOT_OUTPUT_DIR)/host/usr/bin
 
 ARMADEUS_BUILD_DIR:=$(BUILDROOT_BUILD_DIR)
 ARMADEUS_SDL_DIR:=$(ARMADEUS_BUILD_DIR)/sdl-$(ARMADEUS_SDL_VERSION)
diff --git a/target/demos/camera/capture/Makefile b/target/demos/camera/capture/Makefile
index 2301316..a1f50d4 100644
--- a/target/demos/camera/capture/Makefile
+++ b/target/demos/camera/capture/Makefile
@@ -7,7 +7,7 @@ INSTALL_DIR:=$(ARMADEUS_ROOTFS_DIR)/usr/local/bin/
 CC:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc
 STRIP:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-sstrip
 SDL_DIR:=$(ARMADEUS_SDL_DIR)
-CFLAGS=$(shell STAGING_DIR=$(STAGING_DIR) sh $(SDL_DIR)/sdl-config --cflags)
+CFLAGS=$(shell STAGING_DIR=$(STAGING_DIR) sh $(STAGING_DIR)/usr/bin/sdl-config --cflags)
 
 #CFLAGS+=-Wall -g
 LDFLAGS= -lSDL -lpthread
diff --git a/target/demos/input_test/Makefile b/target/demos/input_test/Makefile
index 4ba86e7..a81c4f5 100644
--- a/target/demos/input_test/Makefile
+++ b/target/demos/input_test/Makefile
@@ -2,7 +2,7 @@ ARMADEUS_BASE_DIR=../../..
 -include $(ARMADEUS_BASE_DIR)/Makefile.in
 
 # Default values for local compiling:
-STAGING_DIR:=$(ARMADEUS_BUILD_DIR)/staging_dir/
+STAGING_DIR:=$(ARMADEUS_STAGING_DIR)/
 INSTALL_DIR:=$(ARMADEUS_ROOTFS_DIR)/usr/local/bin/
 INSTALL_DATA_DIR:=$(ARMADEUS_ROOTFS_DIR)/usr/share
 CC:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc
diff --git a/target/demos/music_player/Makefile b/target/demos/music_player/Makefile
index 4719911..c008e0e 100755
--- a/target/demos/music_player/Makefile
+++ b/target/demos/music_player/Makefile
@@ -3,16 +3,14 @@ ARMADEUS_BASE_DIR:=$(shell pwd)/../../..
 -include $(ARMADEUS_BASE_DIR)/Makefile.in
 
 # Default values
-STAGING_DIR:=$(ARMADEUS_BUILD_DIR)/staging_dir/
 INSTALL_DIR:=$(ARMADEUS_ROOTFS_DIR)/usr/bin/
 INSTALL_DATA_DIR:=$(ARMADEUS_ROOTFS_DIR)/usr/share
 CC=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc
 STRIP=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-sstrip
 DEFINES=-DAPF
-SDL_DIR:=$(ARMADEUS_SDL_DIR)
 STAGING_DIR:=$(ARMADEUS_STAGING_DIR)
-CFLAGS=$(shell STAGING_DIR=$(STAGING_DIR) sh $(SDL_DIR)/sdl-config --cflags) -g
-LDFLAGS=$(shell STAGING_DIR=$(STAGING_DIR) sh $(SDL_DIR)/sdl-config --libs) -lSDL_ttf -lSDL_mixer
+CFLAGS=$(shell STAGING_DIR=$(STAGING_DIR) sh $(STAGING_DIR)/usr/bin/sdl-config --cflags) -g
+LDFLAGS=$(shell STAGING_DIR=$(STAGING_DIR) sh $(STAGING_DIR)/usr/bin/sdl-config --libs) -lSDL_ttf -lSDL_mixer
 
 ifeq ($(TARGET),x86)
 # Compil HOST
diff --git a/target/demos/show_image/Makefile b/target/demos/show_image/Makefile
index d7e7fa1..012224d 100644
--- a/target/demos/show_image/Makefile
+++ b/target/demos/show_image/Makefile
@@ -8,8 +8,8 @@ INSTALL_DIR:=$(ARMADEUS_ROOTFS_DIR)/usr/local/bin/
 SDL_DIR:=$(ARMADEUS_SDL_DIR)
 
 DEFINES=-DTARGET
-CFLAGS=$(shell STAGING_DIR=$(STAGING_DIR) sh $(SDL_DIR)/sdl-config --cflags) -g
-LDFLAGS=$(shell STAGING_DIR=$(STAGING_DIR) sh $(SDL_DIR)/sdl-config --libs) -lSDL_image
+CFLAGS=$(shell STAGING_DIR=$(STAGING_DIR) sh $(STAGING_DIR)/usr/bin/sdl-config --cflags) -g
+LDFLAGS=$(shell STAGING_DIR=$(STAGING_DIR) sh $(STAGING_DIR)/usr/bin/sdl-config --libs) -lSDL_image
 
 ifeq ($(TARGET),x86)
 	INSTALL_DIR:=/usr/local/bin/


hooks/post-receive
-- 
armadeus


