Changeset 5856b627 in mainline for uspace/Makefile

Timestamp:

2013-08-20T12:36:48Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

26e2de3

Parents:

0ee999d (diff), 4da8fdb (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:

Mainline changes.

File:

• uspace/Makefile (modified) (5 diffs)

uspace/Makefile

@@ -49 +49 @@
         app/klog \
         app/loc \
+        app/mixerctl \
         app/logset \
         app/mkfat \
@@ -75 +76 @@
         app/sysinfo \
         app/mkbd \
+        app/wavplay \
         app/date \
         app/websrv \
+        srv/audio/hound \
         app/vdemo \
         app/vlaunch \
@@ -116 +119 @@
         srv/hid/remcons \
         srv/hw/char/s3c24xx_uart \
+        drv/audio/sb16 \
         drv/infrastructure/root \
         drv/infrastructure/rootvirt \
@@ -214 +218 @@
         lib/softfloat \
         lib/drv \
+        lib/hound \
         lib/graph \
         lib/gui \
@@ -226 +231 @@
         lib/usbhid \
         lib/usbvirt \
+        lib/pcm \
         lib/bithenge \
         lib/posix