Changeset cddcc4a3 in mainline for uspace/Makefile

Timestamp:

2012-08-14T18:16:39Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

669f5cae

Parents:

76d92db1 (diff), 4802dd7 (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

@@ -48 +48 @@
         app/loc \
         app/logview \
-        app/lsusb \
         app/mkfat \
         app/mkexfat \
@@ -60 +59 @@
         app/tester \
         app/testread \
+        app/testwrit \
         app/tetris \
         app/trace \
@@ -87 +87 @@
         srv/vfs \
         srv/bd/ata_bd \
+        srv/bd/sata_bd \
         srv/bd/file_bd \
         srv/bd/gxe_bd \
@@ -99 +100 @@
         srv/fs/locfs \
         srv/fs/ext2fs \
+        srv/fs/ext4fs \
         srv/hid/console \
         srv/hid/s3c24xx_ts \
@@ -107 +109 @@
         drv/infrastructure/root \
         drv/infrastructure/rootvirt \
+        drv/block/ahci \
         drv/char/i8042 \
         drv/char/ps2mouse \
@@ -171 +174 @@
         DIRS += \
                 drv/infrastructure/rootmac \
+                drv/bus/pci/pciintel \
                 srv/hw/bus/cuda_adb
 endif
@@ -196 +200 @@
         lib/nic \
         lib/ext2 \
+        lib/ext4 \
         lib/usb \
         lib/usbhost \