Changes in / [850235d:2277e03] in mainline


Ignore:
Files:
575 added
575 deleted
5 edited

Legend:

Unmodified
Added
Removed

  • boot/Makefile

    r850235d r2277e03  
    6161        mkdir "$(DIST_PATH)/inc/c/"
    6262        cp -r -L "$(USPACE_PATH)/lib/c/include/." "$(DIST_PATH)/inc/c/"
    63         cp -r -L "$(ROOT_PATH)/abi/include/." "$(DIST_PATH)/inc/c/"
    64         cp -r -L "$(USPACE_PATH)/lib/c/arch/$(UARCH)/include/." "$(DIST_PATH)/inc/c/"
    6563        cat "$(USPACE_PATH)/lib/c/arch/$(UARCH)/_link.ld" | sed 's/^STARTUP(.*)$$//g' > "$(DIST_PATH)/inc/_link.ld"
    6664endif

  • kernel/Makefile

    r850235d r2277e03  
    3636COMMON_MAKEFILE = $(ROOT_PATH)/Makefile.common
    3737COMMON_HEADER = $(ROOT_PATH)/common.h
    38 COMMON_HEADER_ARCH = arch/$(KARCH)/include/arch/common.h
     38COMMON_HEADER_ARCH = arch/$(KARCH)/include/common.h
    3939
    4040CONFIG_MAKEFILE = $(ROOT_PATH)/Makefile.config
    … …  
    5959REAL_MAP = generic/src/debug/real_map
    6060
     61ABI_INCLUDE = generic/include/abi
     62ARCH_INCLUDE = generic/include/arch
     63GENARCH_INCLUDE = generic/include/genarch
     64
    6165GENMAP = tools/genmap.py
    6266JOBFILE = $(ROOT_PATH)/tools/jobfile.py
    … …  
    7276
    7377clean:
    74         rm -f $(DEPEND) $(DEPEND_PREV) $(RAW) $(BIN) $(MAP) $(JOB) $(MAP_PREV) $(DISASM) $(DUMP) $(REAL_MAP).* arch/*/_link.ld arch/*/include/arch/common.h
     78        rm -f $(DEPEND) $(DEPEND_PREV) $(RAW) $(BIN) $(MAP) $(JOB) $(MAP_PREV) $(DISASM) $(DUMP) $(REAL_MAP).* $(ABI_INCLUDE) $(ARCH_INCLUDE) $(GENARCH_INCLUDE) arch/*/_link.ld arch/*/include/common.h
    7579        find generic/src/ arch/*/src/ genarch/src/ test/ -name '*.o' -follow -exec rm \{\} \;
    7680
    … …  
    7882#
    7983
    80 INCLUDES = generic/include genarch/include arch/$(KARCH)/include ../abi/include
    81 INCLUDES_FLAGS = $(addprefix -I,$(INCLUDES))
     84INCLUDES = generic/include
    8285
    8386ifeq ($(CONFIG_OPTIMIZE_FOR_SIZE),y)
    … …  
    8992DEFS = -DKERNEL -DRELEASE=$(RELEASE) "-DCOPYRIGHT=$(COPYRIGHT)" "-DNAME=$(NAME)" -D__$(BITS)_BITS__ -D__$(ENDIANESS)__
    9093
    91 GCC_CFLAGS = $(INCLUDES_FLAGS) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
     94GCC_CFLAGS = -I$(INCLUDES) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
    9295        -fexec-charset=UTF-8 -fwide-exec-charset=UTF-32$(ENDIANESS) \
    9396        -finput-charset=UTF-8 -ffreestanding -fno-builtin -nostdlib -nostdinc \
    … …  
    9699        -pipe
    97100
    98 ICC_CFLAGS = $(INCLUDES_FLAGS) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
     101ICC_CFLAGS = -I$(INCLUDES) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
    99102        -ffreestanding -fno-builtin -nostdlib -nostdinc -Wall -Wmissing-prototypes \
    100103        -Werror-implicit-function-declaration -wd170
    101104
    102 CLANG_CFLAGS = $(INCLUDES_FLAGS) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
     105CLANG_CFLAGS = -I$(INCLUDES) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
    103106        -fexec-charset=UTF-8 -fwide-exec-charset=UTF-32$(ENDIANESS) \
    104107        -finput-charset=UTF-8 -ffreestanding -fno-builtin -nostdlib -nostdinc \
    … …  
    432435        $(GENMAP) $(MAP_PREV) $(DUMP) $@
    433436
    434 $(DEPEND): $(COMMON_HEADER_ARCH)
     437$(DEPEND): $(ABI_INCLUDE) $(ARCH_INCLUDE) $(GENARCH_INCLUDE) $(COMMON_HEADER_ARCH)
    435438        makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(ARCH_SOURCES) $(GENARCH_SOURCES) $(GENERIC_SOURCES) > $@ 2> /dev/null
    436439        -[ -f $(DEPEND_PREV) ] && diff -q $(DEPEND_PREV) $@ && mv -f $(DEPEND_PREV) $@
    437440
     441$(ABI_INCLUDE): ../abi/include/
     442        ln -sfn ../../$< $@
     443
     444$(ARCH_INCLUDE): arch/$(KARCH)/include/
     445        ln -sfn ../../$< $@
     446
     447$(GENARCH_INCLUDE): genarch/include/
     448        ln -sfn ../../$< $@
     449
    438450$(COMMON_HEADER_ARCH): $(COMMON_HEADER)
    439         ln -sfn ../../../../$< $@
     451        ln -sfn ../../../$< $@

  • uspace/Makefile.common

    r850235d r2277e03  
    103103
    104104LIBC_PREFIX = $(LIB_PREFIX)/c
    105 LIBC_INCLUDES_FLAGS = \
    106         -I$(LIBC_PREFIX)/include \
    107         -I$(LIBC_PREFIX)/arch/$(UARCH)/include \
    108         -I$(ROOT_PATH)/abi/include
    109105LIBSOFTFLOAT_PREFIX = $(LIB_PREFIX)/softfloat
    110106LIBSOFTINT_PREFIX = $(LIB_PREFIX)/softint
    … …  
    184180        find . -name '*.lo' -follow -exec rm \{\} \;
    185181
    186 GCC_CFLAGS = $(LIBC_INCLUDES_FLAGS) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
     182GCC_CFLAGS = -I$(LIBC_PREFIX)/include -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
    187183        -fexec-charset=UTF-8 -fwide-exec-charset=UTF-32$(ENDIANESS) \
    188184        -finput-charset=UTF-8 -ffreestanding -fno-builtin -nostdlib -nostdinc \
    … …  
    191187        -pipe -g -D__$(ENDIANESS)__
    192188
    193 ICC_CFLAGS = $(LIBC_INCLUDES_FLAGS) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
     189ICC_CFLAGS = -I$(LIBC_PREFIX)/include -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
    194190        -fexec-charset=UTF-8 -fwide-exec-charset=UTF-32$(ENDIANESS) \
    195191        -finput-charset=UTF-8 -ffreestanding -fno-builtin -nostdlib -nostdinc \
    … …  
    198194        -pipe -g -D__$(ENDIANESS)__
    199195
    200 CLANG_CFLAGS = $(LIBC_INCLUDES_FLAGS) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
     196CLANG_CFLAGS = -I$(LIBC_PREFIX)/include -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
    201197        -fexec-charset=UTF-8 -fwide-exec-charset=UTF-32$(ENDIANESS) \
    202198        -finput-charset=UTF-8 -ffreestanding -fno-builtin -nostdlib -nostdinc \

  • uspace/lib/c/Makefile

    r850235d r2277e03  
    3131ROOT_PATH = $(USPACE_PREFIX)/..
    3232
     33INCLUDE_ABI = include/abi
     34INCLUDE_LIBARCH = include/libarch
     35
    3336COMMON_MAKEFILE = $(ROOT_PATH)/Makefile.common
    3437COMMON_HEADER = $(ROOT_PATH)/common.h
    35 COMMON_HEADER_ARCH = arch/$(UARCH)/include/libarch/common.h
     38COMMON_HEADER_ARCH = arch/$(UARCH)/include/common.h
    3639
    3740CONFIG_MAKEFILE = $(ROOT_PATH)/Makefile.config
    … …  
    4346        $(LIBC_PREFIX)/arch/$(UARCH)/_link-dlexe.ld
    4447
    45 PRE_DEPEND = $(COMMON_HEADER_ARCH)
     48PRE_DEPEND = $(INCLUDE_ABI) $(INCLUDE_LIBARCH) $(COMMON_HEADER_ARCH)
    4649EXTRA_OUTPUT = $(LINKER_SCRIPTS)
    47 EXTRA_CLEAN = $(COMMON_HEADER_ARCH) $(LINKER_SCRIPTS)
     50EXTRA_CLEAN = $(INCLUDE_ABI) $(INCLUDE_LIBARCH) $(COMMON_HEADER_ARCH) $(LINKER_SCRIPTS)
    4851LIBRARY = libc
    4952SLIBRARY = libc.so.0.0
    … …  
    159162include $(USPACE_PREFIX)/Makefile.common
    160163
     164$(INCLUDE_LIBARCH): arch/$(UARCH)/include
     165        ln -sfn ../$< $@
     166
     167$(INCLUDE_ABI): ../../../abi/include/
     168        ln -sfn ../$< $@
    161169
    162170$(LIBC_PREFIX)/arch/$(UARCH)/_link.ld: $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld.in
    … …  
    173181
    174182$(COMMON_HEADER_ARCH): $(COMMON_HEADER)
    175         ln -sfn ../../../../$< $@
     183        ln -sfn ../../../$< $@

  • version

    r850235d r2277e03  
    4747NAME = Fajtl
    4848COPYRIGHT = Copyright (c) 2001-2012 HelenOS project
    49 
Note: See TracChangeset for help on using the changeset viewer.