Changeset a7a7f8c in mainline for uspace/srv/net/inet/Makefile

Timestamp:

2012-04-20T07:32:57Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

097f421

Parents:

90f067d9 (diff), 606c369 (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/srv/net/inet/Makefile (moved) (moved from uspace/srv/net/tl/icmp/Makefile ) (2 diffs)

uspace/srv/net/inet/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 = ../../../..
-LIBS = $(LIBNET_PREFIX)/libnet.a
-EXTRA_CFLAGS = -I$(LIBNET_PREFIX)/include
-BINARY = icmp
-STATIC_ONLY = y
+USPACE_PREFIX = ../../..
+BINARY = inet
 
 SOURCES = \
-        icmp.c
+        addrobj.c \
+        icmp.c \
+        inet.c \
+        inet_link.c \
+        inet_util.c \
+        inetcfg.c \
+        inetping.c \
+        pdu.c \
+        reass.c \
+        sroute.c
 
 include $(USPACE_PREFIX)/Makefile.common