Changeset 8b655705 in mainline for uspace/lib/c/Makefile

Timestamp:

2011-04-15T19:38:07Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

9dd730d1

Parents:

6b9e85b (diff), b2fb47f (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

@@ -76 +76 @@
         generic/io/io.c \
         generic/io/printf.c \
+        generic/io/log.c \
         generic/io/klog.c \
         generic/io/snprintf.c \
@@ -83 +84 @@
         generic/io/console.c \
         generic/io/screenbuffer.c \
+        generic/ipc/ns.c \
         generic/malloc.c \
         generic/sysinfo.c \
@@ -90 +92 @@
         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 \