Changeset 8b863a62 in mainline for uspace/lib/c/Makefile

Timestamp:

2014-04-16T17:14:06Z (11 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

f857e8b

Parents:

dba3e2c (diff), 70b570c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

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
+CONFIG_MAKEFILE = $(ROOT_PATH)/Makefile.config
 COMMON_HEADER_ARCH = arch/$(UARCH)/include/libarch/common.h
-
-CONFIG_MAKEFILE = $(ROOT_PATH)/Makefile.config
 
 LINKER_SCRIPTS = \
@@ -50 +47 @@
 LSONAME = libc.so0
 
-
--include $(COMMON_MAKEFILE)
 -include $(CONFIG_MAKEFILE)
 -include arch/$(UARCH)/Makefile.inc
@@ -64 +59 @@
         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/char_dev.c \
+        generic/device/pio_window.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/dhcp.c \
         generic/dnsr.c \
         generic/dlfcn.c \
@@ -104 +96 @@
         generic/io/log.c \
         generic/io/logctl.c \
+        generic/io/kio.c \
         generic/io/klog.c \
         generic/io/snprintf.c \
@@ -125 +118 @@
         generic/loader.c \
         generic/getopt.c \
+        generic/adt/checksum.c \
         generic/adt/list.c \
         generic/adt/hash_table.c \
@@ -132 +126 @@
         generic/time.c \
         generic/stdlib.c \
-        generic/mman.c \
         generic/udebug.c \
         generic/vfs/vfs.c \
@@ -139 +132 @@
         generic/net/socket_client.c \
         generic/net/socket_parse.c \
+        generic/setjmp.c \
         generic/stack.c \
         generic/stacktrace.c \
@@ -161 +155 @@
 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 "^\#" > $@