Changeset 12d7710 in mainline for uspace/srv/net/il/ip/Makefile

Timestamp:

2010-03-26T22:01:28Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

1faa995

Parents:

4204ad9 (diff), eaf22d4 (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/il/ip/Makefile (modified) (2 diffs)

uspace/srv/net/il/ip/Makefile

@@ -1 +1 @@
 #
-# Copyright (c) 2009 Lukas Mejdrech
+# Copyright (c) 2005 Martin Decky
+# Copyright (c) 2007 Jakub Jermar
 # All rights reserved.
 #
@@ -27 +28 @@
 #
 
-NAME = ip
+NET_BASE = ../..
+USPACE_PREFIX = ../../../..
+BINARY = ip
 
-NET_BASE = ../../
-STRUCTURES = $(NET_BASE)structures/
+SOURCES = \
+        ip.c \
+        ip_client.c \
+        ip_module.c \
+        $(NET_BASE)/checksum.c \
+        $(NET_BASE)/inet.c \
+        $(NET_BASE)/module.c \
+        $(NET_BASE)/modules.c \
+        $(NET_BASE)/il/arp/arp_remote.c \
+        $(NET_BASE)/nil/nil_remote.c \
+        $(NET_BASE)/net/net_remote.c \
+        $(NET_BASE)/tl/icmp/icmp_client.c \
+        $(NET_BASE)/tl/icmp/icmp_common.c \
+        $(NET_BASE)/tl/icmp/icmp_remote.c \
+        $(NET_BASE)/structures/char_map.c \
+        $(NET_BASE)/structures/measured_strings.c \
+        $(NET_BASE)/structures/module_map.c \
+        $(NET_BASE)/structures/packet/packet.c \
+        $(NET_BASE)/structures/packet/packet_client.c \
+        $(NET_BASE)/structures/packet/packet_remote.c
 
-## Sources
-#
-
-OUTPUT = $(NAME)
-SOURCES = \
-        $(NAME).c \
-        $(NAME)_client.c \
-        $(NAME)_module.c \
-        $(NET_BASE)checksum.c \
-        $(NET_BASE)inet.c \
-        $(NET_BASE)module.c \
-        $(NET_BASE)modules.c \
-        $(NET_BASE)il/arp/arp_remote.c \
-        $(NET_BASE)nil/nil_remote.c \
-        $(NET_BASE)net/net_remote.c \
-        $(NET_BASE)tl/icmp/icmp_client.c \
-        $(NET_BASE)tl/icmp/icmp_common.c \
-        $(NET_BASE)tl/icmp/icmp_remote.c \
-        $(STRUCTURES)char_map.c \
-        $(STRUCTURES)measured_strings.c \
-        $(STRUCTURES)module_map.c \
-        $(STRUCTURES)packet/packet.c \
-        $(STRUCTURES)packet/packet_client.c \
-        $(STRUCTURES)packet/packet_remote.c
-
-include $(NET_BASE)Makefile.module
+include $(USPACE_PREFIX)/Makefile.common