Changes in uspace/Makefile [849ed54:36a75a2] in mainline

File:

• uspace/Makefile (modified) (6 diffs)

uspace/Makefile

@@ -41 +41 @@
         app/mkfat \
         app/redir \
-        app/sbi \
         app/taskdump \
         app/tester \
@@ -65 +64 @@
         srv/hid/fb \
         srv/hid/kbd \
-        srv/hw/char/i8042 \
-        srv/hw/netif/dp8390
+        srv/hw/char/i8042
 
 ## Platform-specific hardware support
@@ -96 +94 @@
 #
 
+ifeq ($(CONFIG_NETIF_DP8390),y)
+        DIRS += srv/net/netif/dp8390
+endif
+
 NETWORKING_COMMON = \
         srv/net/netif/lo \
@@ -101 +103 @@
         srv/net/nil/nildummy \
         srv/net/net \
-        srv/net/netstart \
-        app/netecho \
-        app/nettest1 \
-        app/nettest2 \
-        app/ping
+        srv/net/net/start \
+        srv/net/socket \
+        srv/net/app/echo \
+        srv/net/app/ping \
+        srv/net/app/nettest1 \
+        srv/net/app/nettest2
 
 NETWORKING_MODULAR = \
@@ -124 +127 @@
         lib/softint \
         lib/softfloat \
-        lib/socket \
-        lib/net \
-        lib/netif
 
 ifeq ($(UARCH),amd64)
@@ -148 +148 @@
 endif
 
+ifeq ($(CONFIG_NETWORKING),none)
+        BUILDS := $(addsuffix .build,$(DIRS))
+endif
+
 CLEANS := $(addsuffix .clean,$(DIRS)) $(addsuffix .clean,$(NETWORKING_COMMON)) $(addsuffix .clean,$(NETWORKING_MODULAR)) $(addsuffix .clean,$(LIBS)) $(addsuffix .clean,$(LIBC))