Changes in uspace/lib/c/Makefile [c0699467:ef09a7a] in mainline

File:

• uspace/lib/c/Makefile (modified) (6 diffs)

uspace/lib/c/Makefile

@@ -31 +31 @@
 ROOT_PATH = $(USPACE_PREFIX)/..
 
-INCLUDE_ABI = include/abi
+INCLUDE_KERNEL = include/kernel
+INCLUDE_ARCH = include/arch
 INCLUDE_LIBARCH = include/libarch
 
@@ -46 +47 @@
         $(LIBC_PREFIX)/arch/$(UARCH)/_link-dlexe.ld
 
-PRE_DEPEND = $(INCLUDE_ABI) $(INCLUDE_LIBARCH) $(COMMON_HEADER_ARCH)
+PRE_DEPEND = $(INCLUDE_KERNEL) $(INCLUDE_ARCH) $(INCLUDE_LIBARCH) $(COMMON_HEADER_ARCH)
 EXTRA_OUTPUT = $(LINKER_SCRIPTS)
-EXTRA_CLEAN = $(INCLUDE_ABI) $(INCLUDE_LIBARCH) $(COMMON_HEADER_ARCH) $(LINKER_SCRIPTS)
+EXTRA_CLEAN = $(INCLUDE_KERNEL) $(INCLUDE_ARCH) $(INCLUDE_LIBARCH) $(COMMON_HEADER_ARCH) $(LINKER_SCRIPTS)
 LIBRARY = libc
 SLIBRARY = libc.so.0.0
@@ -57 +58 @@
 -include $(CONFIG_MAKEFILE)
 -include arch/$(UARCH)/Makefile.inc
+
+EXTRA_CFLAGS += -I../../srv/loader/include
 
 GENERIC_SOURCES = \
@@ -68 +71 @@
         generic/device/hw_res.c \
         generic/device/char_dev.c \
-        generic/elf/elf_load.c \
         generic/event.c \
         generic/errno.c \
@@ -132 +134 @@
                 generic/dlfcn.c \
                 generic/rtld/rtld.c \
+                generic/rtld/elf_load.c \
                 generic/rtld/dynamic.c \
                 generic/rtld/module.c \
@@ -143 +146 @@
 include $(USPACE_PREFIX)/Makefile.common
 
+$(INCLUDE_ARCH): $(INCLUDE_KERNEL) $(INCLUDE_KERNEL)/arch
+        ln -sfn kernel/arch $@
+
 $(INCLUDE_LIBARCH): arch/$(UARCH)/include
         ln -sfn ../$< $@
 
-$(INCLUDE_ABI): ../../../abi/include/
+$(INCLUDE_KERNEL)/arch: ../../../kernel/generic/include/arch $(INCLUDE_KERNEL)
+
+$(INCLUDE_KERNEL): ../../../kernel/generic/include/
         ln -sfn ../$< $@