WebSVN – HelenOS – Path Comparison – / – /branches/network/uspace/srv/net/ Rev 3989 and /branches/network/uspace/srv/net Rev 3914

Regard whitespace Rev 3989 → Rev 3914

/branches/network/uspace/srv/net/Makefile.module
File deleted

 /branches/network/uspace/srv/net/tl/tcp/Makefile
 ,5 → 1,5
 #
-# Copyright (c) 2009 Lukas Mejdrech
+# Copyright (c) 2005 Martin Decky
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 ,9 → 28,15
 NAME = tcp
-NET_BASE = ../../
-STRUCTURES = $(NET_BASE)structures/
+## Setup toolchain
+#
+LIBC_PREFIX = ../../../../lib/libc
+SOFTINT_PREFIX = ../../../../lib/softint
+include $(LIBC_PREFIX)/Makefile.toolchain
+LIBS = $(LIBC_PREFIX)/libc.a
 ## Sources
 #
 ,11 → 44,40
 SOURCES = \
     $(NAME)_module.c \
     $(NAME).c \
-    $(NET_BASE)module.c \
-    $(NET_BASE)modules.c \
-    $(STRUCTURES)packet/packet.c \
-    $(STRUCTURES)packet/packet_client.c
+    ../../module.c \
+    ../../modules.c \
+    ../../structures/packet/packet.c \
+    ../../structures/packet/packet_client.c
-NET_DEFS += -D TCP_BUNDLE=1
+DEFS += -D TCP_BUNDLE=1 -D $(NAME)_message=module_message -D $(NAME)_start_module=module_start -D $(NAME)_print_name=module_print_name
-include $(NET_BASE)Makefile.module
+OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
+.PHONY: all clean depend disasm
+all: $(OUTPUT) $(OUTPUT).disasm
+-include Makefile.depend
+clean:
+    -rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend
+depend:
+    $(CC) $(DEFS) $(CFLAGS) -M $(SOURCES) > Makefile.depend
+$(OUTPUT): $(OBJECTS) $(LIBS)
+    $(LD) -T $(LIBC_PREFIX)/arch/$(ARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
+disasm: $(OUTPUT).disasm
+$(OUTPUT).disasm: $(OUTPUT)
+    $(OBJDUMP) -d $< >$@
+%.o: %.S
+    $(CC) $(DEFS) $(AFLAGS) $(CFLAGS) -D__ASM__ -c $< -o $@
+%.o: %.s
+    $(AS) $(AFLAGS) $< -o $@
+%.o: %.c
+    $(CC) $(DEFS) $(CFLAGS) -c $< -o $@

 /branches/network/uspace/srv/net/networking/startup/Makefile
 ,5 → 1,5
 #
-# Copyright (c) 2009 Lukas Mejdrech
+# Copyright (c) 2005 Martin Decky
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 ,23 → 26,55
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-NAME = networking_startup
+## Setup toolchain
+#
-NET_BASE = ../../
-STRUCTURES = $(NET_BASE)structures/
+LIBC_PREFIX = ../../../../lib/libc
+SOFTINT_PREFIX = ../../../../lib/softint
+include $(LIBC_PREFIX)/Makefile.toolchain
 include ../../../../../Makefile.config
+LIBS = $(LIBC_PREFIX)/libc.a
 ## Sources
 #
-OUTPUT = $(NAME)
+OUTPUT = networking_startup
 SOURCES = \
-    $(NAME).c \
-    $(NET_BASE)modules.c \
-    $(NET_BASE)self_test.c \
-    $(STRUCTURES)measured_strings.c
+    networking_startup.c \
+    ../../modules.c \
+    ../../self_test.c \
+    ../../structures/measured_strings.c
-NET_DEFS += -D NETWORKING_$(NETWORKING)
+DEFS += -D NETWORKING_$(NETWORKING)
-include $(NET_BASE)Makefile.module
+OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
+.PHONY: all clean depend disasm
+all: $(OUTPUT) $(OUTPUT).disasm
+-include Makefile.depend
+clean:
+    -rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend
+depend:
+    $(CC) $(DEFS) $(CFLAGS) -M $(SOURCES) > Makefile.depend
+$(OUTPUT): $(OBJECTS) $(LIBS)
+    $(LD) -T $(LIBC_PREFIX)/arch/$(ARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
+disasm: $(OUTPUT).disasm
+$(OUTPUT).disasm: $(OUTPUT)
+    $(OBJDUMP) -d $< >$@
+%.o: %.S
+    $(CC) $(DEFS) $(AFLAGS) $(CFLAGS) -D__ASM__ -c $< -o $@
+%.o: %.s
+    $(AS) $(AFLAGS) $< -o $@
+%.o: %.c
+    $(CC) $(DEFS) $(CFLAGS) -c $< -o $@

 /branches/network/uspace/srv/net/networking/Makefile
 ,5 → 1,5
 #
-# Copyright (c) 2009 Lukas Mejdrech
+# Copyright (c) 2005 Martin Decky
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 ,11 → 28,16
 NAME = networking
-NET_BASE = ../
-STRUCTURES = $(NET_BASE)structures/
+## Setup toolchain
+#
+LIBC_PREFIX = ../../../lib/libc
+SOFTINT_PREFIX = ../../../lib/softint
+include $(LIBC_PREFIX)/Makefile.toolchain
 include ../../../../Makefile.config
+LIBS = $(LIBC_PREFIX)/libc.a
 ## Sources
 #
 ,24 → 44,54
 OUTPUT = $(NAME)
 SOURCES = \
     $(NAME).c \
-    $(NET_BASE)module.c \
-    $(NET_BASE)modules.c \
-    $(STRUCTURES)char_map.c \
-    $(STRUCTURES)measured_strings.c \
-    $(STRUCTURES)packet/packet.c \
-    $(STRUCTURES)packet/packet_server.c
-#   $(NET_BASE)self_test.c
+    ../module.c \
+    ../modules.c \
+    ../structures/char_map.c \
+    ../structures/measured_strings.c \
+    ../structures/packet/packet.c \
+    ../structures/packet/packet_server.c
+#   ../self_test.c
+DEFS += -D $(NAME)_message=module_message -D $(NAME)_start_module=module_start -D $(NAME)_print_name=module_print_name
+DEFS += -D NETWORKING_$(NETWORKING)
 ifeq ($(NETWORKING), module)
-    SOURCES +=  $(NET_BASE)il/arp/arp.c \
-                $(NET_BASE)il/ip/ip.c \
-                $(NET_BASE)tl/tcp/tcp.c
+    SOURCES +=  ../ip/ip.c \
+            ../tcp/tcp.c
-    NET_DEFS += -D ARP_BUNDLE=1 -D IP_BUNDLE=1 -D TCP_BUNDLE=1
+    DEFS += -D IP_BUNDLE=1 -D TCP_BUNDLE=1
 endif
-NET_DEFS += -D NETWORKING_$(NETWORKING)
+OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
-include $(NET_BASE)Makefile.module
+.PHONY: all clean depend disasm
+all: $(OUTPUT) $(OUTPUT).disasm
+-include Makefile.depend
+clean:
+    -rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend
+depend:
+    $(CC) $(DEFS) $(CFLAGS) -M $(SOURCES) > Makefile.depend
+$(OUTPUT): $(OBJECTS) $(LIBS)
+    $(LD) -T $(LIBC_PREFIX)/arch/$(ARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
+disasm: $(OUTPUT).disasm
+$(OUTPUT).disasm: $(OUTPUT)
+    $(OBJDUMP) -d $< >$@
+%.o: %.S
+    $(CC) $(DEFS) $(AFLAGS) $(CFLAGS) -D__ASM__ -c $< -o $@
+%.o: %.s
+    $(AS) $(AFLAGS) $< -o $@
+%.o: %.c
+    $(CC) $(DEFS) $(CFLAGS) -c $< -o $@

 /branches/network/uspace/srv/net/il/arp/Makefile
 ,5 → 1,5
 #
-# Copyright (c) 2009 Lukas Mejdrech
+# Copyright (c) 2005 Martin Decky
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 ,9 → 28,15
 NAME = arp
-NET_BASE = ../../
-STRUCTURES = $(NET_BASE)structures/
+## Setup toolchain
+#
+LIBC_PREFIX = ../../../../lib/libc
+SOFTINT_PREFIX = ../../../../lib/softint
+include $(LIBC_PREFIX)/Makefile.toolchain
+LIBS = $(LIBC_PREFIX)/libc.a
 ## Sources
 #
 ,13 → 44,42
 SOURCES = \
     $(NAME)_module.c \
     $(NAME).c \
-    $(NET_BASE)module.c \
-    $(NET_BASE)modules.c \
-    $(STRUCTURES)char_map.c \
-    $(STRUCTURES)measured_strings.c \
-    $(STRUCTURES)packet/packet.c \
-    $(STRUCTURES)packet/packet_client.c
+    ../../module.c \
+    ../../modules.c \
+    ../../structures/char_map.c \
+    ../../structures/measured_strings.c \
+    ../../structures/packet/packet.c \
+    ../../structures/packet/packet_client.c
-NET_DEFS += -D ARP_BUNDLE=1
+DEFS += -D ARP_BUNDLE=1 -D $(NAME)_message=module_message -D $(NAME)_start_module=module_start -D $(NAME)_print_name=module_print_name
-include $(NET_BASE)Makefile.module
+OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
+.PHONY: all clean depend disasm
+all: $(OUTPUT) $(OUTPUT).disasm
+-include Makefile.depend
+clean:
+    -rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend
+depend:
+    $(CC) $(DEFS) $(CFLAGS) -M $(SOURCES) > Makefile.depend
+$(OUTPUT): $(OBJECTS) $(LIBS)
+    $(LD) -T $(LIBC_PREFIX)/arch/$(ARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
+disasm: $(OUTPUT).disasm
+$(OUTPUT).disasm: $(OUTPUT)
+    $(OBJDUMP) -d $< >$@
+%.o: %.S
+    $(CC) $(DEFS) $(AFLAGS) $(CFLAGS) -D__ASM__ -c $< -o $@
+%.o: %.s
+    $(AS) $(AFLAGS) $< -o $@
+%.o: %.c
+    $(CC) $(DEFS) $(CFLAGS) -c $< -o $@

 /branches/network/uspace/srv/net/il/ip/Makefile
 ,5 → 1,5
 #
-# Copyright (c) 2009 Lukas Mejdrech
+# Copyright (c) 2005 Martin Decky
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 ,20 → 28,58
 NAME = ip
-NET_BASE = ../../
-STRUCTURES = $(NET_BASE)structures/
+## Setup toolchain
+#
+LIBC_PREFIX = ../../../../lib/libc
+SOFTINT_PREFIX = ../../../../lib/softint
+include $(LIBC_PREFIX)/Makefile.toolchain
+LIBS = $(LIBC_PREFIX)/libc.a
+## Sources
+#
 OUTPUT = $(NAME)
 SOURCES = \
     $(NAME)_module.c \
     $(NAME).c \
-    $(NET_BASE)module.c \
-    $(NET_BASE)modules.c \
-    $(STRUCTURES)measured_strings.c \
-    $(STRUCTURES)packet/packet.c \
-    $(STRUCTURES)packet/packet_client.c \
-    $(NET_BASE)sockaddr.c
+    ../../module.c \
+    ../../modules.c \
+    ../../structures/measured_strings.c \
+    ../../structures/packet/packet.c \
+    ../../structures/packet/packet_client.c \
+    ../../sockaddr.c
-NET_DEFS += -D IP_BUNDLE=1
+DEFS += -D IP_BUNDLE=1 -D $(NAME)_message=module_message -D $(NAME)_start_module=module_start -D $(NAME)_print_name=module_print_name
-include $(NET_BASE)Makefile.module
+OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
+.PHONY: all clean depend disasm
+all: $(OUTPUT) $(OUTPUT).disasm
+-include Makefile.depend
+clean:
+    -rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend
+depend:
+    $(CC) $(DEFS) $(CFLAGS) -M $(SOURCES) > Makefile.depend
+$(OUTPUT): $(OBJECTS) $(LIBS)
+    $(LD) -T $(LIBC_PREFIX)/arch/$(ARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
+disasm: $(OUTPUT).disasm
+$(OUTPUT).disasm: $(OUTPUT)
+    $(OBJDUMP) -d $< >$@
+%.o: %.S
+    $(CC) $(DEFS) $(AFLAGS) $(CFLAGS) -D__ASM__ -c $< -o $@
+%.o: %.s
+    $(AS) $(AFLAGS) $< -o $@
+%.o: %.c
+    $(CC) $(DEFS) $(CFLAGS) -c $< -o $@

 /branches/network/uspace/srv/net/netif/lo/Makefile
 ,5 → 1,5
 #
-# Copyright (c) 2009 Lukas Mejdrech
+# Copyright (c) 2005 Martin Decky
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 ,22 → 26,60
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-NAME = netif
+NETIF = netif
-NET_BASE = ../../
-STRUCTURES = $(NET_BASE)structures/
+## Setup toolchain
+#
+LIBC_PREFIX = ../../../../lib/libc
+SOFTINT_PREFIX = ../../../../lib/softint
+include $(LIBC_PREFIX)/Makefile.toolchain
+LIBS = $(LIBC_PREFIX)/libc.a
 ## Sources
 #
 OUTPUT = lo
 SOURCES = \
-    $(OUTPUT).c \
-    ../$(NAME).c \
-    $(NET_BASE)module.c \
-    $(NET_BASE)modules.c \
-    $(STRUCTURES)measured_strings.h \
-    $(STRUCTURES)packet/packet_client.c \
-    $(STRUCTURES)packet/packet.c
+    ../$(NETIF).c \
+    ../../module.c \
+    ../../modules.c \
+    ../../structures/measured_strings.h \
+    ../../structures/packet/packet_client.c \
+    ../../structures/packet/packet.c
-include $(NET_BASE)Makefile.module
+DEFS += -D $(NETIF)_message=module_message -D $(NETIF)_start_module=module_start -D $(NETIF)_print_name=module_print_name
+OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
+OBJECTS += $(addsuffix .o,$(basename $(OUTPUT)))
+DISASMS := $(addsuffix .disasm,$(basename $(OUTPUT)))
+.PHONY: all clean depend disasm
+all: $(OUTPUT) $(DISAMS)
+-include Makefile.depend
+clean:
+    -rm -f $(OUTPUT) $(addsuffix .map,$(basename $(SOURCES))) $(DISASMS) Makefile.depend
+depend:
+    $(CC) $(DEFS) $(CFLAGS) -M $(addsuffix .c,$(basename $(OUTPUT))) $(SOURCES) > Makefile.depend
+$(OUTPUT): $(OBJECTS) $(LIBS)
+    $(LD) -T $(LIBC_PREFIX)/arch/$(ARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $@.map
+disasm: $(DISASMS)
+%.disasm: $@
+    $(OBJDUMP) -d $< >$@
+%.o: %.S
+    $(CC) $(DEFS) $(AFLAGS) $(CFLAGS) -D__ASM__ -c $< -o $@
+%.o: %.s
+    $(AS) $(AFLAGS) $< -o $@
+%.o: %.c
+    $(CC) $(DEFS) $(CFLAGS) -c $< -o $@

Subversion Repositories HelenOS

Compare Revisions

Regard whitespace Rev 3989 → Rev 3914