[Armadeus-commitlog] armadeus branch, master, updated. release-3.2-199-g4d19d15

[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  4d19d15fa070b7b5b0c37570ac1f6651e33ce416 (commit)
       via  ebd7f779abf1ac942d5cd8b2c8576dd1c04a9912 (commit)
      from  917d61ed60d7a2745aee027a277acd8453b7b100 (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 4d19d15fa070b7b5b0c37570ac1f6651e33ce416
Author: Julien Boibessot <jul...@ar...>
Date:   Mon Feb 15 11:24:44 2010 +0100

    [DEMOS] Updates real_time/Makefile.in

commit ebd7f779abf1ac942d5cd8b2c8576dd1c04a9912
Author: Julien Boibessot <jul...@ar...>
Date:   Mon Feb 15 11:22:26 2010 +0100

    [BUILD] Add ARMADEUS_XENOMAI_DIR envt variable

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

Summary of changes:
 Makefile                           |    1 +
 Makefile.in                        |    2 ++
 target/demos/real_time/Makefile.in |   26 ++++++++++++--------------
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/Makefile b/Makefile
index 3375976..549f0eb 100644
--- a/Makefile
+++ b/Makefile
@@ -194,6 +194,7 @@ shell_env:
 	@echo ARMADEUS_ROOTFS_TAR=$(ARMADEUS_ROOTFS_TAR) >> $(ARMADEUS_ENV_FILE)
 	@echo ARMADEUS_STAGING_DIR=$(ARMADEUS_STAGING_DIR) >> $(ARMADEUS_ENV_FILE)
 	@echo ARMADEUS_TOOLCHAIN_PATH=$(ARMADEUS_TOOLCHAIN_PATH) >> $(ARMADEUS_ENV_FILE)
+	@echo ARMADEUS_XENOMAI_DIR=$(ARMADEUS_XENOMAI_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 c3910b1..dbcfa67 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -30,6 +30,7 @@ ARMADEUS_SDL_VERSION:=$(shell grep "SDL_VERSION:=" $(BUILDROOT_DIR)/package/sdl/
 ifeq ($(ARMADEUS_SDL_VERSION),)
 ARMADEUS_SDL_VERSION:=SDL_NOT_INSTALLED
 endif
+ARMADEUS_XENOMAI_VERSION:=$(shell grep "XENOMAI_VERSION:=" $(BUILDROOT_DIR)/package/xenomai/xenomai.mk 2>/dev/null | cut -d = -f 2)
 
 ARMADEUS_PATCH_DIR=patches
 ifeq ($(BR2_VERSION),"0.10.0-svn")
@@ -56,4 +57,5 @@ ARMADEUS_TOOLCHAIN_PATH:=$(ARMADEUS_STAGING_DIR)/usr/bin
 
 ARMADEUS_BUILD_DIR:=$(BUILDROOT_BUILD_DIR)
 ARMADEUS_SDL_DIR:=$(ARMADEUS_BUILD_DIR)/SDL-$(ARMADEUS_SDL_VERSION)
+ARMADEUS_XENOMAI_DIR:=$(ARMADEUS_BUILD_DIR)/xenomai-$(ARMADEUS_XENOMAI_VERSION)
 
diff --git a/target/demos/real_time/Makefile.in b/target/demos/real_time/Makefile.in
index 3728d35..c4cf0de 100644
--- a/target/demos/real_time/Makefile.in
+++ b/target/demos/real_time/Makefile.in
@@ -2,15 +2,14 @@
 DEST_DIR=/tftpboot/local/bin
 include $(ARMADEUS_BASE_DIR)/Makefile.in
 
-
-CC= $(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc
-LD= $(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-ld
-CXX= $(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-g++
-AS= $(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-as
-NM= $(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-nm
-AR= $(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-ar
-SIZE= $(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-size
-OBJCOPY= $(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-objcopy
+CC:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc
+LD:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-ld
+CXX:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-g++
+AS:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-as
+NM:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-nm
+AR:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-ar
+SIZE:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-size
+OBJCOPY:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-objcopy
 
 EXEC=$(APPLICATIONS)
 
@@ -28,9 +27,10 @@ endif
 
 $(EXEC) : $(OBJ)
 	$(CC) -o $@ $^ $(LDFLAGS)
+
 $(OBJ): $(SRC)
 	$(CC) $(CFLAGS) -o $@ -c $<
-.PHONY: install
+
 ifeq ($(XENOMAI),y)
 install: $(EXEC)
 	mkdir -p $(DEST_DIR)/$(EXEC)
@@ -58,21 +58,19 @@ CLEAN_MOD+= .tmp_versions Module.markers
 $(EXEC): $(MODULES).c
 	$(MAKE) -C $(KSRC) SUBDIRS=$(PWD) modules
 
-.PHONY: install
 install: $(EXEC)
 	cp $(EXEC) $(DEST_DIR)/$(EXEC)
 endif
 
-.PHONY: all
 all: $(EXEC)
 
-.PHONY: clean 
 clean:
 	rm -rf $(OBJ) $(CLEAN_MOD)
 	rm -f $(EXEC)
 	rm -f *.c~ *.h~ Makefile~
 
-.PHONY: mrproper
 mrproper: clean
 	rm -rf $(DEST_DIR)/$(EXEC)
 
+.PHONY: all install clean mrproper
+


hooks/post-receive
-- 
armadeus