Changeset 3b3e776 in mainline for boot/arch/ia64/loader/Makefile.common

Timestamp:

2010-02-05T10:57:50Z (15 years ago)

Author:

Lenka Trochtova <trochtova.lenka@…>

Branches:

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

Children:

0358da0

Parents:

3f085132 (diff), b4cbef1 (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

File:

• boot/arch/ia64/loader/Makefile.common (modified) (2 diffs)

boot/arch/ia64/loader/Makefile.common

@@ -31 +31 @@
 #
 
+include ../../../../Makefile.config
+include ../../../Makefile.common
+
 DEPEND = Makefile.depend
 DEPEND_PREV = $(DEPEND).prev
+JOB = image.job
 OUTPUT = image.boot
 HELLO = hello.efi
@@ -38 +42 @@
 LINK = _link.ld
 COMPS = _components
-INITRD = initrd
 
 KERNELDIR = ../../../../kernel
 USPACEDIR = ../../../../uspace
 
-RD_SRVS = \
-        $(USPACEDIR)/srv/fb/fb \
-        $(USPACEDIR)/srv/kbd/kbd \
-        $(USPACEDIR)/srv/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
-
-RD_APPS = \
-        $(USPACEDIR)/app/edit/edit \
-        $(USPACEDIR)/app/getvc/getvc \
-        $(USPACEDIR)/app/redir/redir \
-        $(USPACEDIR)/app/tetris/tetris \
-        $(USPACEDIR)/app/tester/tester \
-        $(USPACEDIR)/app/trace/trace \
-        $(USPACEDIR)/app/klog/klog \
-        $(USPACEDIR)/app/bdsh/bdsh
+ifeq ($(MACHINE),i460GX)
+        RD_SRVS += \
+                $(USPACEDIR)/srv/hw/char/i8042/i8042 \
+                $(USPACEDIR)/srv/hid/char_mouse/char_ms
+endif