Changeset 6843a9c in mainline for uspace/lib/c/Makefile

Timestamp:

2012-06-29T13:02:14Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

722912e

Parents:

ba72f2b (diff), 0bbd13e (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

Trivial conflicts.

File:

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

uspace/lib/c/Makefile

@@ -70 +70 @@
         generic/device/char_dev.c \
         generic/device/nic.c \
+        generic/device/pci.c \
         generic/elf/elf_load.c \
         generic/event.c \
@@ -86 +87 @@
         generic/task.c \
         generic/futex.c \
+        generic/inet.c \
+        generic/inetcfg.c \
+        generic/inetping.c \
         generic/io/asprintf.c \
         generic/io/io.c \
@@ -96 +100 @@
         generic/io/printf_core.c \
         generic/io/console.c \
+        generic/iplink.c \
+        generic/iplink_srv.c \
         generic/malloc.c \
         generic/sysinfo.c \
@@ -107 +113 @@
         generic/adt/hash_set.c \
         generic/adt/dynamic_fifo.c \
-        generic/adt/measured_strings.c \
         generic/adt/char_map.c \
         generic/adt/prodcons.c \
@@ -117 +122 @@
         generic/vfs/canonify.c \
         generic/net/inet.c \
-        generic/net/icmp_common.c \
-        generic/net/icmp_api.c \
-        generic/net/modules.c \
-        generic/net/packet.c \
         generic/net/socket_client.c \
         generic/net/socket_parse.c \