Changeset bfd7aac in mainline for uspace/Makefile

Timestamp:

2010-02-17T19:19:08Z (14 years ago)

Author:

Lukas Mejdrech <lukasmejdrech@…>

Branches:

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

Children:

1e2e0c1e

Parents:

01a9ef5 (diff), b8da2a3 (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

@@ -60 +60 @@
         srv/fs/devfs \
         srv/hid/adb_mouse \
-        srv/hid/console \
         srv/hid/char_mouse \
         srv/hid/fb \
@@ -66 +65 @@
         srv/hw/char/i8042 \
         srv/net
+
+ifneq ($(UARCH),abs32le)
+        DIRS += srv/hid/console
+endif
 
 ifeq ($(UARCH),amd64)