Changeset 8fb1bf82 in mainline for uspace/lib/net/Makefile

Timestamp:

2010-11-25T13:42:50Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

8df8415

Parents:

a93d79a (diff), eb667613 (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/lib/net/Makefile (modified) (2 diffs)

uspace/lib/net/Makefile

@@ -38 +38 @@
         generic/packet_client.c \
         generic/packet_remote.c \
-        generic/socket_core.c \
+        generic/protocol_map.c \
         adt/module_map.c \
         netif/netif_local.c \
         netif/netif_remote.c \
         nil/nil_remote.c \
+        il/il_interface.c \
         il/ip_remote.c \
         il/ip_client.c \
@@ -48 +49 @@
         tl/icmp_remote.c \
         tl/icmp_client.c \
+        tl/socket_core.c \
+        tl/tl_interface.c \
         tl/tl_common.c