Changeset 99c2c69e in mainline for uspace/Makefile

Timestamp:

2013-09-13T00:36:30Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

67fbd5e

Parents:

7f84430 (diff), 11d41be5 (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) (6 diffs)

uspace/Makefile

@@ -38 +38 @@
         app/blkdump \
         app/bnchmark \
+        app/corecfg \
         app/devctl \
         app/dnscfg \
@@ -69 +70 @@
         app/vuhid \
         app/netecho \
+        app/netspeed \
         app/nettest1 \
         app/nettest2 \
@@ -80 +82 @@
         app/vlaunch \
         app/vterm \
+        app/df \
         app/wavplay \
         app/websrv \
@@ -88 +91 @@
         srv/devman \
         srv/loader \
+        srv/net/dhcp \
         srv/net/dnsrsrv \
         srv/net/ethip \
@@ -119 +123 @@
         srv/hid/remcons \
         srv/hw/char/s3c24xx_uart \
+        srv/hid/rfb \
         drv/audio/sb16 \
         drv/infrastructure/root \
@@ -186 +191 @@
                 srv/hw/irc/apic \
                 srv/hw/irc/i8259
+endif
+
+ifeq ($(UARCH), $(filter $(UARCH),mips32 mips32eb))
+        DIRS += \
+                drv/infrastructure/rootmalta \
+                drv/bus/pci/pciintel \
+                drv/bus/isa
 endif