[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.0-2591-gc875ca0

[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  c875ca07a443ef85563454386fba51a21533054d (commit)
       via  4827d0373a7200a9f97477465c6c660fa1eb0dd2 (commit)
      from  f2395b95af9042578f27f92d8c3eafdfbdb9c08a (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 c875ca07a443ef85563454386fba51a21533054d
Merge: 4827d03 f2395b9
Author: Julien Boibessot <jul...@ar...>
Date:   Tue Nov 29 18:09:01 2011 +0100

    Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus

commit 4827d0373a7200a9f97477465c6c660fa1eb0dd2
Author: Julien Boibessot <jul...@ar...>
Date:   Tue Nov 29 18:08:16 2011 +0100

    [BUILD] Makes 'make linux' works too

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

Summary of changes:
 Makefile |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 9e68ccd..1636f29 100644
--- a/Makefile
+++ b/Makefile
@@ -141,9 +141,9 @@ linux-menuconfig:
 		$(MAKE) -C $(BUILDROOT_DIR) linux26-menuconfig ; \
 	fi;
 
-linux26: $(BUILDROOT_DIR)/.configured
+linux26 linux: $(BUILDROOT_DIR)/.configured
 	@-touch $(ARMADEUS_LINUX_DIR)/.config 
-	@$(MAKE) -C $(BUILDROOT_DIR) linux26
+	@$(MAKE) -C $(BUILDROOT_DIR) $@
 
 linux26-clean: $(BUILDROOT_DIR)/.configured
 ifneq (,$(filter $(BUILDROOT_VERSION),20081103 2010.05))


hooks/post-receive
-- 
armadeus