Changes in uspace/Makefile [14f1db0:95319bd] in mainline

File:

• uspace/Makefile (modified) (6 diffs)

uspace/Makefile

@@ -41 +41 @@
         app/mkfat \
         app/redir \
-        app/sbi \
         app/taskdump \
         app/tester \
         app/tetris \
         app/trace \
+        app/ps \
+        app/top \
+        app/uptime \
+        app/dummy_load \
         srv/clip \
         srv/devmap \
@@ -65 +68 @@
         srv/hid/fb \
         srv/hid/kbd \
-        srv/hw/char/i8042 \
-        srv/hw/netif/dp8390 \
-        srv/net/cfg \
-        srv/net/netif/lo \
-        srv/net/il/arp \
-        srv/net/il/ip \
-        srv/net/tl/icmp \
-        srv/net/tl/udp \
-        srv/net/tl/tcp \
-        srv/net/net \
-        srv/net/netstart \
-        app/netecho \
-        app/nettest1 \
-        app/nettest2 \
-        app/ping
-
-## Networking
-#
-
-ifeq ($(CONFIG_NETIF_NIL_BUNDLE),y)
-        LIBN = \
-                srv/net/nil/eth \
-                srv/net/nil/nildummy
-else
-        DIRS += \
-                srv/net/nil/eth \
-                srv/net/nil/nildummy
-endif
+        srv/hw/char/i8042
 
 ## Platform-specific hardware support
@@ -119 +95 @@
 endif
 
+## Networking
+#
+
+ifeq ($(CONFIG_NETIF_DP8390),y)
+        DIRS += srv/net/netif/dp8390
+endif
+
+NETWORKING_COMMON = \
+        srv/net/netif/lo \
+        srv/net/nil/eth \
+        srv/net/nil/nildummy \
+        srv/net/net \
+        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 = \
+        srv/net/il/arp \
+        srv/net/il/ip \
+        srv/net/tl/icmp \
+        srv/net/tl/udp \
+        srv/net/tl/tcp
+
 ## System libraries
 #
@@ -126 +128 @@
         lib/fs \
         lib/block \
-        lib/clui \
         lib/softint \
         lib/softfloat \
-        lib/socket \
-        lib/net
 
 ifeq ($(UARCH),amd64)
@@ -143 +142 @@
 LIBC_BUILD = $(addsuffix .build,$(LIBC))
 LIBS_BUILD = $(addsuffix .build,$(LIBS))
-LIBN_BUILD = $(addsuffix .build,$(LIBN))
-BUILDS := $(addsuffix .build,$(DIRS))
 
-CLEANS := $(addsuffix .clean,$(DIRS)) $(addsuffix .clean,$(LIBN)) $(addsuffix .clean,$(LIBS)) $(addsuffix .clean,$(LIBC))
+ifeq ($(CONFIG_NETWORKING),modular)
+        BUILDS := $(addsuffix .build,$(DIRS)) $(addsuffix .build,$(NETWORKING_COMMON)) $(addsuffix .build,$(NETWORKING_MODULAR))
+endif
 
-.PHONY: all $(LIBC_BUILD) $(LIBS_BUILD) $(LIBN_BUILD) $(BUILDS) $(CLEANS) clean
+ifeq ($(CONFIG_NETWORKING),module)
+        BUILDS := $(addsuffix .build,$(DIRS)) $(addsuffix .build,$(NETWORKING_COMMON))
+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))
+
+.PHONY: all $(LIBC_BUILD) $(LIBS_BUILD) $(BUILDS) $(CLEANS) clean
 
 all: $(BUILDS)
@@ -157 +166 @@
         -$(MAKE) -C $(basename $@) clean
 
-$(BUILDS): $(LIBC_BUILD) $(LIBS_BUILD) $(LIBN_BUILD)
-        $(MAKE) -C $(basename $@) all PRECHECK=$(PRECHECK)
-
-$(LIBN_BUILD): $(LIBC_BUILD) $(LIBS_BUILD)
+$(BUILDS): $(LIBC_BUILD) $(LIBS_BUILD)
         $(MAKE) -C $(basename $@) all PRECHECK=$(PRECHECK)