Changeset 6a44ee4 in mainline for uspace/lib/c/Makefile

Timestamp:

2011-07-20T15:26:21Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

efcebe1

Parents:

25bef0ff (diff), a701812 (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/str.c \
         generic/str_error.c \
+        generic/l18n/langs.c \
         generic/fibril.c \
         generic/fibril_synch.c \
@@ -95 +96 @@
         generic/io/console.c \
         generic/io/screenbuffer.c \
-        generic/ipc/ns.c \
         generic/malloc.c \
         generic/sysinfo.c \
         generic/ipc.c \
+        generic/ns.c \
+        generic/ns_obsolete.c \
         generic/async.c \
-        generic/async_sess.c \
+        generic/async_obsolete.c \
         generic/loader.c \
         generic/getopt.c \
@@ -128 +130 @@
         generic/assert.c
 
-ifeq ($(CONFIG_RTLD), y)
+ifeq ($(CONFIG_RTLD),y)
         GENERIC_SOURCES += \
                 generic/dlfcn.c \