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

Timestamp:

2012-10-15T16:28:58Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

b3ab8f7

Parents:

7eb49f4 (diff), c4c2406 (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 and io improvements.

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 \
@@ -101 +103 @@
         generic/io/printf.c \
         generic/io/log.c \
+        generic/io/logctl.c \
         generic/io/klog.c \
         generic/io/snprintf.c \
@@ -121 +124 @@
         generic/adt/list.c \
         generic/adt/hash_table.c \
-        generic/adt/hash_set.c \
         generic/adt/dynamic_fifo.c \
         generic/adt/char_map.c \
@@ -138 +140 @@
         generic/sort.c \
         generic/stats.c \
-        generic/assert.c
+        generic/assert.c \
+        generic/pio_trace.c
 
 ifeq ($(CONFIG_RTLD),y)