Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset b79d450 in mainline for boot/Makefile.common


Ignore:
Timestamp:
2010-01-27T20:35:49Z (12 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master
Children:
fb6f1a5
Parents:
fccc236 (diff), 95e6c4f (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 mainline changes.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • boot/Makefile.common

    rfccc236 rb79d450  
    2727#
    2828
     29-include ../Makefile.config
     30
    2931TMP = distroot
    3032INITRD = initrd
     
    4648RD_SRVS = \
    4749        $(USPACEDIR)/srv/bd/file_bd/file_bd \
     50        $(USPACEDIR)/srv/bd/part/guid_part/g_part \
    4851        $(USPACEDIR)/srv/bd/part/mbr_part/mbr_part \
    4952        $(USPACEDIR)/srv/clip/clip \
     
    5356        $(USPACEDIR)/srv/fs/devfs/devfs \
    5457        $(USPACEDIR)/srv/fs/tmpfs/tmpfs \
    55         $(USPACEDIR)/srv/fs/fat/fat
     58        $(USPACEDIR)/srv/fs/fat/fat \
     59        $(USPACEDIR)/srv/taskmon/taskmon
    5660
    5761RD_APPS = \
     
    6064        $(USPACEDIR)/app/getterm/getterm \
    6165        $(USPACEDIR)/app/klog/klog \
     66        $(USPACEDIR)/app/mkfat/mkfat \
    6267        $(USPACEDIR)/app/redir/redir \
     68        $(USPACEDIR)/app/taskdump/taskdump \
    6369        $(USPACEDIR)/app/tester/tester \
    6470        $(USPACEDIR)/app/tetris/tetris \
Note: See TracChangeset for help on using the changeset viewer.