Changeset 72cf064 in mainline for uspace/Makefile

Timestamp:

2012-08-13T17:17:04Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

33fee91

Parents:

f4a8734 (diff), 4820360 (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

@@ -47 +47 @@
         app/klog \
         app/loc \
-        app/lsusb \
         app/mkfat \
         app/mkexfat \
@@ -59 +58 @@
         app/tester \
         app/testread \
+        app/testwrit \
         app/tetris \
         app/trace \
@@ -85 +85 @@
         srv/vfs \
         srv/bd/ata_bd \
+        srv/bd/sata_bd \
         srv/bd/file_bd \
         srv/bd/gxe_bd \
@@ -97 +98 @@
         srv/fs/locfs \
         srv/fs/ext2fs \
+        srv/fs/ext4fs \
         srv/hid/console \
         srv/hid/s3c24xx_ts \
@@ -105 +107 @@
         drv/infrastructure/root \
         drv/infrastructure/rootvirt \
+        drv/block/ahci \
         drv/char/i8042 \
         drv/char/ps2mouse \
@@ -169 +172 @@
         DIRS += \
                 drv/infrastructure/rootmac \
+                drv/bus/pci/pciintel \
                 srv/hw/bus/cuda_adb
 endif
@@ -194 +198 @@
         lib/nic \
         lib/ext2 \
+        lib/ext4 \
         lib/usb \
         lib/usbhost \