Changeset 84439d7 in mainline for uspace/Makefile

Timestamp:

2010-12-05T09:34:46Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

75732da

Parents:

56b962d (diff), 35537a7 (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 with development/

File:

• uspace/Makefile (modified) (2 diffs)

uspace/Makefile

@@ -46 +46 @@
         app/tasks \
         app/tester \
-        app/test_serial \
         app/tetris \
         app/trace \
@@ -119 +118 @@
         DIRS += drv/ns8250
         DIRS += drv/uhci
+        DIRS += drv/usbhub
         DIRS += drv/usbkbd
 endif