Changeset 97c7682 in mainline for uspace/lib/c/Makefile

Timestamp:

2012-07-14T11:18:40Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

804d9b6

Parents:

0747468 (diff), f0348c8 (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.

Text conflict in boot/arch/arm32/Makefile.inc:

Trivial conflict around ifeq condition.

Text conflict in kernel/arch/arm32/include/mm/page.h:

Added defines and set_pt_levelx_present function.
COnflict looked horrible because of the armv4/v7 split.

File:

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

uspace/lib/c/Makefile

@@ -87 +87 @@
         generic/task.c \
         generic/futex.c \
+        generic/inet.c \
+        generic/inetcfg.c \
+        generic/inetping.c \
         generic/io/asprintf.c \
         generic/io/io.c \
@@ -97 +100 @@
         generic/io/printf_core.c \
         generic/io/console.c \
+        generic/iplink.c \
+        generic/iplink_srv.c \
         generic/malloc.c \
         generic/sysinfo.c \
@@ -108 +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 \
@@ -118 +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 \