Changes in uspace/lib/c/Makefile [042fbe0:a99330e] in mainline

File:

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

uspace/lib/c/Makefile

@@ -41 +41 @@
 CONFIG_MAKEFILE = $(ROOT_PATH)/Makefile.config
 
-LINKER_SCRIPTS = \
-        $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld \
-        $(LIBC_PREFIX)/arch/$(UARCH)/_link-loader.ld \
-        $(LIBC_PREFIX)/arch/$(UARCH)/_link-shlib.ld \
-        $(LIBC_PREFIX)/arch/$(UARCH)/_link-dlexe.ld
-
 PRE_DEPEND = $(INCLUDE_KERNEL) $(INCLUDE_ARCH) $(INCLUDE_LIBARCH) $(COMMON_HEADER_ARCH)
-EXTRA_OUTPUT = $(LINKER_SCRIPTS)
-EXTRA_CLEAN = $(INCLUDE_KERNEL) $(INCLUDE_ARCH) $(INCLUDE_LIBARCH) $(COMMON_HEADER_ARCH) $(LINKER_SCRIPTS)
+EXTRA_OUTPUT = $(LINKER_SCRIPT)
+EXTRA_CLEAN = $(INCLUDE_KERNEL) $(INCLUDE_ARCH) $(INCLUDE_LIBARCH) $(COMMON_HEADER_ARCH) $(LINKER_SCRIPT)
 LIBRARY = libc
-SLIBRARY = libc.so.0.0
-LSONAME = libc.so0
-
 
 -include $(COMMON_MAKEFILE)
 -include $(CONFIG_MAKEFILE)
 -include arch/$(UARCH)/Makefile.inc
-
-EXTRA_CFLAGS += -I../../srv/loader/include
 
 GENERIC_SOURCES = \
@@ -87 +76 @@
         generic/io/io.c \
         generic/io/printf.c \
-        generic/io/log.c \
         generic/io/klog.c \
         generic/io/snprintf.c \
@@ -124 +112 @@
         generic/arg_parse.c \
         generic/sort.c \
-        generic/stats.c \
-        generic/assert.c
-
-ifeq ($(CONFIG_RTLD), y)
-        GENERIC_SOURCES += \
-                generic/dlfcn.c \
-                generic/rtld/rtld.c \
-                generic/rtld/elf_load.c \
-                generic/rtld/dynamic.c \
-                generic/rtld/module.c \
-                generic/rtld/symbol.c
-endif
+        generic/stats.c
 
 SOURCES = \
@@ -154 +131 @@
         ln -sfn ../$< $@
 
-$(LIBC_PREFIX)/arch/$(UARCH)/_link.ld: $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld.in
+$(LINKER_SCRIPT): $(LINKER_SCRIPT).in
         $(GCC) $(DEFS) $(CFLAGS) -DLIBC_PATH=$(CURDIR) -E -x c $< | grep -v "^\#" > $@
-
-$(LIBC_PREFIX)/arch/$(UARCH)/_link-loader.ld: $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld.in
-        $(GCC) $(DEFS) $(CFLAGS) -DLIBC_PATH=$(CURDIR) -DLOADER -E -x c $< | grep -v "^\#" > $@
-
-$(LIBC_PREFIX)/arch/$(UARCH)/_link-shlib.ld: $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld.in
-        $(GCC) $(DEFS) $(CFLAGS) -DLIBC_PATH=$(CURDIR) -DSHLIB -E -x c $< | grep -v "^\#" > $@
-
-$(LIBC_PREFIX)/arch/$(UARCH)/_link-dlexe.ld: $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld.in
-        $(GCC) $(DEFS) $(CFLAGS) -DLIBC_PATH=$(CURDIR) -DDLEXE -E -x c $< | grep -v "^\#" > $@
 
 $(COMMON_HEADER_ARCH): $(COMMON_HEADER)