Changes in boot/Makefile.common [d3a8e47:9d58539] in mainline

File:

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

boot/Makefile.common

@@ -98 +98 @@
         $(USPACE_PATH)/srv/bd/part/guid_part/g_part \
         $(USPACE_PATH)/srv/bd/part/mbr_part/mbr_part \
-        $(USPACE_PATH)/srv/clipboard/clipboard \
+        $(USPACE_PATH)/srv/clip/clip \
         $(USPACE_PATH)/srv/fs/tmpfs/tmpfs \
         $(USPACE_PATH)/srv/fs/fat/fat \
@@ -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/loopip/loopip \
-        $(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
 
@@ -120 +123 @@
         test/test2 \
         test/test3 \
+        nic/lo \
         nic/ne2k \
         nic/e1k \
@@ -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 \
@@ -200 +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 \