Changeset 98abd40 in mainline for uspace/Makefile

Timestamp:

2013-07-06T21:57:22Z (11 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

c8bb1633, cdc8a391

Parents:

b8e72fd1 (diff), 507c6f3 (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) (5 diffs)

uspace/Makefile

@@ -72 +72 @@
         app/nettest3 \
         app/ping \
+        app/ping6 \
         app/sysinfo \
         app/mkbd \
@@ -88 +89 @@
         srv/net/inetsrv \
         srv/net/loopip \
+        srv/net/slip \
         srv/net/tcp \
         srv/net/udp \
@@ -93 +95 @@
         srv/taskmon \
         srv/vfs \
-        srv/bd/ata_bd \
         srv/bd/sata_bd \
         srv/bd/file_bd \
@@ -118 +119 @@
         drv/infrastructure/rootvirt \
         drv/block/ahci \
+        drv/block/ata_bd \
         drv/char/i8042 \
         drv/char/ps2mouse \
@@ -137 +139 @@
         drv/nic/ne2k \
         drv/nic/e1k \
-        drv/nic/rtl8139 \
+        drv/nic/rtl8139
 
 ifeq ($(CONFIG_PCC),y)