Changeset 5c96b2a in mainline for uspace/Makefile

Timestamp:

2011-06-02T21:26:44Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

ff4f073

Parents:

4a06045 (diff), 21300a2 (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 from ​http://ho.st.dcs.fmph.uniba.sk/~mato/bzr/helenos-ext2.

Changes made against the ext2 branch parent:

• removed .bzrignore
• removed all traces of pipefs

File:

• uspace/Makefile (modified) (4 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 \
@@ -149 +154 @@
         lib/drv \
         lib/packet \
-        lib/net
+        lib/net \
+        lib/ext2
 
 LIBC_BUILD = $(addsuffix .build,$(LIBC))