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

Timestamp:

2013-12-25T13:05:25Z (11 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

bc54126c

Parents:

f4a47e52 (diff), 6946f23 (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

@@ -61 +61 @@
         generic/bd.c \
         generic/bd_srv.c \
-        generic/bitops.c \
         generic/cap.c \
         generic/cfg.c \
         generic/checksum.c \
         generic/clipboard.c \
+        generic/corecfg.c \
         generic/devman.c \
         generic/device/hw_res.c \
         generic/device/hw_res_parsed.c \
+        generic/device/pio_window.c \
         generic/device/char_dev.c \
         generic/device/clock_dev.c \
@@ -76 +77 @@
         generic/device/pci.c \
         generic/device/ahci.c \
+        generic/dhcp.c \
         generic/dnsr.c \
         generic/dlfcn.c \
@@ -98 +100 @@
         generic/inetcfg.c \
         generic/inetping.c \
-        generic/inetping6.c \
         generic/io/asprintf.c \
         generic/io/input.c \
@@ -142 +143 @@
         generic/net/socket_client.c \
         generic/net/socket_parse.c \
+        generic/setjmp.c \
         generic/stack.c \
         generic/stacktrace.c \