Changeset 89c57b6 in mainline for uspace/lib/c/Makefile

Timestamp:

2011-04-13T14:45:41Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

88634420

Parents:

cefb126 (diff), 17279ead (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) (4 diffs)

uspace/lib/c/Makefile

@@ -57 +57 @@
         generic/clipboard.c \
         generic/devmap.c \
+        generic/devman.c \
+        generic/device/hw_res.c \
+        generic/device/char_dev.c \
         generic/event.c \
         generic/errno.c \
@@ -73 +76 @@
         generic/io/io.c \
         generic/io/printf.c \
+        generic/io/log.c \
         generic/io/klog.c \
         generic/io/snprintf.c \
@@ -80 +84 @@
         generic/io/console.c \
         generic/io/screenbuffer.c \
+        generic/ipc/ns.c \
         generic/malloc.c \
         generic/sysinfo.c \
         generic/ipc.c \
         generic/async.c \
+        generic/async_sess.c \
         generic/loader.c \
         generic/getopt.c \
-        generic/adt/list.o \
-        generic/adt/hash_table.o \
+        generic/adt/list.c \
+        generic/adt/hash_table.c \
+        generic/adt/dynamic_fifo.c \
+        generic/adt/measured_strings.c \
+        generic/adt/char_map.c \
         generic/time.c \
-        generic/err.c \
         generic/stdlib.c \
         generic/mman.c \
@@ -95 +103 @@
         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 \