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

Timestamp:

2012-10-23T13:16:49Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

6ecf5b8

Parents:

32b3a12 (diff), b2ac3998 (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

@@ -71 +71 @@
         generic/device/hw_res_parsed.c \
         generic/device/char_dev.c \
+        generic/device/clock_dev.c \
+        generic/device/battery_dev.c \
         generic/device/graph_dev.c \
         generic/device/nic.c \
         generic/device/pci.c \
         generic/device/ahci.c \
+        generic/dlfcn.c \
         generic/elf/elf_load.c \
         generic/event.c \
@@ -101 +104 @@
         generic/io/printf.c \
         generic/io/log.c \
+        generic/io/logctl.c \
         generic/io/klog.c \
         generic/io/snprintf.c \
@@ -121 +125 @@
         generic/adt/list.c \
         generic/adt/hash_table.c \
-        generic/adt/hash_set.c \
         generic/adt/dynamic_fifo.c \
         generic/adt/char_map.c \
@@ -142 +145 @@
 ifeq ($(CONFIG_RTLD),y)
         GENERIC_SOURCES += \
-                generic/dlfcn.c \
                 generic/rtld/rtld.c \
                 generic/rtld/dynamic.c \