Changeset 3aae4e8 in mainline for uspace/lib/socket/Makefile

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:

• uspace/lib/socket/Makefile (moved) (moved from uspace/srv/net/app/ping/Makefile ) (1 diff)

uspace/lib/socket/Makefile

@@ -28 +28 @@
 #
 
-NET_BASE = ../..
-USPACE_PREFIX = ../../../..
-LIBS = $(NET_BASE)/socket/libsocket.a
-BINARY = ping
+USPACE_PREFIX = ../..
+EXTRA_CFLAGS = -Iinclude
+LIBRARY = libsocket
 
 SOURCES = \
-        ping.c \
-        $(NET_BASE)/app/parse.c \
-        $(NET_BASE)/app/print_error.c \
-        $(NET_BASE)/inet.c \
-        $(NET_BASE)/modules.c \
-        $(NET_BASE)/tl/icmp/icmp_api.c \
-        $(NET_BASE)/tl/icmp/icmp_common.c
+        generic/socket_client.c \
+        generic/socket_core.c \
+        generic/inet.c \
+        generic/net_modules.c \
+        generic/icmp_common.c \
+        generic/icmp_api.c \
+        packet/packet.c \
+        packet/packet_client.c \
+        packet/packet_server.c \
+        adt/dynamic_fifo.c \
+        adt/measured_strings.c \
+        adt/char_map.c
 
 include $(USPACE_PREFIX)/Makefile.common