Changeset 23b7c02 in mainline for uspace/Makefile

Timestamp:

2013-09-04T06:58:57Z (11 years ago)

Author:

Manuele Conti <conti.ma@…>

Branches:

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

Children:

7664469

Parents:

caf5382 (diff), aa2a049 (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 Mainline changes.

File:

• uspace/Makefile (modified) (5 diffs)

uspace/Makefile

@@ -50 +50 @@
         app/loc \
         app/logset \
+        app/mixerctl \
         app/mkfat \
         app/mkexfat \
@@ -76 +77 @@
         app/mkbd \
         app/date \
-        app/websrv \
         app/vdemo \
         app/vlaunch \
         app/vterm \
         app/df \
+        app/wavplay \
+        app/websrv \
+        srv/audio/hound \
         srv/clipboard \
         srv/locsrv \
@@ -117 +120 @@
         srv/hid/remcons \
         srv/hw/char/s3c24xx_uart \
+        drv/audio/sb16 \
         drv/infrastructure/root \
         drv/infrastructure/rootvirt \
@@ -218 +222 @@
         lib/graph \
         lib/gui \
+        lib/hound \
         lib/softrend \
         lib/draw \
@@ -228 +233 @@
         lib/usbhid \
         lib/usbvirt \
+        lib/pcm \
         lib/bithenge \
         lib/posix