Changeset 59ecd4a in mainline for uspace/srv/net/net/Makefile

Timestamp:

2010-04-04T21:41:47Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

5db9084

Parents:

36a75a2 (diff), ee7e82a9 (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/net/Makefile (modified) (1 diff)

uspace/srv/net/net/Makefile

@@ -28 +28 @@
 #
 
-NET_BASE = ..
 USPACE_PREFIX = ../../..
 ROOT_PATH = $(USPACE_PREFIX)/..
+LIBS = $(LIBNETIF_PREFIX)/libnetif.a $(LIBNET_PREFIX)/libnet.a $(LIBSOCKET_PREFIX)/libsocket.a
+EXTRA_CFLAGS = -I$(LIBNETIF_PREFIX)/include -I$(LIBNET_PREFIX)/include -I$(LIBSOCKET_PREFIX)/include
 
 COMMON_MAKEFILE = $(ROOT_PATH)/Makefile.common
 CONFIG_MAKEFILE = $(ROOT_PATH)/Makefile.config
 
-BINARY = net
-
 -include $(COMMON_MAKEFILE)
 -include $(CONFIG_MAKEFILE)
 
+BINARY = net
+
 SOURCES = \
         net.c \
-        $(NET_BASE)/module.c \
-        $(NET_BASE)/modules.c \
-        $(NET_BASE)/netif/netif_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_server.c
-
-ifeq ($(CONFIG_NETWORKING),module)
-        SOURCES += \
-                net_bundle.c \
-                $(NET_BASE)/checksum.c \
-                $(NET_BASE)/inet.c \
-                $(NET_BASE)/il/arp/arp.c \
-                $(NET_BASE)/il/ip/ip.c \
-                $(NET_BASE)/il/ip/ip_client.c \
-                $(NET_BASE)/socket/socket_core.c \
-                $(NET_BASE)/tl/icmp/icmp.c \
-                $(NET_BASE)/tl/icmp/icmp_client.c \
-                $(NET_BASE)/tl/tcp/tcp.c \
-                $(NET_BASE)/tl/tl_common.c \
-                $(NET_BASE)/tl/udp/udp.c \
-                $(NET_BASE)/structures/dynamic_fifo.c
-endif
-
-ifeq ($(CONFIG_NETWORKING),modular)
-        SOURCES += \
-                net_standalone.c \
-                $(NET_BASE)/il/ip/ip_remote.c
-endif
+        net_standalone.c
 
 include $(USPACE_PREFIX)/Makefile.common