Changeset 1b1164e8 in mainline for uspace/Makefile

Timestamp:

2010-03-23T14:44:00Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

63f8966

Parents:

d99c1d2

Message:

unify and simplify user space makefiles
rename NETWORKING configuration option to CONFIG_NETWORKING

File:

• uspace/Makefile (modified) (4 diffs)

uspace/Makefile

@@ -27 +27 @@
 #
 
-## Include configuration
-#
-
 -include ../Makefile.common
 -include ../Makefile.config
+
+## Common binaries
+#
 
 DIRS = \
@@ -64 +64 @@
         srv/hid/fb \
         srv/hid/kbd \
-        srv/hw/char/i8042 \
-        srv/net
+        srv/hw/char/i8042
+
+## Platform-specific hardware support
+#
 
 ifneq ($(UARCH),abs32le)
@@ -89 +91 @@
 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
+#
+
 LIBC = lib/libc
 LIBS = \
@@ -108 +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