Changes in / [cec261e:dc9162b] in mainline


Ignore:
Location:
uspace
Files:
14 added
1 deleted
15 edited

Legend:

Unmodified
Added
Removed

  • uspace/lib/libblock/Makefile

    rcec261e rdc9162b  
    2828#
    2929
    30 USPACE_PREFIX = ../..
    31 LIBS = $(LIBC_PREFIX)/libc.a
     30include Makefile.common
    3231
    33 OUTPUT = libblock.a
     32.PHONY: all clean
    3433
    35 SOURCES = \
    36         libblock.c
     34all: $(LIBC_PREFIX)/../../../Makefile.config $(LIBC_PREFIX)/../../../config.h $(LIBC_PREFIX)/../../../config.defs $(LIBC_PREFIX)/libc.a
     35        -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV)
     36        $(MAKE) -f Makefile.build PRECHECK=$(PRECHECK)
    3737
    38 include ../Makefile.common
     38clean:
     39        rm -f $(DEPEND) $(DEPEND_PREV) $(JOB) $(LIBBLOCK)
     40        find . -name '*.o' -follow -exec rm \{\} \;

  • uspace/lib/libc/Makefile

    rcec261e rdc9162b  
    11#
    22# Copyright (c) 2005 Martin Decky
    3 # Copyright (c) 2007 Jakub Jermar
    43# All rights reserved.
    54#
    … …  
    2827#
    2928
    30 -include ../../../Makefile.config
     29include Makefile.common
    3130
    32 USPACE_PREFIX = $(shell pwd)/../..
    33 #LIBS = $(LIBC_PREFIX)/libc.a
    34 LIBS =
     31.PHONY: all clean
    3532
    36 LINK = arch/$(UARCH)/_link.ld
     33all: ../../../Makefile.config ../../../config.h ../../../config.defs
     34        -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV)
     35        $(MAKE) -f Makefile.build PRECHECK=$(PRECHECK)
    3736
    38 PRE_DEPEND = $(INCLUDE_KERNEL) $(INCLUDE_ARCH) $(INCLUDE_LIBARCH)
    39 EXTRA_CLEAN = $(INCLUDE_KERNEL) $(INCLUDE_ARCH) $(INCLUDE_LIBARCH)
    40 EXTRA_OUTPUT = $(LINK)
    41 
    42 INCLUDE_KERNEL = include/kernel
    43 INCLUDE_ARCH = include/arch
    44 INCLUDE_LIBARCH = include/libarch
    45 
    46 OUTPUT = libc.a
    47 
    48 GENERIC_SOURCES = \
    49         generic/libc.c \
    50         generic/ddi.c \
    51         generic/as.c \
    52         generic/cap.c \
    53         generic/clipboard.c \
    54         generic/devmap.c \
    55         generic/event.c \
    56         generic/errno.c \
    57         generic/mem.c \
    58         generic/string.c \
    59         generic/fibril.c \
    60         generic/fibril_synch.c \
    61         generic/pcb.c \
    62         generic/smc.c \
    63         generic/thread.c \
    64         generic/tls.c \
    65         generic/task.c \
    66         generic/futex.c \
    67         generic/io/asprintf.c \
    68         generic/io/io.c \
    69         generic/io/printf.c \
    70         generic/io/klog.c \
    71         generic/io/snprintf.c \
    72         generic/io/vprintf.c \
    73         generic/io/vsnprintf.c \
    74         generic/io/printf_core.c \
    75         generic/io/console.c \
    76         generic/malloc.c \
    77         generic/sysinfo.c \
    78         generic/ipc.c \
    79         generic/async.c \
    80         generic/loader.c \
    81         generic/getopt.c \
    82         generic/adt/list.o \
    83         generic/adt/hash_table.o \
    84         generic/time.c \
    85         generic/err.c \
    86         generic/stdlib.c \
    87         generic/mman.c \
    88         generic/udebug.c \
    89         generic/vfs/vfs.c \
    90         generic/vfs/canonify.c \
    91         generic/stacktrace.c
    92 
    93 ARCH_SOURCES = \
    94         arch/$(UARCH)/src/entry.s \
    95         arch/$(UARCH)/src/thread_entry.s
    96 
    97 SOURCES = \
    98         $(GENERIC_SOURCES) \
    99         $(ARCH_SOURCES)
    100 
    101 include ../Makefile.common
    102 
    103 $(INCLUDE_ARCH): $(INCLUDE_KERNEL) $(INCLUDE_KERNEL)/arch
    104         ln -sfn kernel/arch $@
    105 
    106 $(INCLUDE_LIBARCH): arch/$(UARCH)/include
    107         ln -sfn ../$< $@
    108 
    109 $(INCLUDE_KERNEL)/arch: ../../../kernel/generic/include/arch $(INCLUDE_KERNEL)
    110 
    111 $(INCLUDE_KERNEL): ../../../kernel/generic/include/
    112         ln -sfn ../$< $@
    113 
    114 $(LINK): $(LINK).in
    115         $(GCC) $(DEFS) $(CFLAGS) -DLIBC_PREFIX=$(LIBC_PREFIX) -E -x c $< | grep -v "^\#" > $@
     37clean:
     38        rm -f $(DEPEND) $(DEPEND_PREV) $(JOB) $(INCLUDE_KERNEL) $(INCLUDE_ARCH) $(INCLUDE_LIBARCH) $(LIBC) arch/*/_link.ld
     39        find generic/ arch/*/ -name '*.o' -follow -exec rm \{\} \;

  • uspace/lib/libc/Makefile.toolchain

    rcec261e rdc9162b  
    5959#
    6060
    61 -include $(LIBC_PREFIX)/../../../Makefile.config
    62 -include $(LIBC_PREFIX)/../../../config.defs
    63 -include $(LIBC_PREFIX)/arch/$(UARCH)/Makefile.inc
     61include $(LIBC_PREFIX)/../../../Makefile.config
     62include $(LIBC_PREFIX)/../../../config.defs
     63include $(LIBC_PREFIX)/arch/$(UARCH)/Makefile.inc
    6464
    6565## Simple detection of the host system

  • uspace/lib/libfs/Makefile

    rcec261e rdc9162b  
    2828#
    2929
    30 USPACE_PREFIX = ../..
    31 LIBS = $(LIBC_PREFIX)/libc.a
     30include Makefile.common
    3231
    33 OUTPUT = libfs.a
     32.PHONY: all clean
    3433
    35 SOURCES = \
    36         libfs.c
     34all: $(LIBC_PREFIX)/../../../Makefile.config $(LIBC_PREFIX)/../../../config.h $(LIBC_PREFIX)/../../../config.defs $(LIBC_PREFIX)/libc.a
     35        -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV)
     36        $(MAKE) -f Makefile.build PRECHECK=$(PRECHECK)
    3737
    38 include ../Makefile.common
     38clean:
     39        rm -f $(DEPEND) $(DEPEND_PREV) $(JOB) $(LIBFS)
     40        find . -name '*.o' -follow -exec rm \{\} \;

  • uspace/lib/libpci/Makefile

    rcec261e rdc9162b  
    2828#
    2929
    30 USPACE_PREFIX = ../..
    31 LIBS = $(LIBC_PREFIX)/libc.a
     30include Makefile.common
    3231
    33 OUTPUT = libpci.a
     32.PHONY: all clean
    3433
    35 SOURCES = \
    36         access.c \
    37         generic.c \
    38         names.c \
    39         i386-ports.c
     34all: $(LIBC_PREFIX)/../../../Makefile.config $(LIBC_PREFIX)/../../../config.h $(LIBC_PREFIX)/../../../config.defs $(LIBC_PREFIX)/libc.a
     35        -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV)
     36        $(MAKE) -f Makefile.build PRECHECK=$(PRECHECK)
    4037
    41 include ../Makefile.common
     38clean:
     39        rm -f $(DEPEND) $(DEPEND_PREV) $(JOB) $(LIBPCI)
     40        find . -name '*.o' -follow -exec rm \{\} \;

  • uspace/lib/softfloat/Makefile

    rcec261e rdc9162b  
    2828#
    2929
    30 USPACE_PREFIX = ../..
    31 LIBS = $(LIBC_PREFIX)/libc.a
    32 EXTRA_CFLAGS += -Iinclude -Iarch/$(UARCH)/include/
     30include Makefile.common
    3331
    34 OUTPUT = libsoftfloat.a
     32.PHONY: all clean
    3533
    36 SOURCES = \
    37         generic/add.c \
    38         generic/common.c \
    39         generic/comparison.c \
    40         generic/conversion.c \
    41         generic/div.c \
    42         generic/mul.c \
    43         generic/other.c \
    44         generic/softfloat.c \
    45         generic/sub.c
     34all: $(LIBC_PREFIX)/../../../Makefile.config $(LIBC_PREFIX)/../../../config.h $(LIBC_PREFIX)/../../../config.defs $(LIBC_PREFIX)/libc.a
     35        -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV)
     36        $(MAKE) -f Makefile.build PRECHECK=$(PRECHECK)
    4637
    47 include ../Makefile.common
     38clean:
     39        rm -f $(DEPEND) $(DEPEND_PREV) $(JOB) $(LIBSOFTFLOAT)
     40        find . -name '*.o' -follow -exec rm \{\} \;

  • uspace/lib/softint/Makefile

    rcec261e rdc9162b  
    2828#
    2929
    30 USPACE_PREFIX = ../..
    31 LIBS = $(LIBC_PREFIX)/libc.a
    32 EXTRA_CFLAGS = -Iinclude
     30include Makefile.common
    3331
    34 OUTPUT = libsoftint.a
     32.PHONY: all clean
    3533
    36 SOURCES = \
    37         generic/division.c\
    38         generic/multiplication.c
     34all: $(LIBC_PREFIX)/../../../Makefile.config $(LIBC_PREFIX)/../../../config.h $(LIBC_PREFIX)/../../../config.defs $(LIBC_PREFIX)/libc.a
     35        -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV)
     36        $(MAKE) -f Makefile.build PRECHECK=$(PRECHECK)
    3937
    40 include ../Makefile.common
     38clean:
     39        rm -f $(DEPEND) $(DEPEND_PREV) $(JOB) $(LIBSOFTINT)
     40        find . -name '*.o' -follow -exec rm \{\} \;

  • uspace/srv/loader/Makefile

    rcec261e rdc9162b  
    2828#
    2929
    30 -include ../../../Makefile.config
    31 include arch/$(UARCH)/Makefile.inc
     30include Makefile.common
    3231
    33 USPACE_PREFIX = ../..
    34 LIBS = $(LIBC_PREFIX)/libc.a
    35 EXTRA_CFLAGS += -Iinclude
     32.PHONY: all clean
    3633
    37 OUTPUT = loader
     34all: $(LIBC_PREFIX)/../../../Makefile.config $(LIBC_PREFIX)/../../../config.h $(LIBC_PREFIX)/../../../config.defs $(LIBS)
     35        -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV)
     36        $(MAKE) -f Makefile.build PRECHECK=$(PRECHECK)
    3837
    39 GENERIC_SOURCES = \
    40         main.c \
    41         elf_load.c \
    42         interp.s
    43 
    44 SOURCES := $(GENERIC_SOURCES) $(ARCH_SOURCES)
    45 OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
    46 
    47 include ../Makefile.common
     38clean:
     39        rm -f $(DEPEND) $(DEPEND_PREV) $(JOB) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm arch/*/_link.ld
     40        find . -name '*.o' -follow -exec rm \{\} \;

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

    rcec261e rdc9162b  
    2727#
    2828
    29 EXTRA_CFLAGS = -D__64_BITS__
     29CFLAGS += -D__64_BITS__
    3030ARCH_SOURCES := arch/$(UARCH)/amd64.s

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

    rcec261e rdc9162b  
    2727#
    2828
    29 EXTRA_CFLAGS = -D__32_BITS__
     29CFLAGS += -D__32_BITS__
    3030ARCH_SOURCES := arch/$(UARCH)/arm32.s

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

    rcec261e rdc9162b  
    2727#
    2828
    29 EXTRA_CFLAGS = -D__32_BITS__
     29CFLAGS += -D__32_BITS__
    3030ARCH_SOURCES := arch/$(UARCH)/ia32.s

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

    rcec261e rdc9162b  
    2727#
    2828
    29 EXTRA_CFLAGS = -D__64_BITS__
     29CFLAGS += -D__64_BITS__
    3030ARCH_SOURCES := arch/$(UARCH)/ia64.s
    3131AFLAGS += -xexplicit

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

    rcec261e rdc9162b  
    2727#
    2828
    29 EXTRA_CFLAGS = -D__32_BITS__
     29CFLAGS += -D__32_BITS__
    3030ARCH_SOURCES := arch/$(UARCH)/mips32.s

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

    rcec261e rdc9162b  
    2727#
    2828
    29 EXTRA_CFLAGS = -D__32_BITS__
     29CFLAGS += -D__32_BITS__
    3030ARCH_SOURCES := arch/$(UARCH)/ppc32.s

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

    rcec261e rdc9162b  
    2727#
    2828
    29 EXTRA_CFLAGS = -D__64_BITS__
     29CFLAGS += -D__64_BITS__
    3030ARCH_SOURCES := arch/$(UARCH)/sparc64.s
Note: See TracChangeset for help on using the changeset viewer.