Changeset dd0c8a0 in mainline for uspace/Makefile

Timestamp:

2013-09-29T06:56:33Z (12 years ago)

Author:

Beniamino Galvani <b.galvani@…>

Branches:

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

Children:

a9bd960d

Parents:

3deb0155 (diff), 13be2583 (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) (11 diffs)

uspace/Makefile

@@ -38 +38 @@
         app/blkdump \
         app/bnchmark \
+        app/corecfg \
         app/devctl \
+        app/dnscfg \
+        app/dnsres \
+        app/download \
         app/edit \
         app/getterm \
@@ -48 +52 @@
         app/loc \
         app/logset \
+        app/mixerctl \
         app/mkfat \
         app/mkexfat \
@@ -66 +71 @@
         app/vuhid \
         app/netecho \
+        app/netspeed \
         app/nettest1 \
         app/nettest2 \
         app/nettest3 \
         app/ping \
+        app/ping6 \
         app/sysinfo \
         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 \
@@ -82 +92 @@
         srv/devman \
         srv/loader \
+        srv/net/dhcp \
+        srv/net/dnsrsrv \
         srv/net/ethip \
         srv/net/inetsrv \
         srv/net/loopip \
+        srv/net/nconfsrv \
+        srv/net/slip \
         srv/net/tcp \
         srv/net/udp \
@@ -90 +104 @@
         srv/taskmon \
         srv/vfs \
-        srv/bd/ata_bd \
         srv/bd/sata_bd \
         srv/bd/file_bd \
@@ -112 +125 @@
         srv/hid/remcons \
         srv/hw/char/s3c24xx_uart \
+        srv/hid/rfb \
+        drv/audio/sb16 \
         drv/infrastructure/root \
         drv/infrastructure/rootvirt \
         drv/block/ahci \
+        drv/block/ata_bd \
         drv/char/i8042 \
         drv/char/ps2mouse \
@@ -134 +150 @@
         drv/nic/ne2k \
         drv/nic/e1k \
-        drv/nic/rtl8139 \
+        drv/nic/rtl8139
 
 ifeq ($(CONFIG_PCC),y)
@@ -177 +193 @@
                 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
 
@@ -212 +235 @@
         lib/graph \
         lib/gui \
+        lib/hound \
+        lib/http \
         lib/softrend \
         lib/draw \
@@ -217 +242 @@
         lib/nic \
         lib/ext4 \
+        lib/uri \
         lib/usb \
         lib/usbhost \
@@ -222 +248 @@
         lib/usbhid \
         lib/usbvirt \
+        lib/pcm \
         lib/bithenge \
         lib/posix