Changeset 86ffa27f in mainline for uspace/lib/c/Makefile

Timestamp:

2011-08-07T11:21:44Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

cc574511

Parents:

15f3c3f (diff), e8067c0 (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

@@ -59 +59 @@
 -include arch/$(UARCH)/Makefile.inc
 
-EXTRA_CFLAGS += -I../../srv/loader/include
-
 GENERIC_SOURCES = \
         generic/libc.c \
@@ -70 +68 @@
         generic/device/hw_res.c \
         generic/device/char_dev.c \
+        generic/elf/elf_load.c \
         generic/event.c \
         generic/errno.c \
@@ -134 +133 @@
                 generic/dlfcn.c \
                 generic/rtld/rtld.c \
-                generic/rtld/elf_load.c \
                 generic/rtld/dynamic.c \
                 generic/rtld/module.c \