Changeset 7719958 in mainline for boot/Makefile.common
- Timestamp:
- 2012-04-23T22:51:36Z (12 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 6a3808e
- Parents:
- 3293a94 (diff), 32fef47 (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
r3293a94 r7719958 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/clip /clip\100 $(USPACE_PATH)/srv/clipboard/clipboard \ 101 101 $(USPACE_PATH)/srv/fs/tmpfs/tmpfs \ 102 102 $(USPACE_PATH)/srv/fs/fat/fat \ … … 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 \ … … 204 201 endif 205 202 206 ifneq ($(CONFIG_BAREBONE),y)207 NET_CFG = \208 $(USPACE_PATH)/srv/net/cfg/general \209 $(USPACE_PATH)/srv/net/cfg/lo.nic \210 $(USPACE_PATH)/srv/net/cfg/ne2k.nic \211 $(USPACE_PATH)/srv/net/cfg/e1k.nic212 endif213 214 203 COMPONENTS = \ 215 204 $(KERNEL_PATH)/kernel.bin \
Note:
See TracChangeset
for help on using the changeset viewer.