Changeset 371bd7d in mainline for uspace/srv/net/il

Timestamp:

2010-03-27T09:22:17Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

36a75a2

Parents:

cd82bb1 (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.

Location:

uspace/srv/net/il

Files:

• arp/Makefile (moved) (moved from uspace/srv/cir/fhc/Makefile ) (1 diff)
• arp/arp.c (added)
• arp/arp.h (added)
• arp/arp_header.h (added)
• arp/arp_messages.h (added)
• arp/arp_module.c (added)
• arp/arp_module.h (added)
• arp/arp_oc.h (added)
• arp/arp_remote.c (added)
• il_messages.h (added)
• ip/Makefile (moved) (moved from uspace/app/edit/Makefile.build ) (1 diff)
• ip/ip.c (added)
• ip/ip.h (added)
• ip/ip_client.c (added)
• ip/ip_header.h (added)
• ip/ip_messages.h (added)
• ip/ip_module.c (added)
• ip/ip_module.h (added)
• ip/ip_remote.c (added)

uspace/srv/net/il/arp/Makefile

@@ -28 +28 @@
 #
 
-include Makefile.common
+NET_BASE = ../..
+USPACE_PREFIX = ../../../..
+BINARY = arp
 
-.PHONY: all clean
+SOURCES = \
+        arp.c \
+        arp_module.c \
+        $(NET_BASE)/module.c \
+        $(NET_BASE)/modules.c \
+        $(NET_BASE)/net/net_remote.c \
+        $(NET_BASE)/nil/nil_remote.c \
+        $(NET_BASE)/structures/char_map.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
 
-all: $(LIBC_PREFIX)/../../../Makefile.config $(LIBC_PREFIX)/../../../config.h $(LIBC_PREFIX)/../../../config.defs $(LIBS)
-        -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV)
-        $(MAKE) -f Makefile.build
-
-clean:
-        rm -f $(DEPEND) $(DEPEND_PREV) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm
-        find . -name '*.o' -follow -exec rm \{\} \;
+include $(USPACE_PREFIX)/Makefile.common

uspace/srv/net/il/ip/Makefile

@@ -28 +28 @@
 #
 
-## Setup toolchain
-#
-
-include Makefile.common
-include $(LIBC_PREFIX)/Makefile.toolchain
-
-## Sources
-#
+NET_BASE = ../..
+USPACE_PREFIX = ../../../..
+BINARY = ip
 
 SOURCES = \
-        edit.c \
-        sheet.c
+        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
 
-OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
-
-.PHONY: all
-
-all: $(OUTPUT) $(OUTPUT).disasm
-
--include $(DEPEND)
-
-$(OUTPUT).disasm: $(OUTPUT)
-        $(OBJDUMP) -d $< > $@
-
-$(OUTPUT): $(OBJECTS) $(LIBS)
-        $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
-
-%.o: %.c $(DEPEND)
-        $(CC) $(DEFS) $(CFLAGS) -c $< -o $@
-
-$(DEPEND):
-        makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(SOURCES) > $@ 2> /dev/null
-        -[ -f $(DEPEND_PREV) ] && diff -q $(DEPEND_PREV) $@ && mv -f $(DEPEND_PREV) $@
+include $(USPACE_PREFIX)/Makefile.common