Changeset 97c7682 in mainline for uspace/srv/net/udp/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/srv/net/udp/Makefile (moved) (moved from uspace/srv/net/tl/udp/Makefile ) (3 diffs)

uspace/srv/net/udp/Makefile

@@ -1 +1 @@
 #
-# Copyright (c) 2005 Martin Decky
-# Copyright (c) 2007 Jakub Jermar
+# Copyright (c) 2012 Jiri Svoboda
 # All rights reserved.
 #
@@ -28 +27 @@
 #
 
-USPACE_PREFIX = ../../../..
+USPACE_PREFIX = ../../..
 LIBS = $(LIBNET_PREFIX)/libnet.a
 EXTRA_CFLAGS = -I$(LIBNET_PREFIX)/include
@@ -34 +33 @@
 
 SOURCES = \
-        udp.c
+        assoc.c \
+        msg.c \
+        sock.c \
+        pdu.c \
+        ucall.c \
+        udp.c \
+        udp_inet.c
 
 include $(USPACE_PREFIX)/Makefile.common