Changeset 1787e527 in mainline for boot/arch/amd64/Makefile.inc

Timestamp:

2009-11-16T21:22:54Z (14 years ago)

Author:

Lenka Trochtova <trochtova.lenka@…>

Branches:

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

Children:

5ebdf94

Parents:

fcbd1be (diff), 9c70ed6 (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:

merged with head (unstable)

File:

• boot/arch/amd64/Makefile.inc (modified) (2 diffs)

boot/arch/amd64/Makefile.inc

@@ -52 +52 @@
         $(USPACEDIR)/srv/fs/fat/fat \
         $(USPACEDIR)/srv/bd/ata_bd/ata_bd \
-        $(USPACEDIR)/srv/bd/file_bd/file_bd
+        $(USPACEDIR)/srv/bd/file_bd/file_bd \
+        $(USPACEDIR)/srv/part/mbr_part/mbr_part
 
 RD_APPS = \
+        $(USPACEDIR)/app/edit/edit \
         $(USPACEDIR)/app/getvc/getvc \
+        $(USPACEDIR)/app/redir/redir \
         $(USPACEDIR)/app/tetris/tetris \
         $(USPACEDIR)/app/tester/tester \
@@ -94 +97 @@
 
 clean:
-        -for file in $(RD_SRVS) ; do \
+        for file in $(RD_SRVS) ; do \
                 rm -f $(USPACEDIR)/dist/srv/`basename $$file` ; \
         done
-        -for file in $(RD_APPS) ; do \
+        for file in $(RD_APPS) ; do \
                 rm -f $(USPACEDIR)/dist/app/`basename $$file` ; \
         done
-        -rm -fr $(TMP)
-        -rm -f $(BASE)/image.iso
+        rm -fr $(TMP)
+        rm -f $(BASE)/image.iso