Changeset 5cde90f in mainline for boot/Makefile.common

Timestamp:

2010-02-19T17:16:46Z (14 years ago)

Author:

Pavel Rimsky <pavel@…>

Branches:

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

Children:

617652f

Parents:

b86d436 (diff), f41aa81 (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:

Synchronizing with head (which has just been synchronized with this branch).

File:

• boot/Makefile.common (modified) (3 diffs)

boot/Makefile.common

@@ -48 +48 @@
 RD_SRVS = \
         $(USPACEDIR)/srv/bd/file_bd/file_bd \
+        $(USPACEDIR)/srv/bd/part/guid_part/g_part \
         $(USPACEDIR)/srv/bd/part/mbr_part/mbr_part \
         $(USPACEDIR)/srv/clip/clip \
@@ -55 +56 @@
         $(USPACEDIR)/srv/fs/devfs/devfs \
         $(USPACEDIR)/srv/fs/tmpfs/tmpfs \
-        $(USPACEDIR)/srv/fs/fat/fat
+        $(USPACEDIR)/srv/fs/fat/fat \
+        $(USPACEDIR)/srv/taskmon/taskmon
 
 RD_APPS = \
@@ -64 +66 @@
         $(USPACEDIR)/app/mkfat/mkfat \
         $(USPACEDIR)/app/redir/redir \
+        $(USPACEDIR)/app/taskdump/taskdump \
         $(USPACEDIR)/app/tester/tester \
         $(USPACEDIR)/app/tetris/tetris \