Changeset 19f24fd in mainline for uspace/Makefile

Timestamp:

2010-02-05T22:25:52Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

dafa2d04

Parents:

83349b03 (diff), d42976c (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/Makefile (modified) (2 diffs)

uspace/Makefile

@@ -59 +59 @@
         srv/fs/tmpfs \
         srv/fs/devfs \
+        srv/hid/adb_mouse \
         srv/hid/console \
-        srv/hid/c_mouse \
+        srv/hid/char_mouse \
         srv/hid/fb \
         srv/hid/kbd \
@@ -71 +72 @@
 ifeq ($(UARCH),ia32)
         DIRS += srv/hw/bus/pci
+endif
+
+ifeq ($(UARCH),ppc32)
+        DIRS += srv/hw/bus/cuda_adb
 endif