Changeset 12d7710 in mainline for uspace/srv/net/netif/dp8390/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/netif/dp8390/Makefile (modified) (2 diffs)

uspace/srv/net/netif/dp8390/Makefile

@@ -1 +1 @@
 #
-# Copyright (c) 2009 Lukas Mejdrech
+# Copyright (c) 2005 Martin Decky
+# Copyright (c) 2007 Jakub Jermar
 # All rights reserved.
 #
@@ -27 +28 @@
 #
 
-NAME = dp8390
+NET_BASE = ../..
+USPACE_PREFIX = ../../../..
+ROOT_PATH = $(USPACE_PREFIX)/..
 
-NET_BASE = ../../
-STRUCTURES = $(NET_BASE)structures/
+COMMON_MAKEFILE = $(ROOT_PATH)/Makefile.common
+CONFIG_MAKEFILE = $(ROOT_PATH)/Makefile.config
 
-include $(NET_BASE)../../../Makefile.common
-include $(NET_BASE)../../../Makefile.config
+BINARY = dp8390
 
-## Sources
-#
+-include $(COMMON_MAKEFILE)
+-include $(CONFIG_MAKEFILE)
 
-OUTPUT = $(NAME)
 SOURCES = \
-        $(NAME).c \
-        $(NAME)_module.c \
+        dp8390.c \
+        dp8390_module.c \
         ne2000.c \
-        $(NET_BASE)module.c \
-        $(NET_BASE)modules.c \
-        $(NET_BASE)netif/netif.c \
-        $(STRUCTURES)measured_strings.c \
-        $(STRUCTURES)packet/packet.c \
-        $(STRUCTURES)packet/packet_client.c \
-        $(STRUCTURES)packet/packet_remote.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 ($(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
-
-else
-
-        SOURCES +=      $(NET_BASE)nil/nil_remote.c \
-                                $(NET_BASE)netif/netif_standalone.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
 
-include $(NET_BASE)Makefile.module
+ifeq ($(CONFIG_NETWORKING),modular)
+        SOURCES += \
+                $(NET_BASE)/nil/nil_remote.c \
+                $(NET_BASE)/netif/netif_standalone.c
+endif
+
+include $(USPACE_PREFIX)/Makefile.common