Changes in / [b86d436:8e33e1d] in mainline


Ignore:
Files:
81 added
18 deleted
46 edited

Legend:

Unmodified
Added
Removed

  • boot/arch/ia64/loader/gefi/HelenOS/Makefile

    rb86d436 r8e33e1d  
    3333FORMAT          = efi-app-$(ARCH)
    3434
    35 all:    hello.efi
     35all:    gefi hello.efi
    3636
    3737clean:
    … …  
    4646#When selected first lines or second lines, select if image is linked into hello or not - usefull for network boot
    4747#hello.so: hello.o image.o division.o
    48 hello.so: hello.o image.bin division.o gefi
     48hello.so: hello.o image.bin division.o
    4949#       $(LD) $(LDFLAGS) -Map hello.map hello.o division.o image.o -o hello.so $(LOADLIBES) #link image inside hello
    5050        $(LD) $(LDFLAGS) -Map hello.map hello.o division.o -o hello.so $(LOADLIBES) #dont link image inside hello

  • uspace/Makefile

    rb86d436 r8e33e1d  
    8181        lib/libblock \
    8282        lib/softint \
    83         lib/softfloat \
    84 
    85 ifeq ($(UARCH),amd64)
    86         LIBS += lib/libpci
    87 endif
    88 
    89 ifeq ($(UARCH),ia32)
    90         LIBS += lib/libpci
    91 endif
    92 
     83        lib/softfloat
    9384
    9485LIBC_BUILD = $(addsuffix .build,$(LIBC))

  • uspace/app/bdsh/Makefile

    rb86d436 r8e33e1d  
    2828#
    2929
    30 USPACE_PREFIX = ../..
    31 LIBS = $(LIBBLOCK_PREFIX)/libblock.a $(LIBC_PREFIX)/libc.a
    32 EXTRA_CFLAGS = -I$(LIBBLOCK_PREFIX) -I. -Icmds/ -Icmds/builtins -Icmds/modules
     30include Makefile.common
    3331
    34 OUTPUT = bdsh
     32.PHONY: all clean
    3533
    36 SOURCES = \
    37         cmds/modules/help/help.c \
    38         cmds/modules/mkdir/mkdir.c \
    39         cmds/modules/mkfile/mkfile.c \
    40         cmds/modules/rm/rm.c \
    41         cmds/modules/bdd/bdd.c \
    42         cmds/modules/cat/cat.c \
    43         cmds/modules/touch/touch.c \
    44         cmds/modules/ls/ls.c \
    45         cmds/modules/pwd/pwd.c \
    46         cmds/modules/sleep/sleep.c \
    47         cmds/modules/cp/cp.c \
    48         cmds/modules/mv/mv.c \
    49         cmds/modules/mount/mount.c \
    50         cmds/modules/kcon/kcon.c \
    51         cmds/builtins/exit/exit.c \
    52         cmds/builtins/cd/cd.c \
    53         cmds/mod_cmds.c \
    54         cmds/builtin_cmds.c \
    55         errors.c \
    56         input.c \
    57         util.c \
    58         exec.c \
    59         scli.c
     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)
    6037
    61 include ../Makefile.common
     38clean:
     39        rm -f $(DEPEND) $(DEPEND_PREV) $(JOB) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm
     40        find . -name '*.o' -follow -exec rm \{\} \;

  • uspace/app/edit/Makefile

    rb86d436 r8e33e1d  
    2828#
    2929
    30 USPACE_PREFIX = ../..
    31 LIBS = $(LIBC_PREFIX)/libc.a
     30include Makefile.common
    3231
    33 OUTPUT = edit
     32.PHONY: all clean
    3433
    35 SOURCES = \
    36         edit.c \
    37         sheet.c
     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 include ../Makefile.common
     38clean:
     39        rm -f $(DEPEND) $(DEPEND_PREV) $(JOB) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm
     40        find . -name '*.o' -follow -exec rm \{\} \;

  • uspace/app/getterm/Makefile

    rb86d436 r8e33e1d  
    2828#
    2929
    30 include ../../../version
    31 DEFS += -DRELEASE=$(RELEASE) "-DNAME=$(NAME)"
     30include Makefile.common
    3231
    33 USPACE_PREFIX = ../..
    34 LIBS = $(LIBC_PREFIX)/libc.a
     32.PHONY: all clean
    3533
    36 OUTPUT = getterm
     34all: $(LIBC_PREFIX)/../../../version $(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)
    3737
    38 SOURCES = \
    39         getterm.c \
    40         version.c
    41 
    42 include ../Makefile.common
     38clean:
     39        rm -f $(DEPEND) $(DEPEND_PREV) $(JOB) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm
     40        find . -name '*.o' -follow -exec rm \{\} \;

  • uspace/app/init/Makefile

    rb86d436 r8e33e1d  
    2828#
    2929
    30 USPACE_PREFIX = ../..
    31 LIBS = $(LIBC_PREFIX)/libc.a
     30include Makefile.common
    3231
    33 OUTPUT = init
     32.PHONY: all clean
    3433
    35 SOURCES = \
    36         init.c
     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)
    3737
    38 include ../Makefile.common
     38clean:
     39        rm -f $(DEPEND) $(DEPEND_PREV) $(JOB) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm
     40        find . -name '*.o' -follow -exec rm \{\} \;

  • uspace/app/klog/Makefile

    rb86d436 r8e33e1d  
    2828#
    2929
    30 USPACE_PREFIX = ../..
    31 LIBS = $(LIBC_PREFIX)/libc.a
     30include Makefile.common
    3231
    33 OUTPUT = klog
     32.PHONY: all clean
    3433
    35 SOURCES = \
    36         klog.c
     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)
    3737
    38 include ../Makefile.common
     38clean:
     39        rm -f $(DEPEND) $(DEPEND_PREV) $(JOB) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm
     40        find . -name '*.o' -follow -exec rm \{\} \;

  • uspace/app/mkfat/Makefile

    rb86d436 r8e33e1d  
    2828#
    2929
    30 USPACE_PREFIX = ../..
    31 LIBS = $(LIBBLOCK_PREFIX)/libblock.a $(LIBC_PREFIX)/libc.a
    32 EXTRA_CFLAGS = -I$(LIBBLOCK_PREFIX)
     30include Makefile.common
    3331
    34 OUTPUT = mkfat
     32.PHONY: all clean
    3533
    36 SOURCES = \
    37         mkfat.c
     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 include ../Makefile.common
     38clean:
     39        rm -f $(DEPEND) $(DEPEND_PREV) $(JOB) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm
     40        find . -name '*.o' -follow -exec rm \{\} \;

  • uspace/app/redir/Makefile

    rb86d436 r8e33e1d  
    2828#
    2929
    30 USPACE_PREFIX = ../..
    31 LIBS = $(LIBC_PREFIX)/libc.a
     30include Makefile.common
    3231
    33 OUTPUT = redir
     32.PHONY: all clean
    3433
    35 SOURCES = \
    36         redir.c
     34all: $(LIBC_PREFIX)/../../../version $(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)
    3737
    38 include ../Makefile.common
     38clean:
     39        rm -f $(DEPEND) $(DEPEND_PREV) $(JOB) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm
     40        find . -name '*.o' -follow -exec rm \{\} \;

  • uspace/app/tester/Makefile

    rb86d436 r8e33e1d  
    2828#
    2929
    30 USPACE_PREFIX = ../..
    31 LIBS = $(LIBC_PREFIX)/libc.a
     30include Makefile.common
    3231
    33 OUTPUT = tester
     32.PHONY: all clean
    3433
    35 SOURCES = \
    36         tester.c \
    37         thread/thread1.c \
    38         print/print1.c \
    39         print/print2.c \
    40         print/print3.c \
    41         print/print4.c \
    42         console/console1.c \
    43         stdio/stdio1.c \
    44         stdio/stdio2.c \
    45         fault/fault1.c \
    46         fault/fault2.c \
    47         fault/fault3.c \
    48         vfs/vfs1.c \
    49         ipc/ping_pong.c \
    50         ipc/register.c \
    51         ipc/connect.c \
    52         loop/loop1.c \
    53         mm/malloc1.c
     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)
    5437
    55 include ../Makefile.common
     38clean:
     39        rm -f $(DEPEND) $(DEPEND_PREV) $(JOB) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm
     40        find . -name '*.o' -follow -exec rm \{\} \;

  • uspace/app/tetris/Makefile

    rb86d436 r8e33e1d  
    2828#
    2929
    30 USPACE_PREFIX = ../..
    31 LIBS = $(LIBC_PREFIX)/libc.a
     30include Makefile.common
    3231
    33 OUTPUT = tetris
     32.PHONY: all clean
    3433
    35 SOURCES = \
    36         shapes.c \
    37         scores.c \
    38         input.c \
    39         tetris.c \
    40         screen.c
     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)
    4137
    42 include ../Makefile.common
     38clean:
     39        rm -f $(DEPEND) $(DEPEND_PREV) $(JOB) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm
     40        find . -name '*.o' -follow -exec rm \{\} \;

  • uspace/app/trace/Makefile

    rb86d436 r8e33e1d  
    2828#
    2929
    30 USPACE_PREFIX = ../..
    31 LIBS = $(LIBC_PREFIX)/libc.a
     30include Makefile.common
    3231
    33 OUTPUT = trace
     32.PHONY: all clean
    3433
    35 SOURCES = \
    36         trace.c \
    37         syscalls.c \
    38         ipcp.c \
    39         ipc_desc.c \
    40         proto.c \
    41         errors.c
     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)
    4237
    43 include ../Makefile.common
     38clean:
     39        rm -f $(DEPEND) $(DEPEND_PREV) $(JOB) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm
     40        find . -name '*.o' -follow -exec rm \{\} \;

  • uspace/lib/libblock/Makefile

    rb86d436 r8e33e1d  
    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

    rb86d436 r8e33e1d  
    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

    rb86d436 r8e33e1d  
    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

    rb86d436 r8e33e1d  
    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/softfloat/Makefile

    rb86d436 r8e33e1d  
    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

    rb86d436 r8e33e1d  
    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/bd/ata_bd/Makefile

    rb86d436 r8e33e1d  
    2828#
    2929
    30 USPACE_PREFIX = ../../..
    31 LIBS = $(LIBC_PREFIX)/libc.a
     30include Makefile.common
    3231
    33 OUTPUT = ata_bd
     32.PHONY: all clean
    3433
    35 SOURCES = \
    36         ata_bd.c
     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)
    3737
    38 include ../../Makefile.common
     38clean:
     39        rm -f $(DEPEND) $(DEPEND_PREV) $(JOB) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm
     40        find . -name '*.o' -follow -exec rm \{\} \;

  • uspace/srv/bd/file_bd/Makefile

    rb86d436 r8e33e1d  
    2828#
    2929
    30 USPACE_PREFIX = ../../..
    31 LIBS = $(LIBC_PREFIX)/libc.a
     30include Makefile.common
    3231
    33 OUTPUT = file_bd
     32.PHONY: all clean
    3433
    35 SOURCES = \
    36         file_bd.c
     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)
    3737
    38 include ../../Makefile.common
     38clean:
     39        rm -f $(DEPEND) $(DEPEND_PREV) $(JOB) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm
     40        find . -name '*.o' -follow -exec rm \{\} \;

  • uspace/srv/bd/gxe_bd/Makefile

    rb86d436 r8e33e1d  
    2828#
    2929
    30 USPACE_PREFIX = ../../..
    31 LIBS = $(LIBC_PREFIX)/libc.a
     30include Makefile.common
    3231
    33 OUTPUT = gxe_bd
     32.PHONY: all clean
    3433
    35 SOURCES = \
    36         gxe_bd.c
     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)
    3737
    38 include ../../Makefile.common
     38clean:
     39        rm -f $(DEPEND) $(DEPEND_PREV) $(JOB) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm
     40        find . -name '*.o' -follow -exec rm \{\} \;

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

    rb86d436 r8e33e1d  
    2828#
    2929
    30 USPACE_PREFIX = ../../../..
    31 LIBS = $(LIBBLOCK_PREFIX)/libblock.a $(LIBC_PREFIX)/libc.a
    32 EXTRA_CFLAGS = -I$(LIBBLOCK_PREFIX)
     30include Makefile.common
    3331
    34 OUTPUT = mbr_part
     32.PHONY: all clean
    3533
    36 SOURCES = \
    37         mbr_part.c
     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 include ../../../Makefile.common
     38clean:
     39        rm -f $(DEPEND) $(DEPEND_PREV) $(JOB) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm
     40        find . -name '*.o' -follow -exec rm \{\} \;

  • uspace/srv/bd/rd/Makefile

    rb86d436 r8e33e1d  
    2828#
    2929
    30 USPACE_PREFIX = ../../..
    31 LIBS = $(LIBC_PREFIX)/libc.a
     30include Makefile.common
    3231
    33 OUTPUT = rd
     32.PHONY: all clean
    3433
    35 SOURCES = \
    36         rd.c
     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)
    3737
    38 include ../../Makefile.common
     38clean:
     39        rm -f $(DEPEND) $(DEPEND_PREV) $(JOB) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm
     40        find . -name '*.o' -follow -exec rm \{\} \;

  • uspace/srv/clip/Makefile

    rb86d436 r8e33e1d  
    11#
    2 # Copyright (c) 2005 Martin Decky
    3 # Copyright (c) 2007 Jakub Jermar
     2# Copyright (c) 2009 Martin Decky
    43# All rights reserved.
    54#
    … …  
    2827#
    2928
    30 USPACE_PREFIX = ../..
    31 LIBS = $(LIBC_PREFIX)/libc.a
     29include Makefile.common
    3230
    33 OUTPUT = clip
     31.PHONY: all clean
    3432
    35 SOURCES = \
    36         clip.c
     33all: $(LIBC_PREFIX)/../../../Makefile.config $(LIBC_PREFIX)/../../../config.h $(LIBC_PREFIX)/../../../config.defs $(LIBS)
     34        -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV)
     35        $(MAKE) -f Makefile.build PRECHECK=$(PRECHECK)
    3736
    38 include ../Makefile.common
     37clean:
     38        rm -f $(DEPEND) $(DEPEND_PREV) $(JOB) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm
     39        find . -name '*.o' -follow -exec rm \{\} \;

  • uspace/srv/devmap/Makefile

    rb86d436 r8e33e1d  
    2828#
    2929
    30 USPACE_PREFIX = ../..
    31 LIBS = $(LIBC_PREFIX)/libc.a
     30include Makefile.common
    3231
    33 OUTPUT = devmap
     32.PHONY: all clean
    3433
    35 SOURCES = \
    36         devmap.c
     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)
    3737
    38 include ../Makefile.common
     38clean:
     39        rm -f $(DEPEND) $(DEPEND_PREV) $(JOB) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm
     40        find . -name '*.o' -follow -exec rm \{\} \;

  • uspace/srv/fs/devfs/Makefile

    rb86d436 r8e33e1d  
    2828#
    2929
    30 USPACE_PREFIX = ../../..
    31 LIBS = $(LIBFS_PREFIX)/libfs.a $(LIBC_PREFIX)/libc.a
    32 EXTRA_CFLAGS += -I$(LIBFS_PREFIX)
     30include Makefile.common
    3331
    34 OUTPUT = devfs
     32.PHONY: all clean
    3533
    36 SOURCES = \
    37         devfs.c \
    38         devfs_ops.c
     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)
    3937
    40 include ../../Makefile.common
     38clean:
     39        rm -f $(DEPEND) $(DEPEND_PREV) $(JOB) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm
     40        find . -name '*.o' -follow -exec rm \{\} \;

  • uspace/srv/fs/fat/Makefile

    rb86d436 r8e33e1d  
    2828#
    2929
    30 USPACE_PREFIX = ../../..
    31 LIBS = $(LIBBLOCK_PREFIX)/libblock.a $(LIBFS_PREFIX)/libfs.a $(LIBC_PREFIX)/libc.a
    32 EXTRA_CFLAGS += -I$(LIBBLOCK_PREFIX) -I$(LIBFS_PREFIX)
     30include Makefile.common
    3331
    34 OUTPUT = fat
     32.PHONY: all clean
    3533
    36 SOURCES = \
    37         fat.c \
    38         fat_ops.c \
    39         fat_idx.c \
    40         fat_dentry.c \
    41         fat_fat.c
     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)
    4237
    43 include ../../Makefile.common
     38clean:
     39        rm -f $(DEPEND) $(DEPEND_PREV) $(JOB) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm
     40        find . -name '*.o' -follow -exec rm \{\} \;

  • uspace/srv/fs/fat/fat_fat.c

    rb86d436 r8e33e1d  
    400400                         * from the size of the file allocation table.
    401401                         */
    402                         if ((cl >= 2) && ((cl - 2) * bs->spc + ssa >= ts)) {
     402                        if ((cl - 2) * bs->spc + ssa >= ts) {
    403403                                rc = block_put(blk);
    404404                                if (rc != EOK)

  • uspace/srv/fs/fat/fat_ops.c

    rb86d436 r8e33e1d  
    324324        /* Check number of sectors per FAT. */
    325325        if (bs->sec_per_fat == 0)
    326                 return ENOTSUP;
    327 
    328         /*
    329          * Check that the root directory entries take up whole blocks.
    330          * This check is rather strict, but it allows us to treat the root
    331          * directory and non-root directories uniformly in some places.
    332          * It can be removed provided that functions such as fat_read() are
    333          * sanitized to support file systems with this property.
    334          */
    335         if ((uint16_t_le2host(bs->root_ent_max) * sizeof(fat_dentry_t)) %
    336             uint16_t_le2host(bs->bps) != 0)
    337326                return ENOTSUP;
    338327

  • uspace/srv/fs/tmpfs/Makefile

    rb86d436 r8e33e1d  
    2828#
    2929
    30 USPACE_PREFIX = ../../..
    31 LIBS = $(LIBBLOCK_PREFIX)/libblock.a $(LIBFS_PREFIX)/libfs.a $(LIBC_PREFIX)/libc.a
    32 EXTRA_CFLAGS += -I$(LIBBLOCK_PREFIX) -I$(LIBFS_PREFIX)
     30include Makefile.common
    3331
    34 OUTPUT = tmpfs
     32.PHONY: all clean
    3533
    36 SOURCES = \
    37         tmpfs.c \
    38         tmpfs_ops.c \
    39         tmpfs_dump.c
     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)
    4037
    41 include ../../Makefile.common
     38clean:
     39        rm -f $(DEPEND) $(DEPEND_PREV) $(JOB) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm
     40        find . -name '*.o' -follow -exec rm \{\} \;

  • uspace/srv/hid/c_mouse/Makefile

    rb86d436 r8e33e1d  
    2828#
    2929
    30 USPACE_PREFIX = ../../..
    31 LIBS = $(LIBC_PREFIX)/libc.a
    32 EXTRA_CFLAGS = -Iinclude
     30include Makefile.common
    3331
    34 OUTPUT = c_mouse
     32.PHONY: all clean
    3533
    36 SOURCES = \
    37         proto/ps2.c \
    38         c_mouse.c \
    39         chardev.c
     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)
    4037
    41 include ../../Makefile.common
     38clean:
     39        rm -f $(DEPEND) $(DEPEND_PREV) $(JOB) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm
     40        find . -name '*.o' -follow -exec rm \{\} \;

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

    rb86d436 r8e33e1d  
    2828#
    2929
    30 USPACE_PREFIX = ../../../..
    31 LIBS = $(LIBPCI_PREFIX)/libpci.a $(LIBC_PREFIX)/libc.a
    32 EXTRA_CFLAGS = -I$(LIBPCI_PREFIX)
     30include Makefile.common
    3331
    34 OUTPUT = pci
     32.PHONY: all clean
    3533
    36 SOURCES = \
    37         pci.c
     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 include ../../../Makefile.common
     38$(LIBPCI):
     39        $(MAKE) -C libpci PRECHECK=$(PRECHECK)
     40
     41clean:
     42        $(MAKE) -C libpci clean
     43        rm -f $(DEPEND) $(DEPEND_PREV) $(JOB) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm
     44        find . -name '*.o' -follow -exec rm \{\} \;

  • uspace/srv/hw/bus/pci/pci.c

    rb86d436 r8e33e1d  
    2121#include <errno.h>
    2222
    23 #include <pci.h>
     23#include "libpci/pci.h"
    2424
    2525#define PCI_CONF1       0xcf8

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

    rb86d436 r8e33e1d  
    2828#
    2929
    30 USPACE_PREFIX = ../../../..
    31 LIBS = $(LIBC_PREFIX)/libc.a
     30include Makefile.common
    3231
    33 OUTPUT = i8042
     32.PHONY: all clean
    3433
    35 SOURCES = \
    36         i8042.c
     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)
    3737
    38 include ../../../Makefile.common
     38clean:
     39        rm -f $(DEPEND) $(DEPEND_PREV) $(JOB) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm
     40        find . -name '*.o' -follow -exec rm \{\} \;

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

    rb86d436 r8e33e1d  
    2828#
    2929
    30 USPACE_PREFIX = ../../../..
    31 LIBS = $(LIBC_PREFIX)/libc.a
     30include Makefile.common
    3231
    33 OUTPUT = fhc
     32.PHONY: all clean
    3433
    35 SOURCES = \
    36         fhc.c
     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)
    3737
    38 include ../../../Makefile.common
     38clean:
     39        rm -f $(DEPEND) $(DEPEND_PREV) $(JOB) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm
     40        find . -name '*.o' -follow -exec rm \{\} \;

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

    rb86d436 r8e33e1d  
    2828#
    2929
    30 USPACE_PREFIX = ../../../..
    31 LIBS = $(LIBC_PREFIX)/libc.a
     30include Makefile.common
    3231
    33 OUTPUT = obio
     32.PHONY: all clean
    3433
    35 SOURCES = \
    36         obio.c
     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)
    3737
    38 include ../../../Makefile.common
     38clean:
     39        rm -f $(DEPEND) $(DEPEND_PREV) $(JOB) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm
     40        find . -name '*.o' -follow -exec rm \{\} \;

  • uspace/srv/loader/Makefile

    rb86d436 r8e33e1d  
    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
    36 LINK_SCRIPT = arch/$(UARCH)/_link.ld
     32.PHONY: all clean
    3733
    38 OUTPUT = loader
    39 EXTRA_OUTPUT = $(LINK_SCRIPT)
     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)
    4037
    41 GENERIC_SOURCES = \
    42         main.c \
    43         elf_load.c \
    44         interp.s
    45 
    46 SOURCES := $(GENERIC_SOURCES) $(ARCH_SOURCES)
    47 OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
    48 
    49 include ../Makefile.common
    50 
    51 $(LINK_SCRIPT): $(LINK_SCRIPT).in
    52         $(GCC) $(DEFS) $(CFLAGS) -DLIBC_PREFIX=$(LIBC_PREFIX) -E -x c $< | grep -v "^\#" > $@
     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

    rb86d436 r8e33e1d  
    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

    rb86d436 r8e33e1d  
    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

    rb86d436 r8e33e1d  
    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

    rb86d436 r8e33e1d  
    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

    rb86d436 r8e33e1d  
    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

    rb86d436 r8e33e1d  
    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

    rb86d436 r8e33e1d  
    2727#
    2828
    29 EXTRA_CFLAGS = -D__64_BITS__
     29CFLAGS += -D__64_BITS__
    3030ARCH_SOURCES := arch/$(UARCH)/sparc64.s

  • uspace/srv/ns/Makefile

    rb86d436 r8e33e1d  
    2828#
    2929
    30 USPACE_PREFIX = ../..
    31 LIBS = $(LIBC_PREFIX)/libc.a
     30include Makefile.common
    3231
    33 OUTPUT = ns
     32.PHONY: all clean
    3433
    35 SOURCES = \
    36         ns.c \
    37         service.c \
    38         clonable.c \
    39         task.c
     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)
    4037
    41 include ../Makefile.common
     38clean:
     39        rm -f $(DEPEND) $(DEPEND_PREV) $(JOB) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm
     40        find . -name '*.o' -follow -exec rm \{\} \;

  • uspace/srv/vfs/Makefile

    rb86d436 r8e33e1d  
    2828#
    2929
    30 USPACE_PREFIX = ../..
    31 LIBS = $(LIBC_PREFIX)/libc.a
     30include Makefile.common
    3231
    33 OUTPUT = vfs
     32.PHONY: all clean
    3433
    35 SOURCES = \
    36         vfs.c \
    37         vfs_node.c \
    38         vfs_file.c \
    39         vfs_ops.c \
    40         vfs_lookup.c \
    41         vfs_register.c
     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)
    4237
    43 include ../Makefile.common
     38clean:
     39        rm -f $(DEPEND) $(DEPEND_PREV) $(JOB) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm
     40        find . -name '*.o' -follow -exec rm \{\} \;
Note: See TracChangeset for help on using the changeset viewer.