Changeset ad7a6c9 in mainline for uspace/lib/c/Makefile

Timestamp:

2011-03-30T13:10:24Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

4ae90f9

Parents:

6e50466 (diff), d6b81941 (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) (2 diffs)

uspace/lib/c/Makefile

@@ -59 +59 @@
         generic/devman.c \
         generic/device/hw_res.c \
-        generic/device/char.c \
+        generic/device/char_dev.c \
         generic/event.c \
         generic/errno.c \
@@ -83 +83 @@
         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_rel.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 \