Changeset 99de22b in mainline for boot/Makefile.common

Timestamp:

2010-01-15T18:30:25Z (14 years ago)

Author:

Pavel Rimsky <pavel@…>

Branches:

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

Children:

eeb643d

Parents:

387416b (diff), 563d6077 (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 latest trunk changes.

File:

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

boot/Makefile.common

@@ -27 +27 @@
 #
 
+-include ../Makefile.config
+
 TMP = distroot
 INITRD = initrd
@@ -45 +47 @@
 
 RD_SRVS = \
-        $(USPACEDIR)/srv/fb/fb \
-        $(USPACEDIR)/srv/kbd/kbd \
-        $(USPACEDIR)/srv/console/console \
+        $(USPACEDIR)/srv/bd/file_bd/file_bd \
+        $(USPACEDIR)/srv/bd/part/mbr_part/mbr_part \
         $(USPACEDIR)/srv/clip/clip \
+        $(USPACEDIR)/srv/hid/fb/fb \
+        $(USPACEDIR)/srv/hid/kbd/kbd \
+        $(USPACEDIR)/srv/hid/console/console \
         $(USPACEDIR)/srv/fs/devfs/devfs \
         $(USPACEDIR)/srv/fs/tmpfs/tmpfs \
-        $(USPACEDIR)/srv/fs/fat/fat \
-        $(USPACEDIR)/srv/bd/file_bd/file_bd \
-        $(USPACEDIR)/srv/part/mbr_part/mbr_part
+        $(USPACEDIR)/srv/fs/fat/fat
 
 RD_APPS = \
+        $(USPACEDIR)/app/bdsh/bdsh \
         $(USPACEDIR)/app/edit/edit \
-        $(USPACEDIR)/app/getvc/getvc \
+        $(USPACEDIR)/app/getterm/getterm \
+        $(USPACEDIR)/app/klog/klog \
+        $(USPACEDIR)/app/mkfat/mkfat \
         $(USPACEDIR)/app/redir/redir \
+        $(USPACEDIR)/app/tester/tester \
         $(USPACEDIR)/app/tetris/tetris \
-        $(USPACEDIR)/app/tester/tester \
-        $(USPACEDIR)/app/trace/trace \
-        $(USPACEDIR)/app/klog/klog \
-        $(USPACEDIR)/app/bdsh/bdsh
+        $(USPACEDIR)/app/trace/trace
 
 COMPONENTS = \
         $(KERNELDIR)/kernel.bin \
         $(USPACEDIR)/srv/ns/ns \
+        $(USPACEDIR)/srv/loader/loader \
         $(USPACEDIR)/app/init/init \
-        $(USPACEDIR)/srv/loader/loader \
         $(USPACEDIR)/srv/devmap/devmap \
         $(USPACEDIR)/srv/bd/rd/rd \