WebSVN – HelenOS – Path Comparison – / – /branches/dynload/uspace/ Rev 4340 and /branches/dynload/uspace Rev 4339

Ignore whitespace Rev 4340 → Rev 4339

 /branches/dynload/uspace/lib/libc/Makefile.toolchain
 ,11 → 30,12
 CFLAGS = -fno-builtin -Wall -Werror-implicit-function-declaration -Wmissing-prototypes -O3 -nostdlib -nostdinc -I$(LIBC_PREFIX)/include -pipe -g
 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
 #

 /branches/dynload/uspace/lib/libc/arch/mips32/Makefile.inc
 ,7 → 37,7
 TOOLCHAIN_DIR = $(CROSS_PREFIX)/mipsel/bin
 CFLAGS += -mips3
--include ../../../Makefile.config
+-include ../../Makefile.config
 ifeq ($(CONFIG_MIPS_FPU),y)
     CFLAGS += -DCONFIG_MIPS_FPU
 endif

 /branches/dynload/uspace/lib/libc/Makefile
 ,7 → 30,7
 ## Common compiler flags
 #
--include ../../../Makefile.config
+include ../../Makefile.config
 LIBC_PREFIX = $(shell pwd)
 SOFTINT_PREFIX = ../softint

 /branches/dynload/uspace/lib/libfs/Makefile
 ,7 → 30,7
 ## Common compiler flags
 #
--include ../../../Makefile.config
+include ../../Makefile.config
 LIBC_PREFIX = ../libc
 ## Setup toolchain

 /branches/dynload/uspace/lib/libblock/Makefile
 ,7 → 30,7
 ## Common compiler flags
 #
--include ../../../Makefile.config
+include ../../Makefile.config
 LIBC_PREFIX = ../libc
 ## Setup toolchain

 /branches/dynload/uspace/lib/softfloat/Makefile
 ,7 → 29,7
 ## Common compiler flags
 #
--include ../../../Makefile.config
+include ../../Makefile.config
 LIBC_PREFIX = ../libc
 ## Setup toolchain

 /branches/dynload/uspace/lib/softint/Makefile
 ,7 → 30,7
 ## Common compiler flags
 #
--include ../../../Makefile.config
+include ../../Makefile.config
 LIBC_PREFIX = ../libc
 ## Setup toolchain

 /branches/dynload/uspace/srv/console/Makefile
 ,7 → 29,7
 ## Setup toolchain
 #
--include ../../../Makefile.config
+include ../../Makefile.config
 LIBC_PREFIX = ../../lib/libc
 SOFTINT_PREFIX = ../../lib/softint

 /branches/dynload/uspace/srv/fb/Makefile
 ,7 → 29,7
 ## Setup toolchain
 #
--include ../../../Makefile.config
+include ../../Makefile.config
 LIBC_PREFIX = ../../lib/libc
 SOFTINT_PREFIX = ../../lib/softint

 /branches/dynload/uspace/srv/kbd/Makefile
 ,14 → 29,14
 ## Setup toolchain
 #
--include ../../../Makefile.config
+include ../../Makefile.config
 LIBC_PREFIX = ../../lib/libc
 SOFTINT_PREFIX = ../../lib/softint
 RTLD_PREFIX = ../../lib/rtld
 include $(LIBC_PREFIX)/Makefile.toolchain
 include $(LIBC_PREFIX)/Makefile.app
+include ../../../Makefile.config
 CFLAGS += -Iinclude -I../libadt/include

 /branches/dynload/uspace/srv/loader/Makefile
 ,7 → 27,7
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
--include ../../../Makefile.config
+include ../../Makefile.config
 ## Setup toolchain
 #

 /branches/dynload/uspace/srv/ns/Makefile
 ,7 → 29,7
 ## Setup toolchain
 #
--include ../../../Makefile.config
+include ../../Makefile.config
 LIBC_PREFIX = ../../lib/libc
 SOFTINT_PREFIX = ../../lib/softint

 /branches/dynload/uspace/srv/rd/Makefile
 ,7 → 29,7
 ## Setup toolchain
 #
--include ../../../Makefile.config
+include ../../Makefile.config
 LIBC_PREFIX = ../../lib/libc
 SOFTINT_PREFIX = ../../lib/softint

 /branches/dynload/uspace/srv/fs/tmpfs/Makefile
 ,7 → 29,7
 ## Setup toolchain
 #
--include ../../../../Makefile.config
+include ../../../Makefile.config
 LIBC_PREFIX = ../../../lib/libc
 LIBFS_PREFIX = ../../../lib/libfs

 /branches/dynload/uspace/srv/fs/fat/Makefile
 ,7 → 29,7
 ## Setup toolchain
 #
--include ../../../../Makefile.config
+include ../../../Makefile.config
 LIBC_PREFIX = ../../../lib/libc
 LIBFS_PREFIX = ../../../lib/libfs

 /branches/dynload/uspace/srv/pci/libpci/Makefile
 ,7 → 3,7
 # Modified and ported to HelenOS by Jakub Jermar
--include ../../../../Makefile.config
+include ../../../Makefile.config
 LIBC_PREFIX=$(shell cd ../../../lib/libc; pwd)

 /branches/dynload/uspace/srv/pci/Makefile
 ,7 → 29,7
 ## Setup toolchain
 #
--include ../../../Makefile.config
+include ../../Makefile.config
 LIBC_PREFIX = ../../lib/libc
 SOFTINT_PREFIX = ../../lib/softint

 /branches/dynload/uspace/srv/devmap/Makefile
 ,7 → 29,7
 ## Setup toolchain
 #
--include ../../../Makefile.config
+include ../../Makefile.config
 LIBC_PREFIX = ../../lib/libc
 SOFTINT_PREFIX = ../../lib/softint

 /branches/dynload/uspace/srv/vfs/Makefile
 ,7 → 30,7
 ## Setup toolchain
 #
--include ../../../Makefile.config
+include ../../Makefile.config
 LIBC_PREFIX = ../../lib/libc
 SOFTINT_PREFIX = ../../lib/softint

 /branches/dynload/uspace/app/bdsh/Makefile
 ,7 → 30,7
 # POSSIBILITY OF SUCH DAMAGE.
 include ../../../version
--include ../../../Makefile.config
+include ../../Makefile.config
 LIBC_PREFIX = ../../lib/libc
 SOFTINT_PREFIX = ../../lib/softint

 /branches/dynload/uspace/app/tester/Makefile
 ,7 → 29,7
 ## Setup toolchain
 #
--include ../../../Makefile.config
+include ../../Makefile.config
 LIBC_PREFIX = ../../lib/libc
 SOFTINT_PREFIX = ../../lib/softint

/branches/dynload/uspace/app/tetris/Makefile
1,4 → 1,4
-include ../../../Makefile.config
include ../../Makefile.config

LIBC_PREFIX = ../../lib/libc
SOFTINT_PREFIX = ../../lib/softint

 /branches/dynload/uspace/app/klog/Makefile
 ,7 → 29,7
 ## Setup toolchain
 #
--include ../../../Makefile.config
+include ../../Makefile.config
 LIBC_PREFIX = ../../lib/libc
 SOFTINT_PREFIX = ../../lib/softint

 /branches/dynload/uspace/app/trace/Makefile
 ,7 → 29,7
 ## Setup toolchain
 #
--include ../../../Makefile.config
+include ../../Makefile.config
 LIBC_PREFIX = ../../lib/libc
 SOFTINT_PREFIX = ../../lib/softint

 /branches/dynload/uspace/app/init/Makefile
 ,7 → 27,7
 #
 include ../../../version
--include ../../../Makefile.config
+include ../../Makefile.config
 ## Setup toolchain
 #

 /branches/dynload/uspace/Makefile
 ,7 → 29,7
 ## Include configuration
 #
--include ../Makefile.config
+-include Makefile.config
 DIRS = \
     lib/rtld \
 ,14 → 79,22
 BUILDS := $(addsuffix .build,$(DIRS))
 CLEANS := $(addsuffix .clean,$(DIRS))
-.PHONY: all $(BUILDS) $(CLEANS) clean kerninc
+.PHONY: all config build $(BUILDS) $(CLEANS) clean distclean
-all: ../Makefile.config kerninc $(BUILDS)
+all:
+    ../tools/config.py uspace.config default $(ARCH) $(COMPILER) $(CONFIG_DEBUG)
+    $(MAKE) -C lib/libc kerninc
+    $(MAKE) -C . build
+config:
+    ../tools/config.py uspace.config
+build: $(BUILDS)
 clean: $(CLEANS)
-kerninc:
-    $(MAKE) -C lib/libc kerninc
+distclean: clean
+    -rm Makefile.config
 $(CLEANS):
     -$(MAKE) -C $(basename $@) clean

 /branches/dynload/uspace/uspace.config
 ,0 → 1,71
+#
+# 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)
+# Use shared C library
+! CONFIG_SHARED_LIBC (y/n)

Subversion Repositories HelenOS

Compare Revisions

Ignore whitespace Rev 4340 → Rev 4339