Changeset 7eaeec1 in mainline for uspace/Makefile

Timestamp:

2012-08-20T21:27:38Z (12 years ago)

Author:

Sean Bartell <wingedtachikoma@…>

Branches:

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

Children:

6a97f2e

Parents:

f3a37e28 (diff), dd13349 (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

@@ -73 +73 @@
         app/mkbd \
         app/websrv \
+        app/vdemo \
+        app/vlaunch \
+        app/vterm \
         srv/clipboard \
         srv/locsrv \
@@ -100 +103 @@
         srv/fs/ext2fs \
         srv/fs/ext4fs \
+        srv/hid/compositor \
         srv/hid/console \
         srv/hid/s3c24xx_ts \
         srv/hid/isdv4_tablet \
-        srv/hid/fb \
         srv/hid/input \
+        srv/hid/output \
         srv/hid/remcons \
         srv/hw/char/s3c24xx_uart \
@@ -116 +120 @@
         drv/test/test2 \
         drv/test/test3 \
+        drv/fb/kfb \
         drv/bus/usb/ehci \
         drv/bus/usb/ohci \
@@ -196 +201 @@
         lib/softfloat \
         lib/drv \
-        lib/fb \
+        lib/graph \
+        lib/gui \
+        lib/softrend \
+        lib/draw \
         lib/net \
         lib/nic \