Changes in uspace/lib/c/Makefile [1d24ad3:6428115] in mainline

File:

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

uspace/lib/c/Makefile

@@ -31 +31 @@
 ROOT_PATH = $(USPACE_PREFIX)/..
 
+INCLUDE_ABI = include/abi
+INCLUDE_LIBARCH = include/libarch
+
 COMMON_MAKEFILE = $(ROOT_PATH)/Makefile.common
 COMMON_HEADER = $(ROOT_PATH)/common.h
-COMMON_HEADER_ARCH = arch/$(UARCH)/include/libarch/common.h
+COMMON_HEADER_ARCH = arch/$(UARCH)/include/common.h
 
 CONFIG_MAKEFILE = $(ROOT_PATH)/Makefile.config
@@ -43 +46 @@
         $(LIBC_PREFIX)/arch/$(UARCH)/_link-dlexe.ld
 
-PRE_DEPEND = $(COMMON_HEADER_ARCH)
+PRE_DEPEND = $(INCLUDE_ABI) $(INCLUDE_LIBARCH) $(COMMON_HEADER_ARCH)
 EXTRA_OUTPUT = $(LINKER_SCRIPTS)
-EXTRA_CLEAN = $(COMMON_HEADER_ARCH) $(LINKER_SCRIPTS)
+EXTRA_CLEAN = $(INCLUDE_ABI) $(INCLUDE_LIBARCH) $(COMMON_HEADER_ARCH) $(LINKER_SCRIPTS)
 LIBRARY = libc
 SLIBRARY = libc.so.0.0
@@ -59 +62 @@
         generic/ddi.c \
         generic/as.c \
-        generic/bd.c \
-        generic/bd_srv.c \
         generic/cap.c \
         generic/cfg.c \
@@ -68 +69 @@
         generic/device/hw_res_parsed.c \
         generic/device/char_dev.c \
-        generic/device/clock_dev.c \
-        generic/device/battery_dev.c \
-        generic/device/graph_dev.c \
         generic/device/nic.c \
         generic/device/pci.c \
-        generic/device/ahci.c \
-        generic/dnsr.c \
-        generic/dlfcn.c \
         generic/elf/elf_load.c \
         generic/event.c \
@@ -92 +87 @@
         generic/task.c \
         generic/futex.c \
-        generic/inet/addr.c \
         generic/inet.c \
         generic/inetcfg.c \
         generic/inetping.c \
-        generic/inetping6.c \
         generic/io/asprintf.c \
-        generic/io/input.c \
         generic/io/io.c \
-        generic/io/chargrid.c \
-        generic/io/output.c \
         generic/io/printf.c \
         generic/io/log.c \
-        generic/io/logctl.c \
         generic/io/klog.c \
         generic/io/snprintf.c \
@@ -110 +99 @@
         generic/io/vsnprintf.c \
         generic/io/printf_core.c \
-        generic/io/con_srv.c \
         generic/io/console.c \
-        generic/io/visualizer.c \
-        generic/io/window.c \
         generic/iplink.c \
         generic/iplink_srv.c \
-        generic/ieee_double.c \
-        generic/power_of_ten.c \
-        generic/double_to_str.c \
         generic/malloc.c \
         generic/sysinfo.c \
@@ -128 +111 @@
         generic/adt/list.c \
         generic/adt/hash_table.c \
+        generic/adt/hash_set.c \
         generic/adt/dynamic_fifo.c \
         generic/adt/char_map.c \
@@ -138 +122 @@
         generic/vfs/canonify.c \
         generic/net/inet.c \
+        generic/net/modules.c \
         generic/net/socket_client.c \
         generic/net/socket_parse.c \
-        generic/stack.c \
         generic/stacktrace.c \
         generic/arg_parse.c \
         generic/sort.c \
         generic/stats.c \
-        generic/assert.c \
-        generic/pio_trace.c
+        generic/assert.c
 
 ifeq ($(CONFIG_RTLD),y)
         GENERIC_SOURCES += \
+                generic/dlfcn.c \
                 generic/rtld/rtld.c \
                 generic/rtld/dynamic.c \
@@ -162 +146 @@
 include $(USPACE_PREFIX)/Makefile.common
 
+$(INCLUDE_LIBARCH): arch/$(UARCH)/include
+        ln -sfn ../$< $@
+
+$(INCLUDE_ABI): ../../../abi/include/
+        ln -sfn ../$< $@
 
 $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld: $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld.in
-        $(CC) $(DEFS) $(CFLAGS) -DLIBC_PATH=$(CURDIR) -E -x c $< | grep -v "^\#" > $@
+        $(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
-        $(CC) $(DEFS) $(CFLAGS) -DLIBC_PATH=$(CURDIR) -DLOADER -E -x c $< | grep -v "^\#" > $@
+        $(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
-        $(CC) $(DEFS) $(CFLAGS) -DLIBC_PATH=$(CURDIR) -DSHLIB -E -x c $< | grep -v "^\#" > $@
+        $(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
-        $(CC) $(DEFS) $(CFLAGS) -DLIBC_PATH=$(CURDIR) -DDLEXE -E -x c $< | grep -v "^\#" > $@
+        $(GCC) $(DEFS) $(CFLAGS) -DLIBC_PATH=$(CURDIR) -DDLEXE -E -x c $< | grep -v "^\#" > $@
 
 $(COMMON_HEADER_ARCH): $(COMMON_HEADER)
-        ln -sfn ../../../../$< $@
+        ln -sfn ../../../$< $@