Changes in boot/Makefile.common [69a93df7:6b3cda3] in mainline

File:

• boot/Makefile.common (modified) (3 diffs)

boot/Makefile.common

@@ -106 +106 @@
         $(USPACE_PATH)/srv/fs/ext2fs/ext2fs \
         $(USPACE_PATH)/srv/hid/remcons/remcons \
-        $(USPACE_PATH)/srv/net/ethip/ethip \
-        $(USPACE_PATH)/srv/net/inet/inet \
-        $(USPACE_PATH)/srv/net/tcp/tcp \
-        $(USPACE_PATH)/srv/net/udp/udp \
         $(USPACE_PATH)/srv/taskmon/taskmon \
+        $(USPACE_PATH)/srv/net/nil/eth/eth \
+        $(USPACE_PATH)/srv/net/nil/nildummy/nildummy \
+        $(USPACE_PATH)/srv/net/il/arp/arp \
+        $(USPACE_PATH)/srv/net/il/ip/ip \
+        $(USPACE_PATH)/srv/net/tl/icmp/icmp \
+        $(USPACE_PATH)/srv/net/tl/udp/udp \
+        $(USPACE_PATH)/srv/net/tl/tcp/tcp \
+        $(USPACE_PATH)/srv/net/net/net \
         $(USPACE_PATH)/srv/devman/devman
 
@@ -157 +161 @@
         $(USPACE_PATH)/app/edit/edit \
         $(USPACE_PATH)/app/ext2info/ext2info \
-        $(USPACE_PATH)/app/inetcfg/inetcfg \
         $(USPACE_PATH)/app/kill/kill \
         $(USPACE_PATH)/app/killall/killall \
         $(USPACE_PATH)/app/locinfo/locinfo \
         $(USPACE_PATH)/app/mkfat/mkfat \
+        $(USPACE_PATH)/app/mkexfat/mkexfat \
         $(USPACE_PATH)/app/mkmfs/mkmfs \
         $(USPACE_PATH)/app/lsusb/lsusb \
@@ -199 +203 @@
 endif
 
+ifneq ($(CONFIG_BAREBONE),y)
+NET_CFG = \
+        $(USPACE_PATH)/srv/net/cfg/general \
+        $(USPACE_PATH)/srv/net/cfg/lo.nic \
+        $(USPACE_PATH)/srv/net/cfg/ne2k.nic \
+        $(USPACE_PATH)/srv/net/cfg/e1k.nic
+endif
+
 COMPONENTS = \
         $(KERNEL_PATH)/kernel.bin \