Changes in uspace/lib/c/Makefile [9b415c9:3a3d4ca] in mainline

File:

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

uspace/lib/c/Makefile

@@ -34 +34 @@
 INCLUDE_ARCH = include/arch
 INCLUDE_LIBARCH = include/libarch
+INCLUDE_RTLDARCH = rtld/include/arch
 
 COMMON_MAKEFILE = $(ROOT_PATH)/Makefile.common
@@ -41 +42 @@
 CONFIG_MAKEFILE = $(ROOT_PATH)/Makefile.config
 
-PRE_DEPEND = $(INCLUDE_KERNEL) $(INCLUDE_ARCH) $(INCLUDE_LIBARCH) $(COMMON_HEADER_ARCH)
+PRE_DEPEND = $(INCLUDE_KERNEL) $(INCLUDE_ARCH) $(INCLUDE_LIBARCH) $(INCLUDE_RTLDARCH) $(COMMON_HEADER_ARCH)
 EXTRA_OUTPUT = $(LINKER_SCRIPT)
-EXTRA_CLEAN = $(INCLUDE_KERNEL) $(INCLUDE_ARCH) $(INCLUDE_LIBARCH) $(COMMON_HEADER_ARCH) $(LINKER_SCRIPT)
+EXTRA_CLEAN = $(INCLUDE_KERNEL) $(INCLUDE_ARCH) $(INCLUDE_LIBARCH) $(INCLUDE_RTLDARCH) $(COMMON_HEADER_ARCH) $(LINKER_SCRIPT)
 LIBRARY = libc
+SLIBRARY = libc.so.0.0
+LSONAME = libc.so.0
+
 
 -include $(COMMON_MAKEFILE)
 -include $(CONFIG_MAKEFILE)
 -include arch/$(UARCH)/Makefile.inc
+-include rtld/arch/$(UARCH)/Makefile.inc
+
+EXTRA_CFLAGS += -Irtld/include -I../../srv/loader/include
 
 GENERIC_SOURCES = \
@@ -60 +67 @@
         generic/device/hw_res.c \
         generic/device/char_dev.c \
+        generic/dlfcn.c \
         generic/event.c \
         generic/errno.c \
@@ -76 +84 @@
         generic/io/io.c \
         generic/io/printf.c \
-        generic/io/log.c \
         generic/io/klog.c \
         generic/io/snprintf.c \
@@ -113 +120 @@
         generic/arg_parse.c \
         generic/sort.c \
-        generic/stats.c
+        generic/stats.c \
+        rtld/rtld.c \
+        rtld/elf_load.c \
+        rtld/dynamic.c \
+        rtld/module.c \
+        rtld/symbol.c
 
 SOURCES = \
@@ -127 +139 @@
         ln -sfn ../$< $@
 
+$(INCLUDE_RTLDARCH): rtld/arch/$(UARCH)/include
+        ln -sfn ../../$< $@
+
 $(INCLUDE_KERNEL)/arch: ../../../kernel/generic/include/arch $(INCLUDE_KERNEL)