Changes in uspace/lib/c/Makefile [47fecbb:79ae36dd] in mainline


Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/lib/c/Makefile

    r47fecbb r79ae36dd  
    3131ROOT_PATH = $(USPACE_PREFIX)/..
    3232
    33 INCLUDE_ABI = include/abi
     33INCLUDE_KERNEL = include/kernel
     34INCLUDE_ARCH = include/arch
    3435INCLUDE_LIBARCH = include/libarch
    3536
     
    4647        $(LIBC_PREFIX)/arch/$(UARCH)/_link-dlexe.ld
    4748
    48 PRE_DEPEND = $(INCLUDE_ABI) $(INCLUDE_LIBARCH) $(COMMON_HEADER_ARCH)
     49PRE_DEPEND = $(INCLUDE_KERNEL) $(INCLUDE_ARCH) $(INCLUDE_LIBARCH) $(COMMON_HEADER_ARCH)
    4950EXTRA_OUTPUT = $(LINKER_SCRIPTS)
    50 EXTRA_CLEAN = $(INCLUDE_ABI) $(INCLUDE_LIBARCH) $(COMMON_HEADER_ARCH) $(LINKER_SCRIPTS)
     51EXTRA_CLEAN = $(INCLUDE_KERNEL) $(INCLUDE_ARCH) $(INCLUDE_LIBARCH) $(COMMON_HEADER_ARCH) $(LINKER_SCRIPTS)
    5152LIBRARY = libc
    5253SLIBRARY = libc.so.0.0
     
    5859-include arch/$(UARCH)/Makefile.inc
    5960
     61EXTRA_CFLAGS += -I../../srv/loader/include
     62
    6063GENERIC_SOURCES = \
    6164        generic/libc.c \
     
    6366        generic/as.c \
    6467        generic/cap.c \
    65         generic/cfg.c \
    6668        generic/clipboard.c \
     69        generic/devmap.c \
     70        generic/devmap_obsolete.c \
    6771        generic/devman.c \
     72        generic/devman_obsolete.c \
    6873        generic/device/hw_res.c \
    6974        generic/device/char_dev.c \
    70         generic/elf/elf_load.c \
    7175        generic/event.c \
    7276        generic/errno.c \
    73         generic/loc.c \
    7477        generic/mem.c \
    7578        generic/str.c \
     
    9497        generic/io/printf_core.c \
    9598        generic/io/console.c \
     99        generic/io/screenbuffer.c \
    96100        generic/malloc.c \
    97101        generic/sysinfo.c \
    98102        generic/ipc.c \
    99103        generic/ns.c \
     104        generic/ns_obsolete.c \
    100105        generic/async.c \
     106        generic/async_obsolete.c \
    101107        generic/loader.c \
    102108        generic/getopt.c \
     
    130136                generic/dlfcn.c \
    131137                generic/rtld/rtld.c \
     138                generic/rtld/elf_load.c \
    132139                generic/rtld/dynamic.c \
    133140                generic/rtld/module.c \
     
    141148include $(USPACE_PREFIX)/Makefile.common
    142149
     150$(INCLUDE_ARCH): $(INCLUDE_KERNEL) $(INCLUDE_KERNEL)/arch
     151        ln -sfn kernel/arch $@
     152
    143153$(INCLUDE_LIBARCH): arch/$(UARCH)/include
    144154        ln -sfn ../$< $@
    145155
    146 $(INCLUDE_ABI): ../../../abi/include/
     156$(INCLUDE_KERNEL)/arch: ../../../kernel/generic/include/arch $(INCLUDE_KERNEL)
     157
     158$(INCLUDE_KERNEL): ../../../kernel/generic/include/
    147159        ln -sfn ../$< $@
    148160
Note: See TracChangeset for help on using the changeset viewer.