[Armadeus-commitlog] SF.net SVN: armadeus:[1028] trunk

[<ar...@us...>]

Revision: 1028
          http://armadeus.svn.sourceforge.net/armadeus/?rev=1028&view=rev
Author:   artemys
Date:     2009-01-28 11:02:09 +0000 (Wed, 28 Jan 2009)

Log Message:
-----------
[BUILD] Make it easier to get some important shell environment variables (for access to the most used Armadeus directories)

Modified Paths:
--------------
    trunk/Makefile
    trunk/Makefile.in

Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2009-01-27 21:09:49 UTC (rev 1027)
+++ trunk/Makefile	2009-01-28 11:02:09 UTC (rev 1028)
@@ -1,6 +1,6 @@
-# Makefile for armadeus
+# Makefile for Armadeus
 #
-# Copyright (C) 2005-2007 by <jo...@ar...>
+# Copyright (C) 2005-2009 by the Armadeus Team
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -23,6 +23,7 @@
 #--------------------------------------------------------------
 
 BUILDROOT_DIR = buildroot
+include ./Makefile.in
 
 BUILDROOT_NAME=buildroot
 BUILDROOT_FILE_PATH:=downloads
@@ -31,25 +32,20 @@
 BUILDROOT_VERSION:=20081103
 BUILDROOT_SOURCE:=buildroot-$(BUILDROOT_VERSION).tar.bz2
 
--include $(BUILDROOT_DIR)/.config
-LINUX_VERSION:=$(shell echo $(BR2_LINUX26_VERSION))
-BOARD_NAME:=$(shell echo $(BR2_BOARD_NAME))
-ARCH:=$(shell echo $(BR2_GCC_TARGET_ARCH))
-
 ARMADEUS_TOPDIR:=$(shell pwd)
 export ARMADEUS_TOPDIR
 
 PATCH_DIR=patches
 TAR_OPTIONS=--exclude=.svn -xf 
 
-LINUX_DIR=$(BUILDROOT_DIR)/project_build_$(ARCH)/$(BOARD_NAME)/linux-$(LINUX_VERSION)
-BOARD_DIR=$(BUILDROOT_DIR)/target/device/armadeus/$(BOARD_NAME)/
+ARMADEUS_ENV_FILE=armadeus_env.sh
 
+
 ECHO_CONFIGURATION_NOT_DEFINED:= echo -en "\033[1m"; \
                 echo "                                                   "; \
                 echo " System not configured. Use make <board>_defconfig " >&2; \
                 echo " armadeus valid configurations are:                " >&2; \
-                echo "     "$(shell find ./$(BUILDROOT_DIR)/target/device/armadeus -name *_defconfig|sed 's/.*\///');\
+                echo "     "$(shell find $(BUILDROOT_DIR)/target/device/armadeus -name *_defconfig|sed 's/.*\///');\
                 echo "                                                   "; \
 		echo -en "\033[0m";
 
@@ -116,12 +112,12 @@
 	$(MAKE) -C $(BUILDROOT_DIR)
 
 linux-menuconfig:
-	@if [ -e "$(LINUX_DIR)/.unpacked" ] ; then \
+	@if [ -e "$(ARMADEUS_LINUX_DIR)/.unpacked" ] ; then \
 		$(MAKE) -C $(BUILDROOT_DIR) linux26-menuconfig ; \
 	fi;
 
 linux26: $(BUILDROOT_DIR)/.configured
-	@-touch $(LINUX_DIR)/.config 
+	@-touch $(ARMADEUS_LINUX_DIR)/.config 
 	@$(MAKE) -C $(BUILDROOT_DIR) linux26
 
 linux26-clean: $(BUILDROOT_DIR)/.configured
@@ -162,7 +158,13 @@
 buildroot-dirclean:
 	rm -rf $(BUILDROOT_DIR)	
 
+# Generate shell's most useful variables:
+shell_env:
+	@echo ARMADEUS_LINUX_DIR=$(ARMADEUS_LINUX_DIR)   >  $(ARMADEUS_ENV_FILE)
+	@echo ARMADEUS_ROOTFS_DIR=$(ARMADEUS_ROOTFS_DIR) >> $(ARMADEUS_ENV_FILE)
+
+
 PHONY_TARGETS+=dummy all linux-menuconfig linux26 linux26-clean buildroot-clean buildroot-dirclean
-PHONY_TARGETS+=menuconfig $(BUILDROOT_DIR)/.config
+PHONY_TARGETS+=menuconfig $(BUILDROOT_DIR)/.config shell_env
 .PHONY: $(PHONY_TARGETS)
 

Modified: trunk/Makefile.in
===================================================================
--- trunk/Makefile.in	2009-01-27 21:09:49 UTC (rev 1027)
+++ trunk/Makefile.in	2009-01-28 11:02:09 UTC (rev 1028)
@@ -4,6 +4,10 @@
 # calling directory before including this file !!
 #
 
+ifeq ($(ARMADEUS_BASE_DIR),)
+ARMADEUS_BASE_DIR=$(shell pwd)
+endif
+
 BUILDROOT_DIR=$(ARMADEUS_BASE_DIR)/buildroot
 -include $(BUILDROOT_DIR)/.config
 
@@ -16,4 +20,5 @@
 ARMADEUS_LINUX_DIR=$(BUILDROOT_DIR)/project_build_$(ARMADEUS_TARGET_ARCH)/$(ARMADEUS_BOARD_NAME)/linux-$(ARMADEUS_LINUX_VERSION)
 ARMADEUS_UCLIBC_DIR=$(BUILDROOT_DIR)/toolchain_build_$(ARMADEUS_TARGET_ARCH)/uClibc-$(ARMADEUS_UCLIBC_VERSION)
 ARMADEUS_BOARD_DIR=$(BUILDROOT_DIR)/target/device/armadeus/$(ARMADEUS_BOARD_NAME)/
+ARMADEUS_ROOTFS_DIR=$(BUILDROOT_DIR)/project_build_$(ARMADEUS_TARGET_ARCH)/$(ARMADEUS_BOARD_NAME)/root
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.