Changeset e27cf669 in mainline for uspace/Makefile

Timestamp:

2010-02-09T20:19:23Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

fb150d78

Parents:

975e7e9 (diff), eb73a50 (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) (4 diffs)

uspace/Makefile

@@ -40 +40 @@
         app/mkfat \
         app/redir \
+        app/taskdump \
         app/tester \
         app/tetris \
@@ -47 +48 @@
         srv/loader \
         srv/ns \
+        srv/taskmon \
         srv/vfs \
         srv/bd/ata_bd \
@@ -57 +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 \
@@ -69 +72 @@
 ifeq ($(UARCH),ia32)
         DIRS += srv/hw/bus/pci
+endif
+
+ifeq ($(UARCH),ppc32)
+        DIRS += srv/hw/bus/cuda_adb
 endif