Changeset 4687a26c in mainline for uspace/lib/c/Makefile

Timestamp:

2010-11-02T18:29:01Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4f35b9ff

Parents:

76e1121f (diff), 28f4adb (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) (3 diffs)

uspace/lib/c/Makefile

@@ -57 +57 @@
         generic/clipboard.c \
         generic/devmap.c \
+        generic/devman.c \
+        generic/device/hw_res.c \
+        generic/device/char.c \
         generic/event.c \
         generic/errno.c \
@@ -89 +92 @@
         generic/adt/list.o \
         generic/adt/hash_table.o \
+        generic/adt/dynamic_fifo.c \
+        generic/adt/measured_strings.c \
+        generic/adt/char_map.c \
         generic/time.c \
         generic/err.c \
@@ -96 +102 @@
         generic/vfs/vfs.c \
         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 \
         generic/stacktrace.c \
         generic/arg_parse.c \