Changeset 8013637 in mainline for boot/Makefile.common
- Timestamp:
- 2012-07-20T13:51:28Z (12 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 8fccd42
- Parents:
- c5bff3c (diff), 7030bc9 (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. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
boot/Makefile.common
rc5bff3c r8013637 72 72 $(USPACE_PATH)/srv/loader/loader \ 73 73 $(USPACE_PATH)/app/init/init \ 74 $(USPACE_PATH)/srv/loc /loc\74 $(USPACE_PATH)/srv/locsrv/locsrv \ 75 75 $(USPACE_PATH)/srv/bd/rd/rd \ 76 76 $(USPACE_PATH)/srv/vfs/vfs … … 98 98 $(USPACE_PATH)/srv/bd/part/guid_part/g_part \ 99 99 $(USPACE_PATH)/srv/bd/part/mbr_part/mbr_part \ 100 $(USPACE_PATH)/srv/bd/sata_bd/sata_bd \ 100 101 $(USPACE_PATH)/srv/clipboard/clipboard \ 101 102 $(USPACE_PATH)/srv/fs/tmpfs/tmpfs \ … … 107 108 $(USPACE_PATH)/srv/hid/remcons/remcons \ 108 109 $(USPACE_PATH)/srv/net/ethip/ethip \ 109 $(USPACE_PATH)/srv/net/inet /inet\110 $(USPACE_PATH)/srv/net/inetsrv/inetsrv \ 110 111 $(USPACE_PATH)/srv/net/loopip/loopip \ 111 112 $(USPACE_PATH)/srv/net/tcp/tcp \ … … 122 123 nic/ne2k \ 123 124 nic/e1k \ 124 nic/rtl8139 125 nic/rtl8139 \ 126 block/ahci 125 127 126 128 RD_DRV_CFG = … … 157 159 $(USPACE_PATH)/app/edit/edit \ 158 160 $(USPACE_PATH)/app/ext2info/ext2info \ 159 $(USPACE_PATH)/app/inet cfg/inetcfg\161 $(USPACE_PATH)/app/inet/inet \ 160 162 $(USPACE_PATH)/app/kill/kill \ 161 163 $(USPACE_PATH)/app/killall/killall \ 162 $(USPACE_PATH)/app/loc info/locinfo\164 $(USPACE_PATH)/app/loc/loc \ 163 165 $(USPACE_PATH)/app/mkfat/mkfat \ 164 166 $(USPACE_PATH)/app/mkexfat/mkexfat \ … … 177 179 $(USPACE_PATH)/app/nettest3/nettest3 \ 178 180 $(USPACE_PATH)/app/netecho/netecho \ 181 $(USPACE_PATH)/app/nterm/nterm \ 179 182 $(USPACE_PATH)/app/ping/ping \ 180 183 $(USPACE_PATH)/app/stats/stats \ … … 200 203 endif 201 204 205 ifeq ($(CONFIG_MSIM),y) 206 RD_APPS_NON_ESSENTIAL += \ 207 $(USPACE_PATH)/app/msim/msim 208 endif 209 202 210 COMPONENTS = \ 203 211 $(KERNEL_PATH)/kernel.bin \
Note:
See TracChangeset
for help on using the changeset viewer.