Changes in boot/Makefile.common [8a64320e:7c4b26c] in mainline

File:

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

boot/Makefile.common

@@ -101 +101 @@
 RD_SRVS_NON_ESSENTIAL = \
         $(USPACE_PATH)/srv/bd/file_bd/file_bd \
-        $(USPACE_PATH)/srv/bd/part/guid_part/g_part \
-        $(USPACE_PATH)/srv/bd/part/mbr_part/mbr_part \
         $(USPACE_PATH)/srv/bd/sata_bd/sata_bd \
+        $(USPACE_PATH)/srv/bd/vbd/vbd \
         $(USPACE_PATH)/srv/clipboard/clipboard \
         $(USPACE_PATH)/srv/fs/tmpfs/tmpfs \
@@ -124 +123 @@
         $(USPACE_PATH)/srv/net/tcp/tcp \
         $(USPACE_PATH)/srv/net/udp/udp \
-        $(USPACE_PATH)/srv/taskmon/taskmon
+        $(USPACE_PATH)/srv/taskmon/taskmon \
+        $(USPACE_PATH)/srv/volsrv/volsrv
 
 RD_DRVS_ESSENTIAL = \
@@ -158 +158 @@
 ifeq ($(CONFIG_BUILD_SHARED_LIBS), y)
         RD_LIBS += \
-                $(USPACE_PATH)/lib/c/libc.so0 \
-                $(USPACE_PATH)/lib/softint/libsofti.so0
-        RD_APPS += \
-                $(USPACE_PATH)/app/dltest/dltest
+                $(USPACE_PATH)/lib/c/libc.so.0 \
+                $(USPACE_PATH)/lib/softint/libsoftint.so.0 \
+                $(USPACE_PATH)/lib/math/libmath.so.0 \
+                $(USPACE_PATH)/lib/dltest/libdltest.so.0
 endif
 
@@ -178 +178 @@
         $(USPACE_PATH)/app/corecfg/corecfg \
         $(USPACE_PATH)/app/devctl/devctl \
-        $(USPACE_PATH)/app/dltest/dltest \
-        $(USPACE_PATH)/app/dltest2/dltest2 \
-        $(USPACE_PATH)/app/dload/dload \
         $(USPACE_PATH)/app/dnscfg/dnscfg \
         $(USPACE_PATH)/app/dnsres/dnsres \
         $(USPACE_PATH)/app/download/download \
         $(USPACE_PATH)/app/edit/edit \
-        $(USPACE_PATH)/app/hdisk/hdisk \
+        $(USPACE_PATH)/app/fdisk/fdisk \
         $(USPACE_PATH)/app/inet/inet \
         $(USPACE_PATH)/app/kill/kill \
@@ -208 +205 @@
         $(USPACE_PATH)/app/tetris/tetris \
         $(USPACE_PATH)/app/trace/trace \
-        $(USPACE_PATH)/app/nettest1/nettest1 \
-        $(USPACE_PATH)/app/nettest2/nettest2 \
-        $(USPACE_PATH)/app/nettest3/nettest3 \
         $(USPACE_PATH)/app/netecho/netecho \
-        $(USPACE_PATH)/app/netspeed/netspeed \
         $(USPACE_PATH)/app/nterm/nterm \
         $(USPACE_PATH)/app/ping/ping \
         $(USPACE_PATH)/app/stats/stats \
         $(USPACE_PATH)/app/sysinfo/sysinfo \
+        $(USPACE_PATH)/app/sysinst/sysinst \
         $(USPACE_PATH)/app/top/top \
         $(USPACE_PATH)/app/untar/untar \
@@ -230 +224 @@
         $(USPACE_PATH)/app/wifi_supplicant/wifi_supplicant
 
+ifeq ($(CONFIG_BUILD_SHARED_LIBS), y)
+        RD_APPS_NON_ESSENTIAL += \
+                $(USPACE_PATH)/app/dltest/dltest \
+                $(USPACE_PATH)/app/dltests/dltests
+endif
+
 RD_TESTS = \
         $(USPACE_PATH)/lib/c/test-libc \