Changeset f4f866c in mainline for uspace/Makefile

Timestamp:

2010-04-23T21:42:26Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

6c39a907

Parents:

38aaacc2 (diff), 80badbe (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• uspace/Makefile (modified) (6 diffs)

uspace/Makefile

@@ -42 +42 @@
         app/redir \
         app/sbi \
+        app/stats \
         app/taskdump \
+        app/tasks \
         app/tester \
         app/tetris \
         app/trace \
+        app/top \
+        app/dummy_load \
         srv/clip \
         srv/devmap \
@@ -66 +70 @@
         srv/hid/kbd \
         srv/hw/char/i8042 \
-        srv/hw/netif/dp8390
+        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
 
 ## Platform-specific hardware support
@@ -93 +123 @@
 endif
 
-## Networking
-#
-
-NETWORKING_COMMON = \
-        srv/net/netif/lo \
-        srv/net/nil/eth \
-        srv/net/nil/nildummy \
-        srv/net/net \
-        srv/net/netstart \
-        app/netecho \
-        app/nettest1 \
-        app/nettest2 \
-        app/ping
-
-NETWORKING_MODULAR = \
-        srv/net/il/arp \
-        srv/net/il/ip \
-        srv/net/tl/icmp \
-        srv/net/tl/udp \
-        srv/net/tl/tcp
-
 ## System libraries
 #
@@ -125 +134 @@
         lib/softfloat \
         lib/socket \
-        lib/net \
-        lib/netif
+        lib/net
 
 ifeq ($(UARCH),amd64)
@@ -139 +147 @@
 LIBC_BUILD = $(addsuffix .build,$(LIBC))
 LIBS_BUILD = $(addsuffix .build,$(LIBS))
+LIBN_BUILD = $(addsuffix .build,$(LIBN))
+BUILDS := $(addsuffix .build,$(DIRS))
 
-ifeq ($(CONFIG_NETWORKING),modular)
-        BUILDS := $(addsuffix .build,$(DIRS)) $(addsuffix .build,$(NETWORKING_COMMON)) $(addsuffix .build,$(NETWORKING_MODULAR))
-endif
+CLEANS := $(addsuffix .clean,$(DIRS)) $(addsuffix .clean,$(LIBN)) $(addsuffix .clean,$(LIBS)) $(addsuffix .clean,$(LIBC))
 
-ifeq ($(CONFIG_NETWORKING),module)
-        BUILDS := $(addsuffix .build,$(DIRS)) $(addsuffix .build,$(NETWORKING_COMMON))
-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
+.PHONY: all $(LIBC_BUILD) $(LIBS_BUILD) $(LIBN_BUILD) $(BUILDS) $(CLEANS) clean
 
 all: $(BUILDS)
@@ -159 +161 @@
         -$(MAKE) -C $(basename $@) clean
 
-$(BUILDS): $(LIBC_BUILD) $(LIBS_BUILD)
+$(BUILDS): $(LIBC_BUILD) $(LIBS_BUILD) $(LIBN_BUILD)
+        $(MAKE) -C $(basename $@) all PRECHECK=$(PRECHECK)
+
+$(LIBN_BUILD): $(LIBC_BUILD) $(LIBS_BUILD)
         $(MAKE) -C $(basename $@) all PRECHECK=$(PRECHECK)