Subversion Repositories HelenOS

Compare Revisions

Ignore whitespace Rev 4339 → Rev 4340

/branches/dynload/uspace/uspace.config
File deleted
/branches/dynload/uspace/app/bdsh/Makefile
30,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/init/Makefile
27,7 → 27,7
#
 
include ../../../version
include ../../Makefile.config
-include ../../../Makefile.config
 
## Setup toolchain
#
/branches/dynload/uspace/app/tester/Makefile
29,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
29,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
29,7 → 29,7
## Setup toolchain
#
 
include ../../Makefile.config
-include ../../../Makefile.config
 
LIBC_PREFIX = ../../lib/libc
SOFTINT_PREFIX = ../../lib/softint
/branches/dynload/uspace/lib/libfs/Makefile
30,7 → 30,7
## Common compiler flags
#
 
include ../../Makefile.config
-include ../../../Makefile.config
 
LIBC_PREFIX = ../libc
## Setup toolchain
/branches/dynload/uspace/lib/libblock/Makefile
30,7 → 30,7
## Common compiler flags
#
 
include ../../Makefile.config
-include ../../../Makefile.config
 
LIBC_PREFIX = ../libc
## Setup toolchain
/branches/dynload/uspace/lib/softfloat/Makefile
29,7 → 29,7
## Common compiler flags
#
 
include ../../Makefile.config
-include ../../../Makefile.config
 
LIBC_PREFIX = ../libc
## Setup toolchain
/branches/dynload/uspace/lib/softint/Makefile
30,7 → 30,7
## Common compiler flags
#
 
include ../../Makefile.config
-include ../../../Makefile.config
 
LIBC_PREFIX = ../libc
## Setup toolchain
/branches/dynload/uspace/lib/libc/Makefile.toolchain
30,12 → 30,11
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/Makefile
30,7 → 30,7
## Common compiler flags
#
 
include ../../Makefile.config
-include ../../../Makefile.config
 
LIBC_PREFIX = $(shell pwd)
SOFTINT_PREFIX = ../softint
/branches/dynload/uspace/lib/libc/arch/mips32/Makefile.inc
37,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/srv/kbd/Makefile
29,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/ns/Makefile
29,7 → 29,7
## Setup toolchain
#
 
include ../../Makefile.config
-include ../../../Makefile.config
 
LIBC_PREFIX = ../../lib/libc
SOFTINT_PREFIX = ../../lib/softint
/branches/dynload/uspace/srv/console/Makefile
29,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
29,7 → 29,7
## Setup toolchain
#
 
include ../../Makefile.config
-include ../../../Makefile.config
 
LIBC_PREFIX = ../../lib/libc
SOFTINT_PREFIX = ../../lib/softint
/branches/dynload/uspace/srv/loader/Makefile
27,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/fb/Makefile
29,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
29,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
29,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
3,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
29,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
29,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
30,7 → 30,7
## Setup toolchain
#
 
include ../../Makefile.config
-include ../../../Makefile.config
 
LIBC_PREFIX = ../../lib/libc
SOFTINT_PREFIX = ../../lib/softint
/branches/dynload/uspace/Makefile
29,7 → 29,7
## Include configuration
#
 
-include Makefile.config
-include ../Makefile.config
 
DIRS = \
lib/rtld \
79,22 → 79,14
BUILDS := $(addsuffix .build,$(DIRS))
CLEANS := $(addsuffix .clean,$(DIRS))
 
.PHONY: all config build $(BUILDS) $(CLEANS) clean distclean
.PHONY: all $(BUILDS) $(CLEANS) clean kerninc
 
all:
../tools/config.py uspace.config default $(ARCH) $(COMPILER) $(CONFIG_DEBUG)
$(MAKE) -C lib/libc kerninc
$(MAKE) -C . build
all: ../Makefile.config kerninc $(BUILDS)
 
config:
../tools/config.py uspace.config
 
build: $(BUILDS)
 
clean: $(CLEANS)
 
distclean: clean
-rm Makefile.config
kerninc:
$(MAKE) -C lib/libc kerninc
 
$(CLEANS):
-$(MAKE) -C $(basename $@) clean