Changeset 547c37a in mainline for uspace/Makefile

Timestamp:

2011-06-06T20:53:49Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

bbe4828

Parents:

7b712b60 (diff), ff4f073 (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

@@ -35 +35 @@
 DIRS = \
         app/bdsh \
+        app/blkdump \
+        app/bnchmark \
         app/edit \
+        app/ext2info \
         app/getterm \
         app/init \
@@ -47 +50 @@
         app/taskdump \
         app/tester \
+        app/testread \
         app/tetris \
         app/trace \
@@ -72 +76 @@
         srv/fs/tmpfs \
         srv/fs/devfs \
+        srv/fs/ext2fs \
         srv/hid/adb_mouse \
         srv/hid/char_mouse \
@@ -90 +95 @@
         drv/rootvirt \
         drv/test1 \
-        drv/test2
+        drv/test2 \
+        drv/test3
 
 ## Networking
@@ -148 +154 @@
         lib/drv \
         lib/packet \
-        lib/net
+        lib/net \
+        lib/ext2
 
 LIBC_BUILD = $(addsuffix .build,$(LIBC))