Changes in uspace/Makefile [684f767:63f8966] in mainline

File:

• uspace/Makefile (modified) (4 diffs)

uspace/Makefile

@@ -27 +27 @@
 #
 
-## Include configuration
+-include ../Makefile.common
+-include ../Makefile.config
+
+## Common binaries
 #
-
--include ../Makefile.config
 
 DIRS = \
@@ -65 +66 @@
         srv/hw/char/i8042
 
+## Platform-specific hardware support
+#
+
 ifneq ($(UARCH),abs32le)
         DIRS += srv/hid/console
@@ -87 +91 @@
 endif
 
-LIBC = lib/libc
+## 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
+#
+
+LIBC = lib/c
 LIBS = \
-        lib/libfs \
-        lib/libblock \
+        lib/fs \
+        lib/block \
         lib/softint \
         lib/softfloat \
 
 ifeq ($(UARCH),amd64)
-        LIBS += lib/libpci
+        LIBS += lib/pci
 endif
 
 ifeq ($(UARCH),ia32)
-        LIBS += lib/libpci
+        LIBS += lib/pci
 endif
 
@@ -106 +139 @@
 LIBS_BUILD = $(addsuffix .build,$(LIBS))
 
-BUILDS := $(addsuffix .build,$(DIRS))
-CLEANS := $(addsuffix .clean,$(DIRS)) $(addsuffix .clean,$(LIBS)) $(addsuffix .clean,$(LIBC))
+ifeq ($(CONFIG_NETWORKING),modular)
+        BUILDS := $(addsuffix .build,$(DIRS)) $(addsuffix .build,$(NETWORKING_COMMON)) $(addsuffix .build,$(NETWORKING_MODULAR))
+endif
+
+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