Changeset 3a0a4d8 in mainline for uspace/Makefile

Timestamp:

2013-09-12T07:54:05Z (12 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

95027b5

Parents:

47f5a77 (diff), 64f3d3b (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) (7 diffs)

uspace/Makefile

@@ -38 +38 @@
         app/blkdump \
         app/bnchmark \
+        app/corecfg \
         app/devctl \
         app/dnscfg \
@@ -50 +51 @@
         app/loc \
         app/logset \
+        app/mixerctl \
         app/mkfat \
         app/mkexfat \
@@ -76 +78 @@
         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 \
@@ -116 +121 @@
         srv/hid/remcons \
         srv/hw/char/s3c24xx_uart \
+        drv/audio/sb16 \
         drv/infrastructure/root \
         drv/infrastructure/rootvirt \
@@ -184 +190 @@
 endif
 
+ifeq ($(UARCH), $(filter $(UARCH),mips32 mips32eb))
+        DIRS += \
+                drv/infrastructure/rootmalta \
+                drv/bus/pci/pciintel \
+                drv/bus/isa
+endif
+
 ifeq ($(UARCH),ppc32)
         DIRS += \
@@ -217 +230 @@
         lib/graph \
         lib/gui \
+        lib/hound \
         lib/softrend \
         lib/draw \
@@ -227 +241 @@
         lib/usbhid \
         lib/usbvirt \
+        lib/pcm \
         lib/bithenge \
         lib/posix