Changeset 3aae4e8 in mainline for uspace/srv/net/netif/lo/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/srv/net/netif/lo/Makefile (modified) (1 diff)

uspace/srv/net/netif/lo/Makefile

@@ -28 +28 @@
 #
 
-NET_BASE = ../..
 USPACE_PREFIX = ../../../..
 ROOT_PATH = $(USPACE_PREFIX)/..
+LIBS = $(LIBNET_PREFIX)/libnet.a $(LIBSOCKET_PREFIX)/libsocket.a
+EXTRA_CFLAGS = -I$(LIBNET_PREFIX)/include -I$(LIBSOCKET_PREFIX)/include
 
 COMMON_MAKEFILE = $(ROOT_PATH)/Makefile.common
 CONFIG_MAKEFILE = $(ROOT_PATH)/Makefile.config
 
-BINARY = lo
-
 -include $(COMMON_MAKEFILE)
 -include $(CONFIG_MAKEFILE)
 
-SOURCES = \
-        lo.c \
-        $(NET_BASE)/module.c \
-        $(NET_BASE)/modules.c \
-        $(NET_BASE)/net/net_remote.c \
-        $(NET_BASE)/netif/netif.c \
-        $(NET_BASE)/structures/measured_strings.c \
-        $(NET_BASE)/structures/packet/packet.c \
-        $(NET_BASE)/structures/packet/packet_client.c \
-        $(NET_BASE)/structures/packet/packet_remote.c
+ifeq ($(CONFIG_NETWORKING),modular)
+        BINARY = lo
+endif
 
 ifeq ($(CONFIG_NETWORKING),module)
-        SOURCES += \
-                $(NET_BASE)/nil/nildummy/nildummy.c \
-                $(NET_BASE)/netif/netif_nil_bundle.c
+        LIBRARY = liblo
 endif
 
-ifeq ($(CONFIG_NETWORKING),modular)
-        SOURCES += \
-                $(NET_BASE)/nil/nil_remote.c \
-                $(NET_BASE)/netif/netif_standalone.c
-endif
+SOURCES = \
+        lo.c
 
 include $(USPACE_PREFIX)/Makefile.common