[Armadeus-commitlog] armadeus branch, master, updated. release-3.2-348-g16a427b

[Fabien M <fa...@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  16a427b63a7e30d782efb98347ee226df25f7fc0 (commit)
      from  9086a079108a959449b1fd128058c6538a7ed529 (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 16a427b63a7e30d782efb98347ee226df25f7fc0
Author: Fabien Marteau <fab...@ar...>
Date:   Wed May 12 14:39:06 2010 +0200

    [buildroot] demo capture makefile correction

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

Summary of changes:
 target/demos/camera/capture/Makefile |   25 +++++++++++++------------
 1 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/target/demos/camera/capture/Makefile b/target/demos/camera/capture/Makefile
index 4271506..20a62bc 100644
--- a/target/demos/camera/capture/Makefile
+++ b/target/demos/camera/capture/Makefile
@@ -1,15 +1,15 @@
-CFLAGS=-Wall
+ARMADEUS_BASE_DIR=../../../..
+-include $(ARMADEUS_BASE_DIR)/Makefile.in
+
+# Default values for local compiling:
+STAGING_DIR:=$(ARMADEUS_BUILD_DIR)/staging_dir/
+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) -g
+
 LDFLAGS= -lSDL -lpthread
-ifeq ($(PREFIX),)
-# Host
-CC=gcc
-CFLAGS+= -O2
-else
-# APF
-CC=${PREFIX}/usr/bin/arm-linux-uclibc-gcc
-CFLAGS+= -Os
-INSTALL_DIR=/tftpboot
-endif
 
 EXEC=capture
 SRC= $(wildcard *.c *.h)
@@ -30,5 +30,6 @@ clean:
 	rm -f $(EXEC)
 
 install: all
-	cp -f $(EXEC) $(INSTALL_DIR)
+	mkdir -p $(INSTALL_DIR)
+	cp $(EXEC) $(INSTALL_DIR)
 


hooks/post-receive
-- 
armadeus