Changeset 3aae4e8 in mainline for boot/Makefile.common

Timestamp:

2010-04-04T22:07:05Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

23de644

Parents:

9f10660f (diff), 73060801 (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:

• boot/Makefile.common (modified) (3 diffs)

boot/Makefile.common

@@ -58 +58 @@
         $(USPACEDIR)/srv/fs/tmpfs/tmpfs \
         $(USPACEDIR)/srv/fs/fat/fat \
-        $(USPACEDIR)/srv/taskmon/taskmon
+        $(USPACEDIR)/srv/taskmon/taskmon \
+        $(USPACEDIR)/srv/hw/netif/dp8390/dp8390 \
+        $(USPACEDIR)/srv/net/net/net \
+        $(USPACEDIR)/srv/net/netstart/netstart \
+        $(USPACEDIR)/srv/net/netif/lo/lo \
+        $(USPACEDIR)/srv/net/nil/eth/eth \
+        $(USPACEDIR)/srv/net/nil/nildummy/nildummy
 
 RD_APPS = \
@@ -71 +77 @@
         $(USPACEDIR)/app/tester/tester \
         $(USPACEDIR)/app/tetris/tetris \
-        $(USPACEDIR)/app/trace/trace
+        $(USPACEDIR)/app/trace/trace \
+        $(USPACEDIR)/app/netecho/netecho \
+        $(USPACEDIR)/app/ping/ping \
+        $(USPACEDIR)/app/nettest1/nettest1 \
+        $(USPACEDIR)/app/nettest2/nettest2
 
 COMPONENTS = \
@@ -88 +98 @@
 endif
 
-CFG =
+NET_CFG = \
+        $(USPACEDIR)/srv/net/cfg/$(CONFIG_NETWORKING)/general \
+        $(USPACEDIR)/srv/net/cfg/$(CONFIG_NETWORKING)/lo \
+        $(USPACEDIR)/srv/net/cfg/$(CONFIG_NETWORKING)/ne2k
 
-NET_SRVS = \
-        $(USPACEDIR)/srv/net/net/net \
-        $(USPACEDIR)/srv/net/netif/lo/lo \
-        $(USPACEDIR)/srv/net/nil/eth/eth \
-        $(USPACEDIR)/srv/net/nil/nildummy/nildummy \
-        $(USPACEDIR)/srv/net/app/echo/echo
-
-NET_APPS = \
-        $(USPACEDIR)/srv/net/net/start/netstart \
-        $(USPACEDIR)/srv/net/app/ping/ping \
-        $(USPACEDIR)/srv/net/app/nettest1/nettest1 \
-        $(USPACEDIR)/srv/net/app/nettest2/nettest2
-
-ifneq ($(CONFIG_NETWORKING),none)
-        NET_CFG = \
-                $(USPACEDIR)/srv/net/cfg/$(CONFIG_NETWORKING)/general \
-                $(USPACEDIR)/srv/net/cfg/$(CONFIG_NETWORKING)/lo
-        
-        ifeq ($(CONFIG_NETIF_DP8390),y)
-                NET_SRVS += $(USPACEDIR)/srv/net/netif/dp8390/dp8390
-                NET_CFG += $(USPACEDIR)/srv/net/cfg/$(CONFIG_NETWORKING)/ne2k
-        endif
-        
-        ifeq ($(CONFIG_NETWORKING),module)
-                RD_APPS += $(NET_APPS)
-                RD_SRVS += $(NET_SRVS)
-                CFG += $(NET_CFG)
-        endif
-        
-        ifeq ($(CONFIG_NETWORKING),modular)
-                RD_APPS += $(NET_APPS)
-                RD_SRVS += $(NET_SRVS)
-                RD_SRVS += \
-                        $(USPACEDIR)/srv/net/il/ip/ip \
-                        $(USPACEDIR)/srv/net/il/arp/arp \
-                        $(USPACEDIR)/srv/net/tl/udp/udp \
-                        $(USPACEDIR)/srv/net/tl/tcp/tcp \
-                        $(USPACEDIR)/srv/net/tl/icmp/icmp
-                CFG += $(NET_CFG)
-        endif
+ifeq ($(CONFIG_NETWORKING),modular)
+        RD_SRVS += \
+                $(USPACEDIR)/srv/net/il/ip/ip \
+                $(USPACEDIR)/srv/net/il/arp/arp \
+                $(USPACEDIR)/srv/net/tl/udp/udp \
+                $(USPACEDIR)/srv/net/tl/tcp/tcp \
+                $(USPACEDIR)/srv/net/tl/icmp/icmp
 endif