Changeset 1b1164e8 in mainline


Ignore:
Timestamp:
2010-03-23T14:44:00Z (15 years ago)
Author:
Martin Decky <martin@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
63f8966
Parents:
d99c1d2
Message:

unify and simplify user space makefiles
rename NETWORKING configuration option to CONFIG_NETWORKING

Files:
6 added
8 deleted
96 edited
4 moved

Legend:

Unmodified
Added
Removed

  • HelenOS.config

    rd99c1d2 r1b1164e8  
    526526@ "modular" Modular
    527527@ "module" One module
    528 ! NETWORKING (choice)
     528! CONFIG_NETWORKING (choice)
    529529
    530530% DP8390 (NE2k) network interface
    531 ! [NETWORKING=modular|NETWORKING=module] CONFIG_NETIF_DP8390 (y/n)
    532 
     531! [CONFIG_NETWORKING=modular|CONFIG_NETWORKING=module] CONFIG_NETIF_DP8390 (y/n)
     532

  • boot/Makefile.common

    rd99c1d2 r1b1164e8  
    102102        $(USPACEDIR)/srv/net/app/nettest2/nettest2
    103103
    104 ifneq ($(NETWORKING), none)
    105 NET_CFG = \
    106         $(USPACEDIR)/srv/net/cfg/$(NETWORKING)/general \
    107         $(USPACEDIR)/srv/net/cfg/$(NETWORKING)/lo
    108 
    109 ifeq ($(CONFIG_NETIF_DP8390),y)
    110         NET_SRVS        +=      $(USPACEDIR)/srv/net/netif/dp8390/dp8390
    111 
    112         NET_CFG +=      $(USPACEDIR)/srv/net/cfg/$(NETWORKING)/ne2k
    113 endif
    114 
    115 ifeq ($(NETWORKING), module)
    116         RD_APPS +=      $(NET_APPS)
    117 
    118         RD_SRVS +=      $(NET_SRVS)
    119 
    120         CFG             +=      $(NET_CFG)
    121 else
    122 ifeq ($(NETWORKING), modular)
    123         RD_APPS +=      $(NET_APPS)
    124 
    125         RD_SRVS +=      $(NET_SRVS)
    126 
    127         RD_SRVS +=      $(USPACEDIR)/srv/net/il/ip/ip \
     104ifneq ($(CONFIG_NETWORKING),none)
     105        NET_CFG = \
     106                $(USPACEDIR)/srv/net/cfg/$(CONFIG_NETWORKING)/general \
     107                $(USPACEDIR)/srv/net/cfg/$(CONFIG_NETWORKING)/lo
     108       
     109        ifeq ($(CONFIG_NETIF_DP8390),y)
     110                NET_SRVS += $(USPACEDIR)/srv/net/netif/dp8390/dp8390
     111                NET_CFG += $(USPACEDIR)/srv/net/cfg/$(CONFIG_NETWORKING)/ne2k
     112        endif
     113       
     114        ifeq ($(CONFIG_NETWORKING),module)
     115                RD_APPS += $(NET_APPS)
     116                RD_SRVS += $(NET_SRVS)
     117                CFG += $(NET_CFG)
     118        endif
     119       
     120        ifeq ($(CONFIG_NETWORKING),modular)
     121                RD_APPS += $(NET_APPS)
     122                RD_SRVS += $(NET_SRVS)
     123                RD_SRVS += \
     124                        $(USPACEDIR)/srv/net/il/ip/ip \
    128125                        $(USPACEDIR)/srv/net/il/arp/arp \
    129126                        $(USPACEDIR)/srv/net/tl/udp/udp \
    130127                        $(USPACEDIR)/srv/net/tl/tcp/tcp \
    131128                        $(USPACEDIR)/srv/net/tl/icmp/icmp
    132 
    133         CFG             +=      $(NET_CFG)
     129                CFG += $(NET_CFG)
     130        endif
    134131endif
    135 endif
    136 endif

  • defaults/amd64/Makefile.config

    rd99c1d2 r1b1164e8  
    6363
    6464# Default networking architecture
    65 NETWORKING = modular
     65CONFIG_NETWORKING = modular

  • defaults/arm32/Makefile.config

    rd99c1d2 r1b1164e8  
    3939
    4040# Default networking architecture
    41 NETWORKING = none
     41CONFIG_NETWORKING = none

  • defaults/ia32/Makefile.config

    rd99c1d2 r1b1164e8  
    6969
    7070# Default networking architecture
    71 NETWORKING = modular
     71CONFIG_NETWORKING = modular

  • defaults/ia64/Makefile.config

    rd99c1d2 r1b1164e8  
    5151
    5252# Default networking architecture
    53 NETWORKING = modular
     53CONFIG_NETWORKING = modular

  • defaults/mips32/Makefile.config

    rd99c1d2 r1b1164e8  
    4545
    4646# Default networking architecture
    47 NETWORKING = none
     47CONFIG_NETWORKING = none

  • defaults/ppc32/Makefile.config

    rd99c1d2 r1b1164e8  
    4545
    4646# Default networking architecture
    47 NETWORKING = none
     47CONFIG_NETWORKING = none

  • defaults/sparc64/Makefile.config

    rd99c1d2 r1b1164e8  
    6363
    6464# Default networking architecture
    65 NETWORKING = modular
     65CONFIG_NETWORKING = modular

  • defaults/sparc64/sun4v/Makefile.config

    rd99c1d2 r1b1164e8  
    1313CONFIG_FB = n
    1414
    15 NETWORKING = none
    16 
     15CONFIG_NETWORKING = none

  • defaults/special/abs32le/Makefile.config

    rd99c1d2 r1b1164e8  
    66
    77# Networking architecture
    8 NETWORKING = none
     8CONFIG_NETWORKING = none

  • uspace/Makefile

    rd99c1d2 r1b1164e8  
    2727#
    2828
    29 ## Include configuration
    30 #
    31 
    3229-include ../Makefile.common
    3330-include ../Makefile.config
     31
     32## Common binaries
     33#
    3434
    3535DIRS = \
    … …  
    6464        srv/hid/fb \
    6565        srv/hid/kbd \
    66         srv/hw/char/i8042 \
    67         srv/net
     66        srv/hw/char/i8042
     67
     68## Platform-specific hardware support
     69#
    6870
    6971ifneq ($(UARCH),abs32le)
    … …  
    8991endif
    9092
     93## Networking
     94#
     95
     96ifeq ($(CONFIG_NETIF_DP8390),y)
     97        DIRS += srv/net/netif/dp8390
     98endif
     99
     100NETWORKING_COMMON += \
     101        srv/net/netif/lo \
     102        srv/net/nil/eth \
     103        srv/net/nil/nildummy \
     104        srv/net/net \
     105        srv/net/net/start \
     106        srv/net/socket \
     107        srv/net/app/echo \
     108        srv/net/app/ping \
     109        srv/net/app/nettest1 \
     110        srv/net/app/nettest2
     111
     112NETWORKING_MODULAR = \
     113        srv/net/il/arp \
     114        srv/net/il/ip \
     115        srv/net/tl/icmp \
     116        srv/net/tl/udp \
     117        srv/net/tl/tcp
     118
     119## System libraries
     120#
     121
    91122LIBC = lib/libc
    92123LIBS = \
    … …  
    108139LIBS_BUILD = $(addsuffix .build,$(LIBS))
    109140
    110 BUILDS := $(addsuffix .build,$(DIRS))
    111 CLEANS := $(addsuffix .clean,$(DIRS)) $(addsuffix .clean,$(LIBS)) $(addsuffix .clean,$(LIBC))
     141ifeq ($(CONFIG_NETWORKING),modular)
     142        BUILDS := $(addsuffix .build,$(DIRS)) $(addsuffix .build,$(NETWORKING_COMMON)) $(addsuffix .build,$(NETWORKING_MODULAR))
     143endif
     144
     145ifeq ($(CONFIG_NETWORKING),module)
     146        BUILDS := $(addsuffix .build,$(DIRS)) $(addsuffix .build,$(NETWORKING_COMMON))
     147endif
     148
     149ifeq ($(CONFIG_NETWORKING),none)
     150        BUILDS := $(addsuffix .build,$(DIRS))
     151endif
     152
     153CLEANS := $(addsuffix .clean,$(DIRS)) $(addsuffix .clean,$(NETWORKING_COMMON)) $(addsuffix .clean,$(NETWORKING_MODULAR)) $(addsuffix .clean,$(LIBS)) $(addsuffix .clean,$(LIBC))
    112154
    113155.PHONY: all $(LIBC_BUILD) $(LIBS_BUILD) $(BUILDS) $(CLEANS) clean

  • uspace/app/bdsh/Makefile

    rd99c1d2 r1b1164e8  
    2929
    3030USPACE_PREFIX = ../..
    31 LIBS = $(LIBBLOCK_PREFIX)/libblock.a $(LIBC_PREFIX)/libc.a
     31LIBS = $(LIBBLOCK_PREFIX)/libblock.a
    3232EXTRA_CFLAGS = -I$(LIBBLOCK_PREFIX) -I. -Icmds/ -Icmds/builtins -Icmds/modules
    33 
    34 OUTPUT = bdsh
     33BINARY = bdsh
    3534
    3635SOURCES = \
    … …  
    6059        scli.c
    6160
    62 include ../Makefile.common
     61include $(USPACE_PREFIX)/Makefile.common

  • uspace/app/edit/Makefile

    rd99c1d2 r1b1164e8  
    2929
    3030USPACE_PREFIX = ../..
    31 LIBS = $(LIBC_PREFIX)/libc.a
    32 
    33 OUTPUT = edit
     31BINARY = edit
    3432
    3533SOURCES = \
    … …  
    3735        sheet.c
    3836
    39 include ../Makefile.common
     37include $(USPACE_PREFIX)/Makefile.common

  • uspace/app/getterm/Makefile

    rd99c1d2 r1b1164e8  
    2828#
    2929
    30 include ../../../version
    31 DEFS += -DRELEASE=$(RELEASE) "-DNAME=$(NAME)"
    32 
    3330USPACE_PREFIX = ../..
    34 LIBS = $(LIBC_PREFIX)/libc.a
    35 
    36 OUTPUT = getterm
     31DEFS = -DRELEASE=$(RELEASE) "-DNAME=$(NAME)"
     32BINARY = getterm
    3733
    3834SOURCES = \
    … …  
    4036        version.c
    4137
    42 include ../Makefile.common
     38include $(USPACE_PREFIX)/Makefile.common

  • uspace/app/init/Makefile

    rd99c1d2 r1b1164e8  
    2929
    3030USPACE_PREFIX = ../..
    31 LIBS = $(LIBC_PREFIX)/libc.a
    32 
    33 OUTPUT = init
     31BINARY = init
    3432
    3533SOURCES = \
    3634        init.c
    3735
    38 include ../Makefile.common
     36include $(USPACE_PREFIX)/Makefile.common

  • uspace/app/klog/Makefile

    rd99c1d2 r1b1164e8  
    2929
    3030USPACE_PREFIX = ../..
    31 LIBS = $(LIBC_PREFIX)/libc.a
    32 
    33 OUTPUT = klog
     31BINARY = klog
    3432
    3533SOURCES = \
    3634        klog.c
    3735
    38 include ../Makefile.common
     36include $(USPACE_PREFIX)/Makefile.common

  • uspace/app/mkfat/Makefile

    rd99c1d2 r1b1164e8  
    2929
    3030USPACE_PREFIX = ../..
    31 LIBS = $(LIBBLOCK_PREFIX)/libblock.a $(LIBC_PREFIX)/libc.a
     31LIBS = $(LIBBLOCK_PREFIX)/libblock.a
    3232EXTRA_CFLAGS = -I$(LIBBLOCK_PREFIX)
    33 
    34 OUTPUT = mkfat
     33BINARY = mkfat
    3534
    3635SOURCES = \
    3736        mkfat.c
    3837
    39 include ../Makefile.common
     38include $(USPACE_PREFIX)/Makefile.common

  • uspace/app/redir/Makefile

    rd99c1d2 r1b1164e8  
    2929
    3030USPACE_PREFIX = ../..
    31 LIBS = $(LIBC_PREFIX)/libc.a
    32 
    33 OUTPUT = redir
     31BINARY = redir
    3432
    3533SOURCES = \
    3634        redir.c
    3735
    38 include ../Makefile.common
     36include $(USPACE_PREFIX)/Makefile.common

  • uspace/app/taskdump/Makefile

    rd99c1d2 r1b1164e8  
    2828
    2929USPACE_PREFIX = ../..
    30 LIBS = $(LIBC_PREFIX)/libc.a
    3130EXTRA_CFLAGS = -Iinclude
    32 
    33 OUTPUT = taskdump
     31BINARY = taskdump
    3432
    3533SOURCES = \
    … …  
    3836        symtab.c
    3937
    40 include ../Makefile.common
     38include $(USPACE_PREFIX)/Makefile.common

  • uspace/app/tester/Makefile

    rd99c1d2 r1b1164e8  
    2929
    3030USPACE_PREFIX = ../..
    31 LIBS = $(LIBC_PREFIX)/libc.a
    32 
    33 OUTPUT = tester
     31BINARY = tester
    3432
    3533SOURCES = \
    … …  
    5351        mm/malloc1.c
    5452
    55 include ../Makefile.common
     53include $(USPACE_PREFIX)/Makefile.common

  • uspace/app/tetris/Makefile

    rd99c1d2 r1b1164e8  
    2929
    3030USPACE_PREFIX = ../..
    31 LIBS = $(LIBC_PREFIX)/libc.a
    32 
    33 OUTPUT = tetris
     31BINARY = tetris
    3432
    3533SOURCES = \
    … …  
    4038        screen.c
    4139
    42 include ../Makefile.common
     40include $(USPACE_PREFIX)/Makefile.common

  • uspace/app/trace/Makefile

    rd99c1d2 r1b1164e8  
    2929
    3030USPACE_PREFIX = ../..
    31 LIBS = $(LIBC_PREFIX)/libc.a
    32 
    33 OUTPUT = trace
     31BINARY = trace
    3432
    3533SOURCES = \
    … …  
    4139        errors.c
    4240
    43 include ../Makefile.common
     41include $(USPACE_PREFIX)/Makefile.common

  • uspace/lib/libblock/Makefile

    rd99c1d2 r1b1164e8  
    2929
    3030USPACE_PREFIX = ../..
    31 LIBS = $(LIBC_PREFIX)/libc.a
    32 
    33 OUTPUT = libblock.a
     31LIBRARY = libblock
    3432
    3533SOURCES = \
    3634        libblock.c
    3735
    38 include ../Makefile.common
     36include $(USPACE_PREFIX)/Makefile.common

  • uspace/lib/libc/Makefile

    rd99c1d2 r1b1164e8  
    2828#
    2929
    30 -include ../../../Makefile.common
    31 -include ../../../Makefile.config
    32 
    33 USPACE_PREFIX = $(shell pwd)/../..
    34 LIBS =
    35 
    36 LINK = arch/$(UARCH)/_link.ld
    37 
    38 PRE_DEPEND = $(INCLUDE_KERNEL) $(INCLUDE_ARCH) $(INCLUDE_LIBARCH)
    39 EXTRA_CLEAN = $(INCLUDE_KERNEL) $(INCLUDE_ARCH) $(INCLUDE_LIBARCH)
    40 EXTRA_OUTPUT = $(LINK)
     30USPACE_PREFIX = ../..
     31ROOT_PATH = $(USPACE_PREFIX)/..
    4132
    4233INCLUDE_KERNEL = include/kernel
    … …  
    4435INCLUDE_LIBARCH = include/libarch
    4536
    46 OUTPUT = libc.a
     37PRE_DEPEND = $(INCLUDE_KERNEL) $(INCLUDE_ARCH) $(INCLUDE_LIBARCH)
     38EXTRA_OUTPUT = $(LINKER_SCRIPT)
     39EXTRA_CLEAN = $(INCLUDE_KERNEL) $(INCLUDE_ARCH) $(INCLUDE_LIBARCH) $(LINKER_SCRIPT)
     40LIBRARY = libc
     41
     42COMMON_MAKEFILE = $(ROOT_PATH)/Makefile.common
     43CONFIG_MAKEFILE = $(ROOT_PATH)/Makefile.config
     44
     45-include $(COMMON_MAKEFILE)
     46-include $(CONFIG_MAKEFILE)
     47-include arch/$(UARCH)/Makefile.inc
    4748
    4849GENERIC_SOURCES = \
    … …  
    9596        $(ARCH_SOURCES)
    9697
    97 include ../Makefile.common
     98include $(USPACE_PREFIX)/Makefile.common
    9899
    99100$(INCLUDE_ARCH): $(INCLUDE_KERNEL) $(INCLUDE_KERNEL)/arch
    … …  
    108109        ln -sfn ../$< $@
    109110
    110 $(LINK): $(LINK).in
    111         $(GCC) $(DEFS) $(CFLAGS) -DLIBC_PREFIX=$(LIBC_PREFIX) -E -x c $< | grep -v "^\#" > $@
     111$(LINKER_SCRIPT): $(LINKER_SCRIPT).in
     112        $(GCC) $(DEFS) $(CFLAGS) -DLIBC_PATH=$(CURDIR) -E -x c $< | grep -v "^\#" > $@

  • uspace/lib/libc/arch/abs32le/Makefile.inc

    rd99c1d2 r1b1164e8  
    2727#
    2828
    29 ifeq ($(COMPILER),clang)
    30         CLANG_ARCH = i386
    31 endif
    32 
    3329ARCH_SOURCES = \
    3430        arch/$(UARCH)/src/entry.c \
    … …  
    3935        arch/$(UARCH)/src/stacktrace.c
    4036
    41 ENDIANESS = LE
     37.PRECIOUS: arch/$(UARCH)/src/entry.o

  • uspace/lib/libc/arch/abs32le/_link.ld.in

    rd99c1d2 r1b1164e8  
    1 STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
     1STARTUP(LIBC_PATH/arch/UARCH/src/entry.o)
    22ENTRY(__entry)
    33

  • uspace/lib/libc/arch/amd64/Makefile.common

    rd99c1d2 r1b1164e8  
    2727#
    2828
     29CLANG_ARCH = x86_64
     30GCC_CFLAGS += -fno-omit-frame-pointer
    2931
    30 ## Common names
    31 #
     32ENDIANESS = LE
    3233
    33 LIBC_PREFIX = ../../../lib/libc
    34 SOFTINT_PREFIX = ../../../lib/softint
    35 LIBS = $(LIBC_PREFIX)/libc.a
    36 
    37 DEPEND = Makefile.depend
    38 DEPEND_PREV = $(DEPEND).prev
    39 JOB = fb.job
    40 OUTPUT = fb
     34BFD_NAME = elf64-x86-64
     35BFD_ARCH = i386:x86-64

  • uspace/lib/libc/arch/amd64/Makefile.inc

    rd99c1d2 r1b1164e8  
    2727#
    2828
    29 CLANG_ARCH = x86_64
    30 
    3129ARCH_SOURCES = \
    3230        arch/$(UARCH)/src/entry.s \
    … …  
    3836        arch/$(UARCH)/src/stacktrace_asm.S
    3937
    40 GCC_CFLAGS += -fno-omit-frame-pointer
    41 LFLAGS += -N
    42 
    43 ENDIANESS = LE
    44 
    45 BFD_NAME = elf64-x86-64
    46 BFD_ARCH = i386:x86-64
     38.PRECIOUS: arch/$(UARCH)/src/entry.o

  • uspace/lib/libc/arch/amd64/_link.ld.in

    rd99c1d2 r1b1164e8  
    1 STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
     1STARTUP(LIBC_PATH/arch/UARCH/src/entry.o)
    22ENTRY(__entry)
    33

  • uspace/lib/libc/arch/arm32/Makefile.inc

    rd99c1d2 r1b1164e8  
    3838        arch/$(UARCH)/src/stacktrace_asm.S
    3939
    40 GCC_CFLAGS += -ffixed-r9 -mtp=soft -mapcs-frame -fno-omit-frame-pointer
    41 LFLAGS += -N $(SOFTINT_PREFIX)/libsoftint.a
    42 
    43 ENDIANESS = LE
    44 
    45 BFD_NAME = elf32-littlearm
    46 BFD_ARCH = arm
     40.PRECIOUS: arch/$(UARCH)/src/entry.o

  • uspace/lib/libc/arch/arm32/_link.ld.in

    rd99c1d2 r1b1164e8  
    1 STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
     1STARTUP(LIBC_PATH/arch/UARCH/src/entry.o)
    22ENTRY(__entry)
    33

  • uspace/lib/libc/arch/ia32/Makefile.common

    rd99c1d2 r1b1164e8  
    2727#
    2828
     29CLANG_ARCH = i386
     30GCC_CFLAGS += -march=pentium
    2931
    30 ## Common names
    31 #
     32ENDIANESS = LE
    3233
    33 LIBC_PREFIX = ../../../lib/libc
    34 SOFTINT_PREFIX = ../../../lib/softint
    35 LIBS = $(LIBC_PREFIX)/libc.a
    36 
    37 DEPEND = Makefile.depend
    38 DEPEND_PREV = $(DEPEND).prev
    39 JOB = kbd.job
    40 OUTPUT = kbd
     34BFD_NAME = elf32-i386
     35BFD_ARCH = i386

  • uspace/lib/libc/arch/ia32/Makefile.inc

    rd99c1d2 r1b1164e8  
    2727#
    2828
    29 CLANG_ARCH = i386
    30 
    3129ARCH_SOURCES = \
    3230        arch/$(UARCH)/src/entry.s \
    … …  
    3937        arch/$(UARCH)/src/stacktrace_asm.S
    4038
    41 GCC_CFLAGS += -march=pentium
    42 LFLAGS += -N
    43 
    44 ENDIANESS = LE
    45 
    46 BFD_NAME = elf32-i386
    47 BFD_ARCH = i386
     39.PRECIOUS: arch/$(UARCH)/src/entry.o

  • uspace/lib/libc/arch/ia32/_link.ld.in

    rd99c1d2 r1b1164e8  
    1 STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
     1STARTUP(LIBC_PATH/arch/UARCH/src/entry.o)
    22ENTRY(__entry)
    33

  • uspace/lib/libc/arch/ia64/Makefile.common

    rd99c1d2 r1b1164e8  
    2727#
    2828
     29GCC_CFLAGS += -fno-unwind-tables
    2930
    30 ## Common names
    31 #
     31ENDIANESS = LE
    3232
    33 LIBC_PREFIX = ../../../lib/libc
    34 SOFTINT_PREFIX = ../../../lib/softint
    35 LIBS = $(LIBC_PREFIX)/libc.a
    36 
    37 DEPEND = Makefile.depend
    38 DEPEND_PREV = $(DEPEND).prev
    39 JOB = console.job
    40 OUTPUT = console
     33BFD_NAME = elf64-ia64-little
     34BFD_ARCH = ia64-elf64

  • uspace/lib/libc/arch/ia64/Makefile.inc

    rd99c1d2 r1b1164e8  
    3737        arch/$(UARCH)/src/stacktrace_asm.S
    3838
    39 GCC_CFLAGS += -fno-unwind-tables
    40 LFLAGS += -N $(SOFTINT_PREFIX)/libsoftint.a
    41 
    42 ENDIANESS = LE
    43 
    44 BFD_NAME = elf64-ia64-little
    45 BFD_ARCH = ia64-elf64
     39.PRECIOUS: arch/$(UARCH)/src/entry.o

  • uspace/lib/libc/arch/ia64/_link.ld.in

    rd99c1d2 r1b1164e8  
    1 STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
     1STARTUP(LIBC_PATH/arch/UARCH/src/entry.o)
    22ENTRY(__entry)
    33

  • uspace/lib/libc/arch/ia64/include/types.h

    rd99c1d2 r1b1164e8  
    3838#define __64_BITS__
    3939
    40 typedef unsigned long long sysarg_t;
     40typedef unsigned long sysarg_t;
    4141
    4242typedef char int8_t;

  • uspace/lib/libc/arch/mips32/Makefile.inc

    rd99c1d2 r1b1164e8  
    3636        arch/$(UARCH)/src/stacktrace_asm.S
    3737
    38 GCC_CFLAGS += -mips3
    39 
    40 ENDIANESS = LE
    41 
    42 BFD_ARCH = mips
    43 BFD_NAME = elf32-tradlittlemips
     38.PRECIOUS: arch/$(UARCH)/src/entry.o

  • uspace/lib/libc/arch/mips32/_link.ld.in

    rd99c1d2 r1b1164e8  
    1 STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
     1STARTUP(LIBC_PATH/arch/UARCH/src/entry.o)
    22ENTRY(__entry)
    33

  • uspace/lib/libc/arch/mips32eb/Makefile.inc

    rd99c1d2 r1b1164e8  
    3636        arch/$(UARCH)/src/stacktrace_asm.S
    3737
    38 GCC_CFLAGS += -mips3
    39 LFLAGS += -N
    40 
    41 ENDIANESS = BE
    42 
    43 BFD_ARCH = mips
    44 BFD_NAME = elf32-tradbigmips
     38.PRECIOUS: arch/$(UARCH)/src/entry.o

  • uspace/lib/libc/arch/ppc32/Makefile.inc

    rd99c1d2 r1b1164e8  
    3636        arch/$(UARCH)/src/stacktrace_asm.S
    3737
    38 GCC_CFLAGS += -mcpu=powerpc -msoft-float -m32
    39 AFLAGS += -a32
    40 LFLAGS += -N
    41 
    42 ENDIANESS = BE
    43 
    44 BFD_NAME = elf32-powerpc
    45 BFD_ARCH = powerpc:common
     38.PRECIOUS: arch/$(UARCH)/src/entry.o

  • uspace/lib/libc/arch/ppc32/_link.ld.in

    rd99c1d2 r1b1164e8  
    1 STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
     1STARTUP(LIBC_PATH/arch/UARCH/src/entry.o)
    22ENTRY(__entry)
    33

  • uspace/lib/libc/arch/sparc64/Makefile.common

    rd99c1d2 r1b1164e8  
    11#
    2 # Copyright (c) 2009 Lukas Mejdrech
     2# Copyright (c) 2006 Martin Decky
    33# All rights reserved.
    44#
    … …  
    2727#
    2828
    29 include ../../../Makefile.common
    30 include ../../../Makefile.config
     29GCC_CFLAGS += -mcpu=ultrasparc -m64
     30LFLAGS = -no-check-sections
    3131
    32 # keep netif drivers before nil modules
    33 # in order to support networking architectures build
     32ENDIANESS = BE
    3433
    35 ifeq ($(CONFIG_NETIF_DP8390),y)
    36         DIRS = netif/dp8390
    37 else
    38         DIRS =
     34BFD_NAME = elf64-sparc
     35BFD_ARCH = sparc
     36
     37ifeq ($(PROCESSOR),us)
     38        DEFS += -DSUN4U
    3939endif
    4040
    41 DIRS += \
    42         netif/lo \
    43         nil/eth \
    44         nil/nildummy \
    45         net \
    46         net/start \
    47         socket \
    48         app/echo \
    49         app/ping \
    50         app/nettest1 \
    51         app/nettest2
    52 
    53 DIRS_MODULAR = \
    54                 il/arp \
    55                 il/ip \
    56                 tl/icmp \
    57                 tl/udp \
    58                 tl/tcp \
    59 
    60 DIRS_ALL = $(DIRS) $(DIRS_MODULAR)
    61 
    62 ifeq ($(NETWORKING), module)
    63         BUILDS := $(addsuffix .build,$(DIRS))
    64 else
    65 ifeq ($(NETWORKING), modular)
    66         BUILDS := $(addsuffix .build,$(DIRS_ALL))
    67 endif
     41ifeq ($(PROCESSOR),us3)
     42        DEFS += -DSUN4U
    6843endif
    6944
    70 CLEANS := $(addsuffix .clean,$(DIRS_ALL))
    71 
    72 CHECKS := $(addsuffix .check,$(basename $(BUILDS)))
    73 
    74 .PHONY: all build $(BUILDS) $(CLEANS) clean
    75 
    76 all: $(BUILDS)
    77 
    78 build: $(BUILDS)
    79 
    80 check: $(CHECKS)
    81 
    82 clean: $(CLEANS)
    83         find $(DIRS_ALL) ./ -name '*.o' -follow -exec rm \{\} \;
    84 
    85 $(CHECKS):
    86         -$(MAKE) -C $(basename $@) check
    87 
    88 $(CLEANS):
    89         -$(MAKE) -C $(basename $@) clean
    90 
    91 $(BUILDS):
    92         $(MAKE) -C $(basename $@) all
     45ifeq ($(PROCESSOR),sun4v)
     46        DEFS += -DSUN4V
     47endif

  • uspace/lib/libc/arch/sparc64/Makefile.inc

    rd99c1d2 r1b1164e8  
    3535        arch/$(UARCH)/src/stacktrace_asm.S
    3636
    37 GCC_CFLAGS += -mcpu=ultrasparc -m64
    38 LFLAGS += -no-check-sections -N
    39 
    40 ENDIANESS = BE
    41 
    42 BFD_NAME = elf64-sparc
    43 BFD_ARCH = sparc
    44 
    45 ifeq ($(PROCESSOR),us)
    46         DEFS += -DSUN4U
    47 endif
    48 
    49 ifeq ($(PROCESSOR),us3)
    50         DEFS += -DSUN4U
    51 endif
    52 
    53 ifeq ($(PROCESSOR),sun4v)
    54         DEFS += -DSUN4V
    55 endif
     37.PRECIOUS: arch/$(UARCH)/src/entry.o

  • uspace/lib/libc/arch/sparc64/_link.ld.in

    rd99c1d2 r1b1164e8  
    1 STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
     1STARTUP(LIBC_PATH/arch/UARCH/src/entry.o)
    22ENTRY(__entry)
    33

  • uspace/lib/libfs/Makefile

    rd99c1d2 r1b1164e8  
    2929
    3030USPACE_PREFIX = ../..
    31 LIBS = $(LIBC_PREFIX)/libc.a
    32 
    33 OUTPUT = libfs.a
     31LIBRARY = libfs
    3432
    3533SOURCES = \
    3634        libfs.c
    3735
    38 include ../Makefile.common
     36include $(USPACE_PREFIX)/Makefile.common

  • uspace/lib/libpci/Makefile

    rd99c1d2 r1b1164e8  
    2929
    3030USPACE_PREFIX = ../..
    31 LIBS = $(LIBC_PREFIX)/libc.a
    32 
    33 OUTPUT = libpci.a
     31LIBRARY = libpci
    3432
    3533SOURCES = \
    … …  
    3937        i386-ports.c
    4038
    41 include ../Makefile.common
     39include $(USPACE_PREFIX)/Makefile.common

  • uspace/lib/softfloat/Makefile

    rd99c1d2 r1b1164e8  
    2929
    3030USPACE_PREFIX = ../..
    31 LIBS = $(LIBC_PREFIX)/libc.a
    32 EXTRA_CFLAGS += -Iinclude -Iarch/$(UARCH)/include/
    33 
    34 OUTPUT = libsoftfloat.a
     31EXTRA_CFLAGS = -Iinclude -Iarch/$(UARCH)/include/
     32LIBRARY = libsoftfloat
    3533
    3634SOURCES = \
    … …  
    4543        generic/sub.c
    4644
    47 include ../Makefile.common
     45include $(USPACE_PREFIX)/Makefile.common

  • uspace/lib/softint/Makefile

    rd99c1d2 r1b1164e8  
    2929
    3030USPACE_PREFIX = ../..
    31 LIBS = $(LIBC_PREFIX)/libc.a
    3231EXTRA_CFLAGS = -Iinclude
    33 
    34 OUTPUT = libsoftint.a
     32LIBRARY = libsoftint
    3533
    3634SOURCES = \
    … …  
    3836        generic/multiplication.c
    3937
    40 include ../Makefile.common
     38include $(USPACE_PREFIX)/Makefile.common

  • uspace/srv/bd/ata_bd/Makefile

    rd99c1d2 r1b1164e8  
    2929
    3030USPACE_PREFIX = ../../..
    31 LIBS = $(LIBC_PREFIX)/libc.a
    32 
    33 OUTPUT = ata_bd
     31BINARY = ata_bd
    3432
    3533SOURCES = \
    3634        ata_bd.c
    3735
    38 include ../../Makefile.common
     36include $(USPACE_PREFIX)/Makefile.common

  • uspace/srv/bd/file_bd/Makefile

    rd99c1d2 r1b1164e8  
    2929
    3030USPACE_PREFIX = ../../..
    31 LIBS = $(LIBC_PREFIX)/libc.a
    32 
    33 OUTPUT = file_bd
     31BINARY = file_bd
    3432
    3533SOURCES = \
    3634        file_bd.c
    3735
    38 include ../../Makefile.common
     36include $(USPACE_PREFIX)/Makefile.common

  • uspace/srv/bd/gxe_bd/Makefile

    rd99c1d2 r1b1164e8  
    2929
    3030USPACE_PREFIX = ../../..
    31 LIBS = $(LIBC_PREFIX)/libc.a
    32 
    33 OUTPUT = gxe_bd
     31BINARY = gxe_bd
    3432
    3533SOURCES = \
    3634        gxe_bd.c
    3735
    38 include ../../Makefile.common
     36include $(USPACE_PREFIX)/Makefile.common

  • uspace/srv/bd/part/guid_part/Makefile

    rd99c1d2 r1b1164e8  
    2828
    2929USPACE_PREFIX = ../../../..
    30 LIBS = $(LIBBLOCK_PREFIX)/libblock.a $(LIBC_PREFIX)/libc.a
     30LIBS = $(LIBBLOCK_PREFIX)/libblock.a
    3131EXTRA_CFLAGS = -I$(LIBBLOCK_PREFIX)
    3232
    3333# Correct name is 'guid_part' but must use this because of FAT 8.3 names.
    34 OUTPUT = g_part
     34BINARY = g_part
    3535
    3636SOURCES = \
    3737        guid_part.c
    3838
    39 include ../../../Makefile.common
     39include $(USPACE_PREFIX)/Makefile.common

  • uspace/srv/bd/part/mbr_part/Makefile

    rd99c1d2 r1b1164e8  
    2929
    3030USPACE_PREFIX = ../../../..
    31 LIBS = $(LIBBLOCK_PREFIX)/libblock.a $(LIBC_PREFIX)/libc.a
     31LIBS = $(LIBBLOCK_PREFIX)/libblock.a
    3232EXTRA_CFLAGS = -I$(LIBBLOCK_PREFIX)
    33 
    34 OUTPUT = mbr_part
     33BINARY = mbr_part
    3534
    3635SOURCES = \
    3736        mbr_part.c
    3837
    39 include ../../../Makefile.common
     38include $(USPACE_PREFIX)/Makefile.common

  • uspace/srv/bd/rd/Makefile

    rd99c1d2 r1b1164e8  
    2929
    3030USPACE_PREFIX = ../../..
    31 LIBS = $(LIBC_PREFIX)/libc.a
    32 
    33 OUTPUT = rd
     31BINARY = rd
    3432
    3533SOURCES = \
    3634        rd.c
    3735
    38 include ../../Makefile.common
     36include $(USPACE_PREFIX)/Makefile.common

  • uspace/srv/clip/Makefile

    rd99c1d2 r1b1164e8  
    2929
    3030USPACE_PREFIX = ../..
    31 LIBS = $(LIBC_PREFIX)/libc.a
    32 
    33 OUTPUT = clip
     31BINARY = clip
    3432
    3533SOURCES = \
    3634        clip.c
    3735
    38 include ../Makefile.common
     36include $(USPACE_PREFIX)/Makefile.common

  • uspace/srv/devmap/Makefile

    rd99c1d2 r1b1164e8  
    2929
    3030USPACE_PREFIX = ../..
    31 LIBS = $(LIBC_PREFIX)/libc.a
    32 
    33 OUTPUT = devmap
     31BINARY = devmap
    3432
    3533SOURCES = \
    3634        devmap.c
    3735
    38 include ../Makefile.common
     36include $(USPACE_PREFIX)/Makefile.common

  • uspace/srv/fs/devfs/Makefile

    rd99c1d2 r1b1164e8  
    2929
    3030USPACE_PREFIX = ../../..
    31 LIBS = $(LIBFS_PREFIX)/libfs.a $(LIBC_PREFIX)/libc.a
     31LIBS = $(LIBFS_PREFIX)/libfs.a
    3232EXTRA_CFLAGS += -I$(LIBFS_PREFIX)
    33 
    34 OUTPUT = devfs
     33BINARY = devfs
    3534
    3635SOURCES = \
    … …  
    3837        devfs_ops.c
    3938
    40 include ../../Makefile.common
     39include $(USPACE_PREFIX)/Makefile.common

  • uspace/srv/fs/fat/Makefile

    rd99c1d2 r1b1164e8  
    2929
    3030USPACE_PREFIX = ../../..
    31 LIBS = $(LIBBLOCK_PREFIX)/libblock.a $(LIBFS_PREFIX)/libfs.a $(LIBC_PREFIX)/libc.a
     31LIBS = $(LIBBLOCK_PREFIX)/libblock.a $(LIBFS_PREFIX)/libfs.a
    3232EXTRA_CFLAGS += -I$(LIBBLOCK_PREFIX) -I$(LIBFS_PREFIX)
    33 
    34 OUTPUT = fat
     33BINARY = fat
    3534
    3635SOURCES = \
    … …  
    4140        fat_fat.c
    4241
    43 include ../../Makefile.common
     42include $(USPACE_PREFIX)/Makefile.common

  • uspace/srv/fs/tmpfs/Makefile

    rd99c1d2 r1b1164e8  
    2929
    3030USPACE_PREFIX = ../../..
    31 LIBS = $(LIBBLOCK_PREFIX)/libblock.a $(LIBFS_PREFIX)/libfs.a $(LIBC_PREFIX)/libc.a
     31LIBS = $(LIBBLOCK_PREFIX)/libblock.a $(LIBFS_PREFIX)/libfs.a
    3232EXTRA_CFLAGS += -I$(LIBBLOCK_PREFIX) -I$(LIBFS_PREFIX)
    33 
    34 OUTPUT = tmpfs
     33BINARY = tmpfs
    3534
    3635SOURCES = \
    … …  
    3938        tmpfs_dump.c
    4039
    41 include ../../Makefile.common
     40include $(USPACE_PREFIX)/Makefile.common

  • uspace/srv/hid/adb_mouse/Makefile

    rd99c1d2 r1b1164e8  
    2828
    2929USPACE_PREFIX = ../../..
    30 LIBS = $(LIBC_PREFIX)/libc.a
    3130EXTRA_CFLAGS = -Iinclude
    32 
    33 OUTPUT = adb_ms
     31BINARY = adb_ms
    3432
    3533SOURCES = \
    … …  
    3735        adb_dev.c
    3836
    39 include ../../Makefile.common
     37include $(USPACE_PREFIX)/Makefile.common

  • uspace/srv/hid/char_mouse/Makefile

    rd99c1d2 r1b1164e8  
    2929
    3030USPACE_PREFIX = ../../..
    31 LIBS = $(LIBC_PREFIX)/libc.a
    3231EXTRA_CFLAGS = -Iinclude
    33 
    34 OUTPUT = char_ms
     32BINARY = char_ms
    3533
    3634SOURCES = \
    … …  
    3937        chardev.c
    4038
    41 include ../../Makefile.common
     39include $(USPACE_PREFIX)/Makefile.common

  • uspace/srv/hid/console/Makefile

    rd99c1d2 r1b1164e8  
    2828#
    2929
    30 include Makefile.common
     30USPACE_PREFIX = ../../..
     31BINARY = console
    3132
    32 .PHONY: all clean
     33GENERIC_SOURCES = \
     34        console.c \
     35        screenbuffer.c \
     36        keybuffer.c \
     37        gcons.c
    3338
    34 all: $(LIBC_PREFIX)/../../../Makefile.common $(LIBC_PREFIX)/../../../Makefile.config $(LIBC_PREFIX)/../../../config.h $(LIBS)
    35         -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV)
    36         $(MAKE) -f Makefile.build PRECHECK=$(PRECHECK)
     39IMAGES = \
     40        gfx/helenos.ppm \
     41        gfx/nameic.ppm \
     42        gfx/cons_selected.ppm \
     43        gfx/cons_idle.ppm \
     44        gfx/cons_has_data.ppm \
     45        gfx/cons_kernel.ppm \
     46        gfx/anim_1.ppm \
     47        gfx/anim_2.ppm \
     48        gfx/anim_3.ppm \
     49        gfx/anim_4.ppm
    3750
    38 clean:
    39         rm -f $(DEPEND) $(DEPEND_PREV) $(JOB) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm
    40         find . -name '*.o' -follow -exec rm \{\} \;
     51SOURCES = \
     52        $(GENERIC_SOURCES) \
     53        $(IMAGES)
     54
     55include $(USPACE_PREFIX)/Makefile.common
     56
     57%.o: %.ppm
     58        $(OBJCOPY) -I binary -O $(BFD_NAME) -B $(BFD_ARCH) $< $@

  • uspace/srv/hid/fb/Makefile

    rd99c1d2 r1b1164e8  
    2828#
    2929
    30 include Makefile.common
     30USPACE_PREFIX = ../../..
     31BINARY = fb
    3132
    32 .PHONY: all clean
     33SOURCES = \
     34        main.c \
     35        ppm.c
    3336
    34 all: $(LIBC_PREFIX)/../../../Makefile.common $(LIBC_PREFIX)/../../../Makefile.config $(LIBC_PREFIX)/../../../config.h $(LIBS)
    35         -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV)
    36         $(MAKE) -f Makefile.build PRECHECK=$(PRECHECK)
     37ifneq ($(UARCH),ia64)
     38        SOURCES += fb.c \
     39                font-8x16.c
     40        EXTRA_CFLAGS = -DFB_ENABLED
     41endif
    3742
    38 clean:
    39         rm -f $(DEPEND) $(DEPEND_PREV) $(JOB) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm
    40         find . -name '*.o' -follow -exec rm \{\} \;
     43ifeq ($(UARCH),ia32)
     44        SOURCES += ega.c
     45        EXTRA_CFLAGS = -DEGA_ENABLED
     46endif
     47
     48ifeq ($(UARCH),ia64)
     49        SOURCES += ega.c \
     50                ski.c \
     51                serial_console.c
     52        EXTRA_CFLAGS = -DSKI_ENABLED -DEGA_ENABLED
     53endif
     54
     55ifeq ($(UARCH),amd64)
     56        SOURCES += ega.c
     57        EXTRA_CFLAGS = -DEGA_ENABLED
     58endif
     59
     60ifeq ($(UARCH),mips32)
     61        SOURCES += msim.c \
     62                serial_console.c
     63        EXTRA_CFLAGS = -DMSIM_ENABLED
     64endif
     65
     66ifeq ($(UARCH),sparc64)
     67        ifeq ($(PROCESSOR), sun4v)
     68                SOURCES += niagara.c \
     69                        serial_console.c
     70                EXTRA_CFLAGS = -DNIAGARA_ENABLED
     71        endif
     72
     73        ifeq ($(MACHINE), serengeti)
     74                SOURCES += sgcn.c \
     75                        serial_console.c
     76                EXTRA_CFLAGS = -DSGCN_ENABLED
     77        endif
     78endif
     79
     80EXTRA_CFLAGS += -D$(UARCH)
     81
     82include $(USPACE_PREFIX)/Makefile.common

  • uspace/srv/hid/kbd/Makefile

    rd99c1d2 r1b1164e8  
    2828#
    2929
    30 include Makefile.common
     30USPACE_PREFIX = ../../..
     31ROOT_PATH = $(USPACE_PREFIX)/..
    3132
    32 .PHONY: all clean
     33COMMON_MAKEFILE = $(ROOT_PATH)/Makefile.common
     34CONFIG_MAKEFILE = $(ROOT_PATH)/Makefile.config
    3335
    34 all: $(LIBC_PREFIX)/../../../Makefile.common $(LIBC_PREFIX)/../../../Makefile.config $(LIBC_PREFIX)/../../../config.h $(LIBS)
    35         -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV)
    36         $(MAKE) -f Makefile.build PRECHECK=$(PRECHECK)
     36EXTRA_CFLAGS = -Iinclude
     37BINARY = kbd
    3738
    38 clean:
    39         rm -f $(DEPEND) $(DEPEND_PREV) $(JOB) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm
    40         find . -name '*.o' -follow -exec rm \{\} \;
     39-include $(COMMON_MAKEFILE)
     40-include $(CONFIG_MAKEFILE)
     41
     42## Sources
     43#
     44
     45SOURCES = \
     46        generic/kbd.c \
     47        genarch/gsp.c \
     48        genarch/stroke.c \
     49        layout/cz.c \
     50        layout/us_qwerty.c \
     51        layout/us_dvorak.c
     52
     53ifeq ($(UARCH),amd64)
     54        SOURCES += \
     55                port/chardev.c \
     56                ctl/pc.c
     57endif
     58
     59ifeq ($(UARCH),arm32)
     60        ifeq ($(MACHINE),testarm)
     61                SOURCES += \
     62                        port/gxemul.c
     63               
     64                ifeq ($(CONFIG_FB),y)
     65                        SOURCES += \
     66                                ctl/gxe_fb.c
     67                else
     68                        SOURCES += \
     69                                ctl/stty.c
     70                endif
     71        endif
     72        ifeq ($(MACHINE),integratorcp)
     73                SOURCES += \
     74                        port/pl050.c \
     75                        ctl/pl050.c
     76        endif
     77endif
     78
     79ifeq ($(UARCH),ia32)
     80        SOURCES += \
     81                port/chardev.c \
     82                ctl/pc.c
     83endif
     84
     85ifeq ($(MACHINE),i460GX)
     86        SOURCES += \
     87                port/chardev.c \
     88                ctl/pc.c
     89endif
     90
     91ifeq ($(MACHINE),ski)
     92        SOURCES += \
     93                port/ski.c \
     94                ctl/stty.c
     95endif
     96
     97ifeq ($(MACHINE),msim)
     98        SOURCES += \
     99                port/msim.c \
     100                ctl/stty.c
     101endif
     102
     103ifeq ($(MACHINE),lgxemul)
     104        SOURCES += \
     105                port/gxemul.c
     106       
     107        ifeq ($(CONFIG_FB),y)
     108                SOURCES += \
     109                        ctl/gxe_fb.c
     110        else
     111                SOURCES += \
     112                        ctl/stty.c
     113        endif
     114endif
     115
     116ifeq ($(MACHINE),bgxemul)
     117        SOURCES += \
     118                port/gxemul.c
     119       
     120        ifeq ($(CONFIG_FB),y)
     121                SOURCES += \
     122                        ctl/gxe_fb.c
     123        else
     124                SOURCES += \
     125                        ctl/stty.c
     126        endif
     127endif
     128
     129ifeq ($(UARCH),ppc32)
     130        SOURCES += \
     131                port/adb.c \
     132                ctl/apple.c
     133endif
     134
     135ifeq ($(UARCH),sparc64)
     136        ifeq ($(PROCESSOR),sun4v)
     137                SOURCES += \
     138                        port/niagara.c \
     139                        ctl/stty.c
     140        else
     141                ifeq ($(MACHINE),serengeti)
     142                        SOURCES += \
     143                                port/sgcn.c \
     144                                ctl/stty.c
     145                endif
     146                ifeq ($(MACHINE),generic)
     147                        SOURCES += \
     148                        port/sun.c \
     149                        port/z8530.c \
     150                        port/ns16550.c \
     151                        ctl/sun.c
     152                endif
     153        endif
     154endif
     155
     156ifeq ($(UARCH),abs32le)
     157        SOURCES += \
     158                port/dummy.c \
     159                ctl/pc.c
     160endif
     161
     162include $(USPACE_PREFIX)/Makefile.common

  • uspace/srv/hw/bus/cuda_adb/Makefile

    rd99c1d2 r1b1164e8  
    2828
    2929USPACE_PREFIX = ../../../..
    30 LIBS = $(LIBC_PREFIX)/libc.a
    31 
    32 OUTPUT = cuda_adb
     30BINARY = cuda_adb
    3331
    3432SOURCES = \
    3533        cuda_adb.c
    3634
    37 include ../../../Makefile.common
    38 
     35include $(USPACE_PREFIX)/Makefile.common

  • uspace/srv/hw/bus/pci/Makefile

    rd99c1d2 r1b1164e8  
    2929
    3030USPACE_PREFIX = ../../../..
    31 LIBS = $(LIBPCI_PREFIX)/libpci.a $(LIBC_PREFIX)/libc.a
     31LIBS = $(LIBPCI_PREFIX)/libpci.a
    3232EXTRA_CFLAGS = -I$(LIBPCI_PREFIX)
    33 
    34 OUTPUT = pci
     33BINARY = pci
    3534
    3635SOURCES = \
    3736        pci.c
    3837
    39 include ../../../Makefile.common
     38include $(USPACE_PREFIX)/Makefile.common

  • uspace/srv/hw/char/i8042/Makefile

    rd99c1d2 r1b1164e8  
    2929
    3030USPACE_PREFIX = ../../../..
    31 LIBS = $(LIBC_PREFIX)/libc.a
    32 
    33 OUTPUT = i8042
     31BINARY = i8042
    3432
    3533SOURCES = \
    3634        i8042.c
    3735
    38 include ../../../Makefile.common
     36include $(USPACE_PREFIX)/Makefile.common

  • uspace/srv/hw/cir/fhc/Makefile

    rd99c1d2 r1b1164e8  
    2929
    3030USPACE_PREFIX = ../../../..
    31 LIBS = $(LIBC_PREFIX)/libc.a
    32 
    33 OUTPUT = fhc
     31BINARY = fhc
    3432
    3533SOURCES = \
    3634        fhc.c
    3735
    38 include ../../../Makefile.common
     36include $(USPACE_PREFIX)/Makefile.common

  • uspace/srv/hw/cir/obio/Makefile

    rd99c1d2 r1b1164e8  
    2929
    3030USPACE_PREFIX = ../../../..
    31 LIBS = $(LIBC_PREFIX)/libc.a
    32 
    33 OUTPUT = obio
     31BINARY = obio
    3432
    3533SOURCES = \
    3634        obio.c
    3735
    38 include ../../../Makefile.common
     36include $(USPACE_PREFIX)/Makefile.common

  • uspace/srv/loader/Makefile

    rd99c1d2 r1b1164e8  
    2828#
    2929
    30 -include ../../../Makefile.common
    31 -include ../../../Makefile.config
     30USPACE_PREFIX = ../..
     31ROOT_PATH = $(USPACE_PREFIX)/..
     32
     33COMMON_MAKEFILE = $(ROOT_PATH)/Makefile.common
     34CONFIG_MAKEFILE = $(ROOT_PATH)/Makefile.config
     35
     36-include $(COMMON_MAKEFILE)
     37-include $(CONFIG_MAKEFILE)
    3238-include arch/$(UARCH)/Makefile.inc
    3339
    34 USPACE_PREFIX = ../..
    35 LIBS = $(LIBC_PREFIX)/libc.a
    36 EXTRA_CFLAGS += -Iinclude
    37 LINK_SCRIPT = arch/$(UARCH)/_link.ld
     40LINKER_SCRIPT = arch/$(UARCH)/_link.ld
     41EXTRA_CLEAN = $(LINKER_SCRIPT)
    3842
    39 OUTPUT = loader
    40 EXTRA_OUTPUT = $(LINK_SCRIPT)
     43EXTRA_CFLAGS = -Iinclude
     44
     45BINARY = loader
    4146
    4247GENERIC_SOURCES = \
    … …  
    4550        interp.s
    4651
    47 SOURCES := $(GENERIC_SOURCES) $(ARCH_SOURCES)
    48 OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
     52SOURCES = \
     53        $(GENERIC_SOURCES) \
     54        $(ARCH_SOURCES)
    4955
    50 include ../Makefile.common
     56include $(USPACE_PREFIX)/Makefile.common
    5157
    52 $(LINK_SCRIPT): $(LINK_SCRIPT).in
     58$(LINKER_SCRIPT): $(LINKER_SCRIPT).in
    5359        $(GCC) $(DEFS) $(CFLAGS) -DLIBC_PREFIX=$(LIBC_PREFIX) -E -x c $< | grep -v "^\#" > $@

  • uspace/srv/loader/arch/abs32le/Makefile.inc

    rd99c1d2 r1b1164e8  
    2727#
    2828
    29 ARCH_SOURCES := arch/$(UARCH)/abs32le.c
     29ARCH_SOURCES = arch/$(UARCH)/abs32le.c

  • uspace/srv/loader/arch/amd64/Makefile.inc

    rd99c1d2 r1b1164e8  
    2727#
    2828
    29 ARCH_SOURCES := arch/$(UARCH)/amd64.s
     29ARCH_SOURCES = arch/$(UARCH)/amd64.s

  • uspace/srv/loader/arch/arm32/Makefile.inc

    rd99c1d2 r1b1164e8  
    2727#
    2828
    29 ARCH_SOURCES := arch/$(UARCH)/arm32.s
     29ARCH_SOURCES = arch/$(UARCH)/arm32.s

  • uspace/srv/loader/arch/ia32/Makefile.inc

    rd99c1d2 r1b1164e8  
    2727#
    2828
    29 ARCH_SOURCES := arch/$(UARCH)/ia32.s
     29ARCH_SOURCES = arch/$(UARCH)/ia32.s

  • uspace/srv/loader/arch/ia64/Makefile.inc

    rd99c1d2 r1b1164e8  
    2727#
    2828
    29 ARCH_SOURCES := arch/$(UARCH)/ia64.s
     29ARCH_SOURCES = arch/$(UARCH)/ia64.s
    3030AFLAGS += -xexplicit

  • uspace/srv/loader/arch/mips32/Makefile.inc

    rd99c1d2 r1b1164e8  
    2727#
    2828
    29 ARCH_SOURCES := arch/$(UARCH)/mips32.s
     29ARCH_SOURCES = arch/$(UARCH)/mips32.s

  • uspace/srv/loader/arch/ppc32/Makefile.inc

    rd99c1d2 r1b1164e8  
    2727#
    2828
    29 ARCH_SOURCES := arch/$(UARCH)/ppc32.s
     29ARCH_SOURCES = arch/$(UARCH)/ppc32.s

  • uspace/srv/loader/arch/sparc64/Makefile.inc

    rd99c1d2 r1b1164e8  
    2727#
    2828
    29 ARCH_SOURCES := arch/$(UARCH)/sparc64.s
     29ARCH_SOURCES = arch/$(UARCH)/sparc64.s

  • uspace/srv/net/app/echo/Makefile

    rd99c1d2 r1b1164e8  
    11#
    2 # Copyright (c) 2009 Lukas Mejdrech
     2# Copyright (c) 2005 Martin Decky
     3# Copyright (c) 2007 Jakub Jermar
    34# All rights reserved.
    45#
    … …  
    2728#
    2829
    29 NAME = echo
     30NET_BASE = ../..
     31USPACE_PREFIX = ../../../..
     32LIBS = $(NET_BASE)/socket/libsocket.a
     33BINARY = echo
    3034
    31 NET_BASE = ../../
    32 STRUCTURES = $(NET_BASE)structures/
     35SOURCES = \
     36        echo.c \
     37        $(NET_BASE)/app/parse.c \
     38        $(NET_BASE)/app/print_error.c
    3339
    34 include ../../../../../Makefile.common
    35 include ../../../../../Makefile.config
    36 
    37 ## Sources
    38 #
    39 
    40 OUTPUT = $(NAME)
    41 SOURCES = \
    42         $(NAME).c \
    43         $(NET_BASE)app/parse.c \
    44         $(NET_BASE)app/print_error.c
    45 
    46 LIBS += ../../socket/libsocket.a
    47 
    48 include $(NET_BASE)Makefile.module
     40include $(USPACE_PREFIX)/Makefile.common

  • uspace/srv/net/app/nettest1/Makefile

    rd99c1d2 r1b1164e8  
    11#
    2 # Copyright (c) 2009 Lukas Mejdrech
     2# Copyright (c) 2005 Martin Decky
     3# Copyright (c) 2007 Jakub Jermar
    34# All rights reserved.
    45#
    … …  
    2728#
    2829
    29 NAME = nettest1
     30NET_BASE = ../..
     31USPACE_PREFIX = ../../../..
     32LIBS = $(NET_BASE)/socket/libsocket.a
     33BINARY = nettest1
    3034
    31 NET_BASE = ../../
    32 STRUCTURES = $(NET_BASE)structures/
     35SOURCES = \
     36        nettest1.c \
     37        $(NET_BASE)/app/nettest.c \
     38        $(NET_BASE)/app/parse.c \
     39        $(NET_BASE)/app/print_error.c
    3340
    34 include ../../../../../Makefile.common
    35 include ../../../../../Makefile.config
    36 
    37 ## Sources
    38 #
    39 
    40 OUTPUT = $(NAME)
    41 SOURCES = \
    42         $(NAME).c \
    43         $(NET_BASE)app/nettest.c \
    44         $(NET_BASE)app/parse.c \
    45         $(NET_BASE)app/print_error.c
    46 
    47 LIBS += ../../socket/libsocket.a
    48 
    49 include $(NET_BASE)Makefile.module
     41include $(USPACE_PREFIX)/Makefile.common

  • uspace/srv/net/app/nettest2/Makefile

    rd99c1d2 r1b1164e8  
    11#
    2 # Copyright (c) 2009 Lukas Mejdrech
     2# Copyright (c) 2005 Martin Decky
     3# Copyright (c) 2007 Jakub Jermar
    34# All rights reserved.
    45#
    … …  
    2728#
    2829
    29 NAME = nettest2
     30NET_BASE = ../..
     31USPACE_PREFIX = ../../../..
     32LIBS = $(NET_BASE)/socket/libsocket.a
     33BINARY = nettest2
    3034
    31 NET_BASE = ../../
    32 STRUCTURES = $(NET_BASE)structures/
     35SOURCES = \
     36        nettest2.c \
     37        $(NET_BASE)/app/nettest.c \
     38        $(NET_BASE)/app/parse.c \
     39        $(NET_BASE)/app/print_error.c
    3340
    34 include ../../../../../Makefile.common
    35 include ../../../../../Makefile.config
    36 
    37 ## Sources
    38 #
    39 
    40 OUTPUT = $(NAME)
    41 SOURCES = \
    42         $(NAME).c \
    43         $(NET_BASE)app/nettest.c \
    44         $(NET_BASE)app/parse.c \
    45         $(NET_BASE)app/print_error.c
    46 
    47 LIBS += ../../socket/libsocket.a
    48 
    49 include $(NET_BASE)Makefile.module
     41include $(USPACE_PREFIX)/Makefile.common

  • uspace/srv/net/app/ping/Makefile

    rd99c1d2 r1b1164e8  
    11#
    2 # Copyright (c) 2009 Lukas Mejdrech
     2# Copyright (c) 2005 Martin Decky
     3# Copyright (c) 2007 Jakub Jermar
    34# All rights reserved.
    45#
    … …  
    2728#
    2829
    29 NAME = ping
     30NET_BASE = ../..
     31USPACE_PREFIX = ../../../..
     32LIBS = $(NET_BASE)/socket/libsocket.a
     33BINARY = ping
    3034
    31 NET_BASE = ../../
    32 STRUCTURES = $(NET_BASE)structures/
     35SOURCES = \
     36        ping.c \
     37        $(NET_BASE)/app/parse.c \
     38        $(NET_BASE)/app/print_error.c \
     39        $(NET_BASE)/inet.c \
     40        $(NET_BASE)/modules.c \
     41        $(NET_BASE)/tl/icmp/icmp_api.c \
     42        $(NET_BASE)/tl/icmp/icmp_common.c
    3343
    34 include ../../../../../Makefile.common
    35 include ../../../../../Makefile.config
    36 
    37 ## Sources
    38 #
    39 
    40 OUTPUT = $(NAME)
    41 SOURCES = \
    42         $(NAME).c \
    43         $(NET_BASE)app/parse.c \
    44         $(NET_BASE)app/print_error.c \
    45         $(NET_BASE)inet.c \
    46         $(NET_BASE)modules.c \
    47         $(NET_BASE)tl/icmp/icmp_api.c \
    48         $(NET_BASE)tl/icmp/icmp_common.c
    49 
    50 include $(NET_BASE)Makefile.module
     44include $(USPACE_PREFIX)/Makefile.common

  • uspace/srv/net/il/arp/Makefile

    rd99c1d2 r1b1164e8  
    11#
    2 # Copyright (c) 2009 Lukas Mejdrech
     2# Copyright (c) 2005 Martin Decky
     3# Copyright (c) 2007 Jakub Jermar
    34# All rights reserved.
    45#
    … …  
    2728#
    2829
    29 NAME = arp
     30NET_BASE = ../..
     31USPACE_PREFIX = ../../../..
     32BINARY = arp
    3033
    31 NET_BASE = ../../
    32 STRUCTURES = $(NET_BASE)structures/
     34SOURCES = \
     35        arp.c \
     36        arp_module.c \
     37        $(NET_BASE)/module.c \
     38        $(NET_BASE)/modules.c \
     39        $(NET_BASE)/net/net_remote.c \
     40        $(NET_BASE)/nil/nil_remote.c \
     41        $(NET_BASE)/structures/char_map.c \
     42        $(NET_BASE)/structures/measured_strings.c \
     43        $(NET_BASE)/structures/packet/packet.c \
     44        $(NET_BASE)/structures/packet/packet_client.c \
     45        $(NET_BASE)/structures/packet/packet_remote.c
    3346
    34 ## Sources
    35 #
    36 
    37 OUTPUT = $(NAME)
    38 SOURCES = \
    39         $(NAME).c \
    40         $(NAME)_module.c \
    41         $(NET_BASE)module.c \
    42         $(NET_BASE)modules.c \
    43         $(NET_BASE)net/net_remote.c \
    44         $(NET_BASE)nil/nil_remote.c \
    45         $(STRUCTURES)char_map.c \
    46         $(STRUCTURES)measured_strings.c \
    47         $(STRUCTURES)packet/packet.c \
    48         $(STRUCTURES)packet/packet_client.c \
    49         $(STRUCTURES)packet/packet_remote.c
    50 
    51 include $(NET_BASE)Makefile.module
     47include $(USPACE_PREFIX)/Makefile.common

  • uspace/srv/net/il/ip/Makefile

    rd99c1d2 r1b1164e8  
    11#
    2 # Copyright (c) 2009 Lukas Mejdrech
     2# Copyright (c) 2005 Martin Decky
     3# Copyright (c) 2007 Jakub Jermar
    34# All rights reserved.
    45#
    … …  
    2728#
    2829
    29 NAME = ip
     30NET_BASE = ../..
     31USPACE_PREFIX = ../../../..
     32BINARY = ip
    3033
    31 NET_BASE = ../../
    32 STRUCTURES = $(NET_BASE)structures/
     34SOURCES = \
     35        ip.c \
     36        ip_client.c \
     37        ip_module.c \
     38        $(NET_BASE)/checksum.c \
     39        $(NET_BASE)/inet.c \
     40        $(NET_BASE)/module.c \
     41        $(NET_BASE)/modules.c \
     42        $(NET_BASE)/il/arp/arp_remote.c \
     43        $(NET_BASE)/nil/nil_remote.c \
     44        $(NET_BASE)/net/net_remote.c \
     45        $(NET_BASE)/tl/icmp/icmp_client.c \
     46        $(NET_BASE)/tl/icmp/icmp_common.c \
     47        $(NET_BASE)/tl/icmp/icmp_remote.c \
     48        $(NET_BASE)/structures/char_map.c \
     49        $(NET_BASE)/structures/measured_strings.c \
     50        $(NET_BASE)/structures/module_map.c \
     51        $(NET_BASE)/structures/packet/packet.c \
     52        $(NET_BASE)/structures/packet/packet_client.c \
     53        $(NET_BASE)/structures/packet/packet_remote.c
    3354
    34 ## Sources
    35 #
    36 
    37 OUTPUT = $(NAME)
    38 SOURCES = \
    39         $(NAME).c \
    40         $(NAME)_client.c \
    41         $(NAME)_module.c \
    42         $(NET_BASE)checksum.c \
    43         $(NET_BASE)inet.c \
    44         $(NET_BASE)module.c \
    45         $(NET_BASE)modules.c \
    46         $(NET_BASE)il/arp/arp_remote.c \
    47         $(NET_BASE)nil/nil_remote.c \
    48         $(NET_BASE)net/net_remote.c \
    49         $(NET_BASE)tl/icmp/icmp_client.c \
    50         $(NET_BASE)tl/icmp/icmp_common.c \
    51         $(NET_BASE)tl/icmp/icmp_remote.c \
    52         $(STRUCTURES)char_map.c \
    53         $(STRUCTURES)measured_strings.c \
    54         $(STRUCTURES)module_map.c \
    55         $(STRUCTURES)packet/packet.c \
    56         $(STRUCTURES)packet/packet_client.c \
    57         $(STRUCTURES)packet/packet_remote.c
    58 
    59 include $(NET_BASE)Makefile.module
     55include $(USPACE_PREFIX)/Makefile.common

  • uspace/srv/net/net/Makefile

    rd99c1d2 r1b1164e8  
    11#
    2 # Copyright (c) 2009 Lukas Mejdrech
     2# Copyright (c) 2005 Martin Decky
     3# Copyright (c) 2007 Jakub Jermar
    34# All rights reserved.
    45#
    … …  
    2728#
    2829
    29 NAME = net
     30NET_BASE = ..
     31USPACE_PREFIX = ../../..
     32ROOT_PATH = $(USPACE_PREFIX)/..
    3033
    31 NET_BASE = ../
    32 STRUCTURES = $(NET_BASE)structures/
     34COMMON_MAKEFILE = $(ROOT_PATH)/Makefile.common
     35CONFIG_MAKEFILE = $(ROOT_PATH)/Makefile.config
    3336
    34 include $(NET_BASE)../../../Makefile.common
    35 include $(NET_BASE)../../../Makefile.config
     37BINARY = net
    3638
    37 ## Sources
    38 #
     39-include $(COMMON_MAKEFILE)
     40-include $(CONFIG_MAKEFILE)
    3941
    40 OUTPUT = $(NAME)
    4142SOURCES = \
    42         $(NAME).c \
    43         $(NET_BASE)module.c \
    44         $(NET_BASE)modules.c \
    45         $(NET_BASE)netif/netif_remote.c \
    46         $(STRUCTURES)char_map.c \
    47         $(STRUCTURES)measured_strings.c \
    48         $(STRUCTURES)module_map.c \
    49         $(STRUCTURES)packet/packet.c \
    50         $(STRUCTURES)packet/packet_client.c \
    51         $(STRUCTURES)packet/packet_server.c
     43        net.c \
     44        $(NET_BASE)/module.c \
     45        $(NET_BASE)/modules.c \
     46        $(NET_BASE)/netif/netif_remote.c \
     47        $(NET_BASE)/structures/char_map.c \
     48        $(NET_BASE)/structures/measured_strings.c \
     49        $(NET_BASE)/structures/module_map.c \
     50        $(NET_BASE)/structures/packet/packet.c \
     51        $(NET_BASE)/structures/packet/packet_client.c \
     52        $(NET_BASE)/structures/packet/packet_server.c
    5253
    53 ifeq ($(NETWORKING), module)
    54 
    55         SOURCES +=      $(NAME)_bundle.c \
    56                                 $(NET_BASE)checksum.c \
    57                                 $(NET_BASE)inet.c \
    58                                 $(NET_BASE)il/arp/arp.c \
    59                                 $(NET_BASE)il/ip/ip.c \
    60                                 $(NET_BASE)il/ip/ip_client.c \
    61                                 $(NET_BASE)socket/socket_core.c \
    62                                 $(NET_BASE)tl/icmp/icmp.c \
    63                                 $(NET_BASE)tl/icmp/icmp_client.c \
    64                                 $(NET_BASE)tl/tcp/tcp.c \
    65                                 $(NET_BASE)tl/tl_common.c \
    66                                 $(NET_BASE)tl/udp/udp.c \
    67                                 $(STRUCTURES)dynamic_fifo.c
    68 
    69 else
    70 
    71         SOURCES +=      $(NAME)_standalone.c \
    72                                 $(NET_BASE)il/ip/ip_remote.c
    73 
     54ifeq ($(CONFIG_NETWORKING),module)
     55        SOURCES += \
     56                net_bundle.c \
     57                $(NET_BASE)/checksum.c \
     58                $(NET_BASE)/inet.c \
     59                $(NET_BASE)/il/arp/arp.c \
     60                $(NET_BASE)/il/ip/ip.c \
     61                $(NET_BASE)/il/ip/ip_client.c \
     62                $(NET_BASE)/socket/socket_core.c \
     63                $(NET_BASE)/tl/icmp/icmp.c \
     64                $(NET_BASE)/tl/icmp/icmp_client.c \
     65                $(NET_BASE)/tl/tcp/tcp.c \
     66                $(NET_BASE)/tl/tl_common.c \
     67                $(NET_BASE)/tl/udp/udp.c \
     68                $(NET_BASE)/structures/dynamic_fifo.c
    7469endif
    7570
    76 include $(NET_BASE)Makefile.module
     71ifeq ($(CONFIG_NETWORKING),modular)
     72        SOURCES += \
     73                net_standalone.c \
     74                $(NET_BASE)/il/ip/ip_remote.c
     75endif
     76
     77include $(USPACE_PREFIX)/Makefile.common

  • uspace/srv/net/net/start/Makefile

    rd99c1d2 r1b1164e8  
    11#
    2 # Copyright (c) 2009 Lukas Mejdrech
     2# Copyright (c) 2005 Martin Decky
     3# Copyright (c) 2007 Jakub Jermar
    34# All rights reserved.
    45#
    … …  
    2728#
    2829
    29 NAME = netstart
     30NET_BASE = ../..
     31USPACE_PREFIX = ../../../..
     32BINARY = netstart
    3033
    31 NET_BASE = ../../
    32 STRUCTURES = $(NET_BASE)structures/
     34SOURCES = \
     35        netstart.c \
     36        $(NET_BASE)/checksum.c \
     37        $(NET_BASE)/modules.c \
     38        $(NET_BASE)/self_test.c \
     39        $(NET_BASE)/structures/char_map.c \
     40        $(NET_BASE)/structures/dynamic_fifo.c \
     41        $(NET_BASE)/structures/measured_strings.c
    3342
    34 include ../../../../../Makefile.common
    35 include ../../../../../Makefile.config
    36 
    37 ## Sources
    38 #
    39 
    40 OUTPUT = $(NAME)
    41 SOURCES = \
    42         $(NAME).c \
    43         $(NET_BASE)checksum.c \
    44         $(NET_BASE)modules.c \
    45         $(NET_BASE)self_test.c \
    46         $(STRUCTURES)char_map.c \
    47         $(STRUCTURES)dynamic_fifo.c \
    48         $(STRUCTURES)measured_strings.c
    49 
    50 include $(NET_BASE)Makefile.module
     43include $(USPACE_PREFIX)/Makefile.common

  • uspace/srv/net/netif/dp8390/Makefile

    rd99c1d2 r1b1164e8  
    11#
    2 # Copyright (c) 2009 Lukas Mejdrech
     2# Copyright (c) 2005 Martin Decky
     3# Copyright (c) 2007 Jakub Jermar
    34# All rights reserved.
    45#
    … …  
    2728#
    2829
    29 NAME = dp8390
     30NET_BASE = ../..
     31USPACE_PREFIX = ../../../..
     32ROOT_PATH = $(USPACE_PREFIX)/..
    3033
    31 NET_BASE = ../../
    32 STRUCTURES = $(NET_BASE)structures/
     34COMMON_MAKEFILE = $(ROOT_PATH)/Makefile.common
     35CONFIG_MAKEFILE = $(ROOT_PATH)/Makefile.config
    3336
    34 include $(NET_BASE)../../../Makefile.common
    35 include $(NET_BASE)../../../Makefile.config
     37BINARY = dp8390
    3638
    37 ## Sources
    38 #
     39-include $(COMMON_MAKEFILE)
     40-include $(CONFIG_MAKEFILE)
    3941
    40 OUTPUT = $(NAME)
    4142SOURCES = \
    42         $(NAME).c \
    43         $(NAME)_module.c \
     43        dp8390.c \
     44        dp8390_module.c \
    4445        ne2000.c \
    45         $(NET_BASE)module.c \
    46         $(NET_BASE)modules.c \
    47         $(NET_BASE)netif/netif.c \
    48         $(STRUCTURES)measured_strings.c \
    49         $(STRUCTURES)packet/packet.c \
    50         $(STRUCTURES)packet/packet_client.c \
    51         $(STRUCTURES)packet/packet_remote.c
     46        $(NET_BASE)/module.c \
     47        $(NET_BASE)/modules.c \
     48        $(NET_BASE)/netif/netif.c \
     49        $(NET_BASE)/structures/measured_strings.c \
     50        $(NET_BASE)/structures/packet/packet.c \
     51        $(NET_BASE)/structures/packet/packet_client.c \
     52        $(NET_BASE)/structures/packet/packet_remote.c
    5253
    53 ifeq ($(NETWORKING), module)
    54 
    55         SOURCES +=      $(NET_BASE)checksum.c \
    56                                 $(NET_BASE)nil/eth/eth.c \
    57                                 $(NET_BASE)net/net_remote.c \
    58                                 $(NET_BASE)netif/netif_nil_bundle.c
    59 
    60 else
    61 
    62         SOURCES +=      $(NET_BASE)nil/nil_remote.c \
    63                                 $(NET_BASE)netif/netif_standalone.c
    64 
     54ifeq ($(CONFIG_NETWORKING),module)
     55        SOURCES += \
     56                $(NET_BASE)/checksum.c \
     57                $(NET_BASE)/nil/eth/eth.c \
     58                $(NET_BASE)/net/net_remote.c \
     59                $(NET_BASE)/netif/netif_nil_bundle.c
    6560endif
    6661
    67 include $(NET_BASE)Makefile.module
     62ifeq ($(CONFIG_NETWORKING),modular)
     63        SOURCES += \
     64                $(NET_BASE)/nil/nil_remote.c \
     65                $(NET_BASE)/netif/netif_standalone.c
     66endif
     67
     68include $(USPACE_PREFIX)/Makefile.common

  • uspace/srv/net/netif/lo/Makefile

    rd99c1d2 r1b1164e8  
    11#
    2 # Copyright (c) 2009 Lukas Mejdrech
     2# Copyright (c) 2005 Martin Decky
     3# Copyright (c) 2007 Jakub Jermar
    34# All rights reserved.
    45#
    … …  
    2728#
    2829
    29 NAME = lo
     30NET_BASE = ../..
     31USPACE_PREFIX = ../../../..
     32ROOT_PATH = $(USPACE_PREFIX)/..
    3033
    31 NET_BASE = ../../
    32 STRUCTURES = $(NET_BASE)structures/
     34COMMON_MAKEFILE = $(ROOT_PATH)/Makefile.common
     35CONFIG_MAKEFILE = $(ROOT_PATH)/Makefile.config
    3336
    34 include $(NET_BASE)../../../Makefile.common
    35 include $(NET_BASE)../../../Makefile.config
     37BINARY = lo
    3638
    37 ## Sources
    38 #
     39-include $(COMMON_MAKEFILE)
     40-include $(CONFIG_MAKEFILE)
    3941
    40 OUTPUT = $(NAME)
    4142SOURCES = \
    42         $(NAME).c \
    43         $(NET_BASE)module.c \
    44         $(NET_BASE)modules.c \
    45         $(NET_BASE)net/net_remote.c \
    46         $(NET_BASE)netif/netif.c \
    47         $(STRUCTURES)measured_strings.c \
    48         $(STRUCTURES)packet/packet.c \
    49         $(STRUCTURES)packet/packet_client.c \
    50         $(STRUCTURES)packet/packet_remote.c
     43        lo.c \
     44        $(NET_BASE)/module.c \
     45        $(NET_BASE)/modules.c \
     46        $(NET_BASE)/net/net_remote.c \
     47        $(NET_BASE)/netif/netif.c \
     48        $(NET_BASE)/structures/measured_strings.c \
     49        $(NET_BASE)/structures/packet/packet.c \
     50        $(NET_BASE)/structures/packet/packet_client.c \
     51        $(NET_BASE)/structures/packet/packet_remote.c
    5152
    52 ifeq ($(NETWORKING), module)
    53 
    54         SOURCES +=      $(NET_BASE)nil/nildummy/nildummy.c \
    55                                 $(NET_BASE)netif/netif_nil_bundle.c
    56 
    57 else
    58 
    59         SOURCES +=      $(NET_BASE)nil/nil_remote.c \
    60                                 $(NET_BASE)netif/netif_standalone.c
    61 
     53ifeq ($(CONFIG_NETWORKING),module)
     54        SOURCES += \
     55                $(NET_BASE)/nil/nildummy/nildummy.c \
     56                $(NET_BASE)/netif/netif_nil_bundle.c
    6257endif
    6358
    64 include $(NET_BASE)Makefile.module
     59ifeq ($(CONFIG_NETWORKING),modular)
     60        SOURCES += \
     61                $(NET_BASE)/nil/nil_remote.c \
     62                $(NET_BASE)/netif/netif_standalone.c
     63endif
     64
     65include $(USPACE_PREFIX)/Makefile.common

  • uspace/srv/net/nil/eth/Makefile

    rd99c1d2 r1b1164e8  
    11#
    2 # Copyright (c) 2009 Lukas Mejdrech
     2# Copyright (c) 2005 Martin Decky
     3# Copyright (c) 2007 Jakub Jermar
    34# All rights reserved.
    45#
    … …  
    2728#
    2829
    29 NAME = eth
     30NET_BASE = ../..
     31USPACE_PREFIX = ../../../..
     32BINARY = eth
    3033
    31 NET_BASE = ../../
    32 STRUCTURES = $(NET_BASE)structures/
     34SOURCES = \
     35        eth.c \
     36        eth_module.c \
     37        $(NET_BASE)/checksum.c \
     38        $(NET_BASE)/module.c \
     39        $(NET_BASE)/modules.c \
     40        $(NET_BASE)/net/net_remote.c \
     41        $(NET_BASE)/netif/netif_remote.c \
     42        $(NET_BASE)/structures/measured_strings.c \
     43        $(NET_BASE)/structures/packet/packet.c \
     44        $(NET_BASE)/structures/packet/packet_client.c \
     45        $(NET_BASE)/structures/packet/packet_remote.c
    3346
    34 OUTPUT = $(NAME)
    35 SOURCES = \
    36         $(NAME).c \
    37         $(NAME)_module.c \
    38         $(NET_BASE)checksum.c \
    39         $(NET_BASE)module.c \
    40         $(NET_BASE)modules.c \
    41         $(NET_BASE)net/net_remote.c \
    42         $(NET_BASE)netif/netif_remote.c \
    43         $(STRUCTURES)measured_strings.c \
    44         $(STRUCTURES)packet/packet.c \
    45         $(STRUCTURES)packet/packet_client.c \
    46         $(STRUCTURES)packet/packet_remote.c
    47 
    48 include $(NET_BASE)Makefile.module
     47include $(USPACE_PREFIX)/Makefile.common

  • uspace/srv/net/nil/nildummy/Makefile

    rd99c1d2 r1b1164e8  
    11#
    2 # Copyright (c) 2009 Lukas Mejdrech
     2# Copyright (c) 2005 Martin Decky
     3# Copyright (c) 2007 Jakub Jermar
    34# All rights reserved.
    45#
    … …  
    2728#
    2829
    29 NAME = nildummy
     30NET_BASE = ../..
     31USPACE_PREFIX = ../../../..
     32BINARY = nildummy
    3033
    31 NET_BASE = ../../
    32 STRUCTURES = $(NET_BASE)structures/
     34SOURCES = \
     35        nildummy.c \
     36        nildummy_module.c \
     37        $(NET_BASE)/module.c \
     38        $(NET_BASE)/modules.c \
     39        $(NET_BASE)/net/net_remote.c \
     40        $(NET_BASE)/netif/netif_remote.c \
     41        $(NET_BASE)/structures/measured_strings.c \
     42        $(NET_BASE)/structures/packet/packet.c \
     43        $(NET_BASE)/structures/packet/packet_client.c \
     44        $(NET_BASE)/structures/packet/packet_remote.c
    3345
    34 OUTPUT = $(NAME)
    35 SOURCES = \
    36         $(NAME).c \
    37         $(NAME)_module.c \
    38         $(NET_BASE)module.c \
    39         $(NET_BASE)modules.c \
    40         $(NET_BASE)net/net_remote.c \
    41         $(NET_BASE)netif/netif_remote.c \
    42         $(STRUCTURES)measured_strings.c \
    43         $(STRUCTURES)packet/packet.c \
    44         $(STRUCTURES)packet/packet_client.c \
    45         $(STRUCTURES)packet/packet_remote.c
    46 
    47 include $(NET_BASE)Makefile.module
     46include $(USPACE_PREFIX)/Makefile.common

  • uspace/srv/net/socket/Makefile

    rd99c1d2 r1b1164e8  
    11#
    2 # Copyright (c) 2009 Lukas Mejdrech
     2# Copyright (c) 2005 Martin Decky
     3# Copyright (c) 2007 Jakub Jermar
    34# All rights reserved.
    45#
    … …  
    2728#
    2829
    29 NAME = socket
     30NET_BASE = ..
     31USPACE_PREFIX = ../../..
     32LIBRARY = libsocket
    3033
    31 NET_BASE = ../
    32 STRUCTURES = $(NET_BASE)structures/
     34SOURCES = \
     35        socket_client.c \
     36        $(NET_BASE)/inet.c \
     37        $(NET_BASE)/modules.c \
     38        $(NET_BASE)/structures/dynamic_fifo.c
    3339
    34 ## Sources
    35 #
    36 
    37 LIB = lib$(NAME).a
    38 SOURCES = \
    39         $(NAME)_client.c \
    40         $(NET_BASE)inet.c \
    41         $(NET_BASE)modules.c \
    42         $(STRUCTURES)dynamic_fifo.c
    43 
    44 include $(NET_BASE)Makefile.module
     40include $(USPACE_PREFIX)/Makefile.common

  • uspace/srv/net/tl/icmp/Makefile

    rd99c1d2 r1b1164e8  
    11#
    2 # Copyright (c) 2009 Lukas Mejdrech
     2# Copyright (c) 2005 Martin Decky
     3# Copyright (c) 2007 Jakub Jermar
    34# All rights reserved.
    45#
    … …  
    2728#
    2829
    29 NAME = icmp
     30NET_BASE = ../..
     31USPACE_PREFIX = ../../../..
     32BINARY = icmp
    3033
    31 NET_BASE = ../../
    32 STRUCTURES = $(NET_BASE)structures/
     34SOURCES = \
     35        icmp.c \
     36        icmp_module.c \
     37        icmp_client.c \
     38        $(NET_BASE)/checksum.c \
     39        $(NET_BASE)/module.c \
     40        $(NET_BASE)/modules.c \
     41        $(NET_BASE)/il/ip/ip_client.c \
     42        $(NET_BASE)/il/ip/ip_remote.c \
     43        $(NET_BASE)/net/net_remote.c \
     44        $(NET_BASE)/structures/measured_strings.c \
     45        $(NET_BASE)/structures/packet/packet.c \
     46        $(NET_BASE)/structures/packet/packet_client.c \
     47        $(NET_BASE)/structures/packet/packet_remote.c
    3348
    34 ## Sources
    35 #
    36 
    37 OUTPUT = $(NAME)
    38 SOURCES = \
    39         $(NAME).c \
    40         $(NAME)_module.c \
    41         $(NAME)_client.c \
    42         $(NET_BASE)checksum.c \
    43         $(NET_BASE)module.c \
    44         $(NET_BASE)modules.c \
    45         $(NET_BASE)il/ip/ip_client.c \
    46         $(NET_BASE)il/ip/ip_remote.c \
    47         $(NET_BASE)net/net_remote.c \
    48         $(STRUCTURES)measured_strings.c \
    49         $(STRUCTURES)packet/packet.c \
    50         $(STRUCTURES)packet/packet_client.c \
    51         $(STRUCTURES)packet/packet_remote.c
    52 
    53 include $(NET_BASE)Makefile.module
     49include $(USPACE_PREFIX)/Makefile.common

  • uspace/srv/net/tl/tcp/Makefile

    rd99c1d2 r1b1164e8  
    11#
    2 # Copyright (c) 2009 Lukas Mejdrech
     2# Copyright (c) 2005 Martin Decky
     3# Copyright (c) 2007 Jakub Jermar
    34# All rights reserved.
    45#
    … …  
    2728#
    2829
    29 NAME = tcp
     30NET_BASE = ../..
     31USPACE_PREFIX = ../../../..
     32BINARY = tcp
    3033
    31 NET_BASE = ../../
    32 STRUCTURES = $(NET_BASE)structures/
     34SOURCES = \
     35        tcp.c \
     36        tcp_module.c \
     37        $(NET_BASE)/checksum.c \
     38        $(NET_BASE)/module.c \
     39        $(NET_BASE)/modules.c \
     40        $(NET_BASE)/il/ip/ip_client.c \
     41        $(NET_BASE)/il/ip/ip_remote.c \
     42        $(NET_BASE)/net/net_remote.c \
     43        $(NET_BASE)/socket/socket_core.c \
     44        $(NET_BASE)/tl/icmp/icmp_client.c \
     45        $(NET_BASE)/tl/icmp/icmp_common.c \
     46        $(NET_BASE)/tl/icmp/icmp_remote.c \
     47        $(NET_BASE)/tl/tl_common.c \
     48        $(NET_BASE)/structures/char_map.c \
     49        $(NET_BASE)/structures/dynamic_fifo.c \
     50        $(NET_BASE)/structures/measured_strings.c \
     51        $(NET_BASE)/structures/packet/packet.c \
     52        $(NET_BASE)/structures/packet/packet_client.c \
     53        $(NET_BASE)/structures/packet/packet_remote.c
    3354
    34 ## Sources
    35 #
    36 
    37 OUTPUT = $(NAME)
    38 SOURCES = \
    39         $(NAME).c \
    40         $(NAME)_module.c \
    41         $(NET_BASE)checksum.c \
    42         $(NET_BASE)module.c \
    43         $(NET_BASE)modules.c \
    44         $(NET_BASE)il/ip/ip_client.c \
    45         $(NET_BASE)il/ip/ip_remote.c \
    46         $(NET_BASE)net/net_remote.c \
    47         $(NET_BASE)socket/socket_core.c \
    48         $(NET_BASE)tl/icmp/icmp_client.c \
    49         $(NET_BASE)tl/icmp/icmp_common.c \
    50         $(NET_BASE)tl/icmp/icmp_remote.c \
    51         $(NET_BASE)tl/tl_common.c \
    52         $(STRUCTURES)char_map.c \
    53         $(STRUCTURES)dynamic_fifo.c \
    54         $(STRUCTURES)measured_strings.c \
    55         $(STRUCTURES)packet/packet.c \
    56         $(STRUCTURES)packet/packet_client.c \
    57         $(STRUCTURES)packet/packet_remote.c
    58 
    59 include $(NET_BASE)Makefile.module
     55include $(USPACE_PREFIX)/Makefile.common

  • uspace/srv/net/tl/udp/Makefile

    rd99c1d2 r1b1164e8  
    11#
    2 # Copyright (c) 2009 Lukas Mejdrech
     2# Copyright (c) 2005 Martin Decky
     3# Copyright (c) 2007 Jakub Jermar
    34# All rights reserved.
    45#
    … …  
    2728#
    2829
    29 NAME = udp
     30NET_BASE = ../..
     31USPACE_PREFIX = ../../../..
     32BINARY = udp
    3033
    31 NET_BASE = ../../
    32 STRUCTURES = $(NET_BASE)structures/
     34SOURCES = \
     35        udp.c \
     36        udp_module.c \
     37        $(NET_BASE)/checksum.c \
     38        $(NET_BASE)/module.c \
     39        $(NET_BASE)/modules.c \
     40        $(NET_BASE)/il/ip/ip_client.c \
     41        $(NET_BASE)/il/ip/ip_remote.c \
     42        $(NET_BASE)/net/net_remote.c \
     43        $(NET_BASE)/socket/socket_core.c \
     44        $(NET_BASE)/tl/icmp/icmp_client.c \
     45        $(NET_BASE)/tl/icmp/icmp_common.c \
     46        $(NET_BASE)/tl/icmp/icmp_remote.c \
     47        $(NET_BASE)/tl/tl_common.c \
     48        $(NET_BASE)/structures/char_map.c \
     49        $(NET_BASE)/structures/dynamic_fifo.c \
     50        $(NET_BASE)/structures/measured_strings.c \
     51        $(NET_BASE)/structures/packet/packet.c \
     52        $(NET_BASE)/structures/packet/packet_client.c \
     53        $(NET_BASE)/structures/packet/packet_remote.c
    3354
    34 ## Sources
    35 #
    36 
    37 OUTPUT = $(NAME)
    38 SOURCES = \
    39         $(NAME).c \
    40         $(NAME)_module.c \
    41         $(NET_BASE)checksum.c \
    42         $(NET_BASE)module.c \
    43         $(NET_BASE)modules.c \
    44         $(NET_BASE)il/ip/ip_client.c \
    45         $(NET_BASE)il/ip/ip_remote.c \
    46         $(NET_BASE)net/net_remote.c \
    47         $(NET_BASE)socket/socket_core.c \
    48         $(NET_BASE)tl/icmp/icmp_client.c \
    49         $(NET_BASE)tl/icmp/icmp_common.c \
    50         $(NET_BASE)tl/icmp/icmp_remote.c \
    51         $(NET_BASE)tl/tl_common.c \
    52         $(STRUCTURES)char_map.c \
    53         $(STRUCTURES)dynamic_fifo.c \
    54         $(STRUCTURES)measured_strings.c \
    55         $(STRUCTURES)packet/packet.c \
    56         $(STRUCTURES)packet/packet_client.c \
    57         $(STRUCTURES)packet/packet_remote.c
    58 
    59 include $(NET_BASE)Makefile.module
     55include $(USPACE_PREFIX)/Makefile.common

  • uspace/srv/ns/Makefile

    rd99c1d2 r1b1164e8  
    2929
    3030USPACE_PREFIX = ../..
    31 LIBS = $(LIBC_PREFIX)/libc.a
    32 
    33 OUTPUT = ns
     31BINARY = ns
    3432
    3533SOURCES = \
    … …  
    3937        task.c
    4038
    41 include ../Makefile.common
     39include $(USPACE_PREFIX)/Makefile.common

  • uspace/srv/taskmon/Makefile

    rd99c1d2 r1b1164e8  
    2828
    2929USPACE_PREFIX = ../..
    30 LIBS = $(LIBC_PREFIX)/libc.a
    31 
    32 OUTPUT = taskmon
     30BINARY = taskmon
    3331
    3432SOURCES = \
    3533        taskmon.c
    3634
    37 include ../Makefile.common
     35include $(USPACE_PREFIX)/Makefile.common

  • uspace/srv/vfs/Makefile

    rd99c1d2 r1b1164e8  
    2929
    3030USPACE_PREFIX = ../..
    31 LIBS = $(LIBC_PREFIX)/libc.a
    32 
    33 OUTPUT = vfs
     31BINARY = vfs
    3432
    3533SOURCES = \
    … …  
    4139        vfs_register.c
    4240
    43 include ../Makefile.common
     41include $(USPACE_PREFIX)/Makefile.common
Note: See TracChangeset for help on using the changeset viewer.