Changeset 21580dd in mainline for boot/Makefile.common

Timestamp:

2010-01-02T22:59:44Z (15 years ago)

Author:

Lukas Mejdrech <lukas@…>

Branches:

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

Children:

7586c85

Parents:

a7a0417

Message:

Merged with network branch ​svn://svn.helenos.org/HelenOS/branches/network revision 4759; ipc_share_* and ipc_data_* changed to async_*; client connection in module.c returns on IPC_M_PHONE_HUNGUP; * Qemu scripts renamed to net-qe.*; (the dp8390 does not respond)

File:

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

boot/Makefile.common

@@ -45 +45 @@
 
 RD_SRVS = \
+        $(USPACEDIR)/srv/net/net/net \
+        $(USPACEDIR)/srv/net/netif/lo/lo \
+        $(USPACEDIR)/srv/net/netif/dp8390/dp8390 \
+        $(USPACEDIR)/srv/net/nil/eth/eth \
+        $(USPACEDIR)/srv/net/nil/nildummy/nildummy \
+        $(USPACEDIR)/srv/net/app/echo/echo \
         $(USPACEDIR)/srv/fb/fb \
         $(USPACEDIR)/srv/kbd/kbd \
@@ -56 +62 @@
 
 RD_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 \
         $(USPACEDIR)/app/edit/edit \
         $(USPACEDIR)/app/getterm/getterm \
@@ -79 +89 @@
         COMPONENTS += $(USPACEDIR)/srv/fs/fat/fat
 endif
+
+ifeq ($(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
+