Index: uspace/Makefile =================================================================== --- uspace/Makefile (revision 6cd3e8a85bdf3306fe1a17aa12b7c50009f1133e) +++ uspace/Makefile (revision be8b5d6f4c9030b583eac0ddf3be2fb14374ac6a) @@ -30,5 +30,5 @@ # --include Makefile.config +-include ../Makefile.config DIRS = \ @@ -74,19 +74,9 @@ CLEANS := $(addsuffix .clean,$(DIRS)) -.PHONY: all config build $(BUILDS) $(CLEANS) clean distclean +.PHONY: all $(BUILDS) $(CLEANS) clean -all: - ../tools/config.py uspace.config default $(ARCH) $(COMPILER) $(CONFIG_DEBUG) - $(MAKE) -C . build - -config: - ../tools/config.py uspace.config - -build: $(BUILDS) +all: ../Makefile.config $(BUILDS) clean: $(CLEANS) - -distclean: clean - -rm Makefile.config $(CLEANS): Index: uspace/app/bdsh/Makefile =================================================================== --- uspace/app/bdsh/Makefile (revision 6cd3e8a85bdf3306fe1a17aa12b7c50009f1133e) +++ uspace/app/bdsh/Makefile (revision be8b5d6f4c9030b583eac0ddf3be2fb14374ac6a) @@ -31,5 +31,5 @@ include ../../../version -include ../../Makefile.config +-include ../../../Makefile.config LIBC_PREFIX = ../../lib/libc Index: uspace/app/init/Makefile =================================================================== --- uspace/app/init/Makefile (revision 6cd3e8a85bdf3306fe1a17aa12b7c50009f1133e) +++ uspace/app/init/Makefile (revision be8b5d6f4c9030b583eac0ddf3be2fb14374ac6a) @@ -28,5 +28,5 @@ include ../../../version -include ../../Makefile.config +-include ../../../Makefile.config ## Setup toolchain Index: uspace/app/klog/Makefile =================================================================== --- uspace/app/klog/Makefile (revision 6cd3e8a85bdf3306fe1a17aa12b7c50009f1133e) +++ uspace/app/klog/Makefile (revision be8b5d6f4c9030b583eac0ddf3be2fb14374ac6a) @@ -30,5 +30,5 @@ # -include ../../Makefile.config +-include ../../../Makefile.config LIBC_PREFIX = ../../lib/libc Index: uspace/app/tester/Makefile =================================================================== --- uspace/app/tester/Makefile (revision 6cd3e8a85bdf3306fe1a17aa12b7c50009f1133e) +++ uspace/app/tester/Makefile (revision be8b5d6f4c9030b583eac0ddf3be2fb14374ac6a) @@ -30,5 +30,5 @@ # -include ../../Makefile.config +-include ../../../Makefile.config LIBC_PREFIX = ../../lib/libc Index: uspace/app/tetris/Makefile =================================================================== --- uspace/app/tetris/Makefile (revision 6cd3e8a85bdf3306fe1a17aa12b7c50009f1133e) +++ uspace/app/tetris/Makefile (revision be8b5d6f4c9030b583eac0ddf3be2fb14374ac6a) @@ -1,3 +1,3 @@ -include ../../Makefile.config +-include ../../../Makefile.config LIBC_PREFIX = ../../lib/libc Index: uspace/app/trace/Makefile =================================================================== --- uspace/app/trace/Makefile (revision 6cd3e8a85bdf3306fe1a17aa12b7c50009f1133e) +++ uspace/app/trace/Makefile (revision be8b5d6f4c9030b583eac0ddf3be2fb14374ac6a) @@ -30,5 +30,5 @@ # -include ../../Makefile.config +-include ../../../Makefile.config LIBC_PREFIX = ../../lib/libc Index: uspace/lib/libblock/Makefile =================================================================== --- uspace/lib/libblock/Makefile (revision 6cd3e8a85bdf3306fe1a17aa12b7c50009f1133e) +++ uspace/lib/libblock/Makefile (revision be8b5d6f4c9030b583eac0ddf3be2fb14374ac6a) @@ -31,5 +31,5 @@ # -include ../../Makefile.config +-include ../../../Makefile.config LIBC_PREFIX = ../libc Index: uspace/lib/libc/Makefile =================================================================== --- uspace/lib/libc/Makefile (revision 6cd3e8a85bdf3306fe1a17aa12b7c50009f1133e) +++ uspace/lib/libc/Makefile (revision be8b5d6f4c9030b583eac0ddf3be2fb14374ac6a) @@ -30,5 +30,5 @@ # -include ../../Makefile.config +-include ../../../Makefile.config LIBC_PREFIX = $(shell pwd) Index: uspace/lib/libc/Makefile.toolchain =================================================================== --- uspace/lib/libc/Makefile.toolchain (revision 6cd3e8a85bdf3306fe1a17aa12b7c50009f1133e) +++ uspace/lib/libc/Makefile.toolchain (revision be8b5d6f4c9030b583eac0ddf3be2fb14374ac6a) @@ -31,10 +31,9 @@ LFLAGS = -M -N $(SOFTINT_PREFIX)/libsoftint.a AFLAGS = -#-Werror ## Setup platform configuration # -include $(LIBC_PREFIX)/arch/$(ARCH)/Makefile.inc +-include $(LIBC_PREFIX)/arch/$(ARCH)/Makefile.inc ## Simple detection of the host system Index: uspace/lib/libc/arch/mips32/Makefile.inc =================================================================== --- uspace/lib/libc/arch/mips32/Makefile.inc (revision 6cd3e8a85bdf3306fe1a17aa12b7c50009f1133e) +++ uspace/lib/libc/arch/mips32/Makefile.inc (revision be8b5d6f4c9030b583eac0ddf3be2fb14374ac6a) @@ -38,5 +38,5 @@ CFLAGS += -mips3 --include ../../Makefile.config +-include ../../../Makefile.config ifeq ($(CONFIG_MIPS_FPU),y) CFLAGS += -DCONFIG_MIPS_FPU Index: uspace/lib/libfs/Makefile =================================================================== --- uspace/lib/libfs/Makefile (revision 6cd3e8a85bdf3306fe1a17aa12b7c50009f1133e) +++ uspace/lib/libfs/Makefile (revision be8b5d6f4c9030b583eac0ddf3be2fb14374ac6a) @@ -31,5 +31,5 @@ # -include ../../Makefile.config +-include ../../../Makefile.config LIBC_PREFIX = ../libc Index: uspace/lib/softfloat/Makefile =================================================================== --- uspace/lib/softfloat/Makefile (revision 6cd3e8a85bdf3306fe1a17aa12b7c50009f1133e) +++ uspace/lib/softfloat/Makefile (revision be8b5d6f4c9030b583eac0ddf3be2fb14374ac6a) @@ -30,5 +30,5 @@ # -include ../../Makefile.config +-include ../../../Makefile.config LIBC_PREFIX = ../libc Index: uspace/lib/softint/Makefile =================================================================== --- uspace/lib/softint/Makefile (revision 6cd3e8a85bdf3306fe1a17aa12b7c50009f1133e) +++ uspace/lib/softint/Makefile (revision be8b5d6f4c9030b583eac0ddf3be2fb14374ac6a) @@ -30,5 +30,5 @@ # -include ../../Makefile.config +-include ../../../Makefile.config LIBC_PREFIX = ../libc Index: uspace/srv/console/Makefile =================================================================== --- uspace/srv/console/Makefile (revision 6cd3e8a85bdf3306fe1a17aa12b7c50009f1133e) +++ uspace/srv/console/Makefile (revision be8b5d6f4c9030b583eac0ddf3be2fb14374ac6a) @@ -30,5 +30,5 @@ # -include ../../Makefile.config +-include ../../../Makefile.config LIBC_PREFIX = ../../lib/libc Index: uspace/srv/devmap/Makefile =================================================================== --- uspace/srv/devmap/Makefile (revision 6cd3e8a85bdf3306fe1a17aa12b7c50009f1133e) +++ uspace/srv/devmap/Makefile (revision be8b5d6f4c9030b583eac0ddf3be2fb14374ac6a) @@ -30,5 +30,5 @@ # -include ../../Makefile.config +-include ../../../Makefile.config LIBC_PREFIX = ../../lib/libc Index: uspace/srv/fb/Makefile =================================================================== --- uspace/srv/fb/Makefile (revision 6cd3e8a85bdf3306fe1a17aa12b7c50009f1133e) +++ uspace/srv/fb/Makefile (revision be8b5d6f4c9030b583eac0ddf3be2fb14374ac6a) @@ -30,5 +30,5 @@ # -include ../../Makefile.config +-include ../../../Makefile.config LIBC_PREFIX = ../../lib/libc Index: uspace/srv/fs/fat/Makefile =================================================================== --- uspace/srv/fs/fat/Makefile (revision 6cd3e8a85bdf3306fe1a17aa12b7c50009f1133e) +++ uspace/srv/fs/fat/Makefile (revision be8b5d6f4c9030b583eac0ddf3be2fb14374ac6a) @@ -30,5 +30,5 @@ # -include ../../../Makefile.config +-include ../../../../Makefile.config LIBC_PREFIX = ../../../lib/libc Index: uspace/srv/fs/tmpfs/Makefile =================================================================== --- uspace/srv/fs/tmpfs/Makefile (revision 6cd3e8a85bdf3306fe1a17aa12b7c50009f1133e) +++ uspace/srv/fs/tmpfs/Makefile (revision be8b5d6f4c9030b583eac0ddf3be2fb14374ac6a) @@ -30,5 +30,5 @@ # -include ../../../Makefile.config +-include ../../../../Makefile.config LIBC_PREFIX = ../../../lib/libc Index: uspace/srv/kbd/Makefile =================================================================== --- uspace/srv/kbd/Makefile (revision 6cd3e8a85bdf3306fe1a17aa12b7c50009f1133e) +++ uspace/srv/kbd/Makefile (revision be8b5d6f4c9030b583eac0ddf3be2fb14374ac6a) @@ -30,10 +30,9 @@ # -include ../../Makefile.config +-include ../../../Makefile.config LIBC_PREFIX = ../../lib/libc SOFTINT_PREFIX = ../../lib/softint -include $(LIBC_PREFIX)/Makefile.toolchain -include ../../../Makefile.config +include $(LIBC_PREFIX)/Makefile.toolchain CFLAGS += -Iinclude -I../libadt/include Index: uspace/srv/loader/Makefile =================================================================== --- uspace/srv/loader/Makefile (revision 6cd3e8a85bdf3306fe1a17aa12b7c50009f1133e) +++ uspace/srv/loader/Makefile (revision be8b5d6f4c9030b583eac0ddf3be2fb14374ac6a) @@ -28,5 +28,5 @@ # -include ../../Makefile.config +-include ../../../Makefile.config ## Setup toolchain Index: uspace/srv/ns/Makefile =================================================================== --- uspace/srv/ns/Makefile (revision 6cd3e8a85bdf3306fe1a17aa12b7c50009f1133e) +++ uspace/srv/ns/Makefile (revision be8b5d6f4c9030b583eac0ddf3be2fb14374ac6a) @@ -30,5 +30,5 @@ # -include ../../Makefile.config +-include ../../../Makefile.config LIBC_PREFIX = ../../lib/libc Index: uspace/srv/pci/Makefile =================================================================== --- uspace/srv/pci/Makefile (revision 6cd3e8a85bdf3306fe1a17aa12b7c50009f1133e) +++ uspace/srv/pci/Makefile (revision be8b5d6f4c9030b583eac0ddf3be2fb14374ac6a) @@ -30,5 +30,5 @@ # -include ../../Makefile.config +-include ../../../Makefile.config LIBC_PREFIX = ../../lib/libc Index: uspace/srv/pci/libpci/Makefile =================================================================== --- uspace/srv/pci/libpci/Makefile (revision 6cd3e8a85bdf3306fe1a17aa12b7c50009f1133e) +++ uspace/srv/pci/libpci/Makefile (revision be8b5d6f4c9030b583eac0ddf3be2fb14374ac6a) @@ -4,5 +4,5 @@ # Modified and ported to HelenOS by Jakub Jermar -include ../../../Makefile.config +-include ../../../../Makefile.config LIBC_PREFIX=$(shell cd ../../../lib/libc; pwd) Index: uspace/srv/rd/Makefile =================================================================== --- uspace/srv/rd/Makefile (revision 6cd3e8a85bdf3306fe1a17aa12b7c50009f1133e) +++ uspace/srv/rd/Makefile (revision be8b5d6f4c9030b583eac0ddf3be2fb14374ac6a) @@ -30,5 +30,5 @@ # -include ../../Makefile.config +-include ../../../Makefile.config LIBC_PREFIX = ../../lib/libc Index: uspace/srv/vfs/Makefile =================================================================== --- uspace/srv/vfs/Makefile (revision 6cd3e8a85bdf3306fe1a17aa12b7c50009f1133e) +++ uspace/srv/vfs/Makefile (revision be8b5d6f4c9030b583eac0ddf3be2fb14374ac6a) @@ -31,5 +31,5 @@ # -include ../../Makefile.config +-include ../../../Makefile.config LIBC_PREFIX = ../../lib/libc Index: uspace/uspace.config =================================================================== --- uspace/uspace.config (revision 6cd3e8a85bdf3306fe1a17aa12b7c50009f1133e) +++ (revision ) @@ -1,68 +1,0 @@ -# -# Copyright (c) 2006 Ondrej Palkovsky -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# - Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# - Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# - The name of the author may not be used to endorse or promote products -# derived from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# - -## General configuration directives - -# Architecture -@ "amd64" AMD64/Intel EM64T -@ "arm32" ARM 32-bit -@ "ia32" Intel IA-32 -@ "ia64" Intel IA-64 -@ "mips32" MIPS 32-bit Little Endian -@ "mips32eb" MIPS 32-bit Big Endian -@ "ppc32" PowerPC 32-bit -@ "ppc64" PowerPC 64-bit -@ "sparc64" Sun UltraSPARC 64-bit -! ARCH (choice) - -# Compiler -@ "gcc_cross" GCC Cross-compiler -@ "gcc_native" GCC Native -@ "icc_native" ICC Native -@ "suncc_native" Sun Studio C Compiler -! [ARCH=amd64|ARCH=ia32] COMPILER (choice) - -# Compiler -@ "gcc_cross" GCC Cross-compiler -@ "gcc_native" GCC Native -@ "icc_native" ICC Native -! [ARCH=ia64] COMPILER (choice) - -# Compiler -@ "gcc_cross" GCC Cross-compiler -@ "gcc_native" GCC Native -@ "suncc_native" Sun Studio C Compiler -! [ARCH=sparc64] COMPILER (choice) - -# Compiler -@ "gcc_cross" GCC Cross-compiler -@ "gcc_native" GCC Native -! [ARCH=arm32|ARCH=mips32|ARCH=mips32eb|ARCH=ppc32|ARCH=ppc64] COMPILER (choice) - -# General debuging and assert checking -! CONFIG_DEBUG (y/n)