Changeset 1b1164e8 in mainline for uspace/lib


Ignore:
Timestamp:
2010-03-23T14:44:00Z (16 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

Location:
uspace/lib
Files:
5 added
2 deleted
24 edited
4 moved

Legend:

Unmodified
Added
Removed

  • 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
Note: See TracChangeset for help on using the changeset viewer.