Changeset a7a7f8c in mainline for boot/Makefile.common
- Timestamp:
- 2012-04-20T07:32:57Z (12 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 097f421
- Parents:
- 90f067d9 (diff), 606c369 (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
r90f067d9 ra7a7f8c 106 106 $(USPACE_PATH)/srv/fs/ext2fs/ext2fs \ 107 107 $(USPACE_PATH)/srv/hid/remcons/remcons \ 108 $(USPACE_PATH)/srv/net/ethip/ethip \ 109 $(USPACE_PATH)/srv/net/inet/inet \ 110 $(USPACE_PATH)/srv/net/loopip/loopip \ 111 $(USPACE_PATH)/srv/net/tcp/tcp \ 112 $(USPACE_PATH)/srv/net/udp/udp \ 108 113 $(USPACE_PATH)/srv/taskmon/taskmon \ 109 $(USPACE_PATH)/srv/net/nil/eth/eth \110 $(USPACE_PATH)/srv/net/nil/nildummy/nildummy \111 $(USPACE_PATH)/srv/net/il/arp/arp \112 $(USPACE_PATH)/srv/net/il/ip/ip \113 $(USPACE_PATH)/srv/net/tl/icmp/icmp \114 $(USPACE_PATH)/srv/net/tl/udp/udp \115 $(USPACE_PATH)/srv/net/tl/tcp/tcp \116 $(USPACE_PATH)/srv/net/net/net \117 114 $(USPACE_PATH)/srv/devman/devman 118 115 … … 123 120 test/test2 \ 124 121 test/test3 \ 125 nic/lo \126 122 nic/ne2k \ 127 123 nic/e1k \ … … 161 157 $(USPACE_PATH)/app/edit/edit \ 162 158 $(USPACE_PATH)/app/ext2info/ext2info \ 159 $(USPACE_PATH)/app/inetcfg/inetcfg \ 163 160 $(USPACE_PATH)/app/kill/kill \ 164 161 $(USPACE_PATH)/app/killall/killall \ … … 208 205 endif 209 206 210 ifneq ($(CONFIG_BAREBONE),y)211 NET_CFG = \212 $(USPACE_PATH)/srv/net/cfg/general \213 $(USPACE_PATH)/srv/net/cfg/lo.nic \214 $(USPACE_PATH)/srv/net/cfg/ne2k.nic \215 $(USPACE_PATH)/srv/net/cfg/e1k.nic216 endif217 218 207 COMPONENTS = \ 219 208 $(KERNEL_PATH)/kernel.bin \
Note:
See TracChangeset
for help on using the changeset viewer.