Changes in uspace/lib/c/Makefile [7218fe6:3495654] in mainline

File:

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

uspace/lib/c/Makefile

@@ -31 +31 @@
 ROOT_PATH = $(USPACE_PREFIX)/..
 
+COMMON_MAKEFILE = $(ROOT_PATH)/Makefile.common
+COMMON_HEADER = $(ROOT_PATH)/common.h
+COMMON_HEADER_ARCH = arch/$(UARCH)/include/libarch/common.h
+
 CONFIG_MAKEFILE = $(ROOT_PATH)/Makefile.config
-COMMON_HEADER_ARCH = arch/$(UARCH)/include/libarch/common.h
 
 LINKER_SCRIPTS = \
@@ -47 +50 @@
 LSONAME = libc.so0
 
+
+-include $(COMMON_MAKEFILE)
 -include $(CONFIG_MAKEFILE)
 -include arch/$(UARCH)/Makefile.inc
@@ -59 +64 @@
         generic/cfg.c \
         generic/clipboard.c \
-        generic/corecfg.c \
         generic/devman.c \
         generic/device/hw_res.c \
         generic/device/hw_res_parsed.c \
-        generic/device/pio_window.c \
+        generic/device/char_dev.c \
         generic/device/clock_dev.c \
-        generic/dhcp.c \
-        generic/dnsr.c \
+        generic/device/battery_dev.c \
+        generic/device/graph_dev.c \
+        generic/device/nic.c \
+        generic/device/pci.c \
+        generic/device/ahci.c \
         generic/dlfcn.c \
         generic/elf/elf_load.c \
@@ -96 +103 @@
         generic/io/log.c \
         generic/io/logctl.c \
-        generic/io/kio.c \
         generic/io/klog.c \
         generic/io/snprintf.c \
@@ -118 +124 @@
         generic/loader.c \
         generic/getopt.c \
-        generic/adt/checksum.c \
         generic/adt/list.c \
         generic/adt/hash_table.c \
@@ -126 +131 @@
         generic/time.c \
         generic/stdlib.c \
+        generic/mman.c \
         generic/udebug.c \
         generic/vfs/vfs.c \
@@ -132 +138 @@
         generic/net/socket_client.c \
         generic/net/socket_parse.c \
-        generic/setjmp.c \
         generic/stack.c \
         generic/stacktrace.c \
@@ -155 +160 @@
 include $(USPACE_PREFIX)/Makefile.common
 
+
 $(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)