Changeset 97c7682 in mainline for uspace/lib/net/Makefile

Timestamp:

2012-07-14T11:18:40Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

804d9b6

Parents:

0747468 (diff), f0348c8 (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.

Text conflict in boot/arch/arm32/Makefile.inc:

Trivial conflict around ifeq condition.

Text conflict in kernel/arch/arm32/include/mm/page.h:

Added defines and set_pt_levelx_present function.
COnflict looked horrible because of the armv4/v7 split.

File:

• uspace/lib/net/Makefile (modified) (1 diff)

uspace/lib/net/Makefile

@@ -33 +33 @@
 
 SOURCES = \
-        generic/generic.c \
-        generic/net_remote.c \
-        generic/net_checksum.c \
-        generic/packet_client.c \
-        generic/packet_remote.c \
-        generic/protocol_map.c \
-        adt/module_map.c \
-        nil/nil_remote.c \
-        nil/nil_skel.c \
-        il/il_remote.c \
-        il/il_skel.c \
-        il/ip_remote.c \
-        il/ip_client.c \
-        il/arp_remote.c \
-        tl/icmp_remote.c \
-        tl/icmp_client.c \
-        tl/socket_core.c \
-        tl/tl_common.c \
-        tl/tl_remote.c \
-        tl/tl_skel.c
+        tl/socket_core.c
 
 include $(USPACE_PREFIX)/Makefile.common