Changeset 849ed54 in mainline for uspace/srv/hw/netif/dp8390/Makefile

Timestamp:

2010-03-30T18:39:04Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

7553689

Parents:

7d6fe4db

Message:

Networking work:
Split the networking stack into end-user library (libsocket) and two helper libraries (libnet and libnetif).
Don't use over-the-hand compiling and linking, but rather separation of conserns.
There might be still some issues and the non-modular networking architecture is currently broken, but this will be fixed soon.

File:

• uspace/srv/hw/netif/dp8390/Makefile (moved) (moved from uspace/srv/net/netif/dp8390/Makefile ) (1 diff)

uspace/srv/hw/netif/dp8390/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 = dp8390
-
 -include $(COMMON_MAKEFILE)
 -include $(CONFIG_MAKEFILE)
+
+ifeq ($(CONFIG_NETWORKING),modular)
+        BINARY = dp8390
+endif
+
+ifeq ($(CONFIG_NETWORKING),module)
+        LIBRARY = libdp8390
+endif
 
 SOURCES = \
         dp8390.c \
         dp8390_module.c \
-        ne2000.c \
-        $(NET_BASE)/module.c \
-        $(NET_BASE)/modules.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),module)
-        SOURCES += \
-                $(NET_BASE)/checksum.c \
-                $(NET_BASE)/nil/eth/eth.c \
-                $(NET_BASE)/net/net_remote.c \
-                $(NET_BASE)/netif/netif_nil_bundle.c
-endif
-
-ifeq ($(CONFIG_NETWORKING),modular)
-        SOURCES += \
-                $(NET_BASE)/nil/nil_remote.c \
-                $(NET_BASE)/netif/netif_standalone.c
-endif
+        ne2000.c
 
 include $(USPACE_PREFIX)/Makefile.common