Changeset e5773c6 in mainline for uspace/app


Ignore:
Timestamp:
2010-01-15T22:13:12Z (16 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
15eeb93
Parents:
5edb1f5
Message:

Extract common makefile part for apps and servers, use for all apps and most servers.

Location:
uspace/app
Files:
18 deleted
10 edited
1 moved

Legend:

Unmodified
Added
Removed

  • uspace/app/Makefile.common

    r5edb1f5 re5773c6  
    2828#
    2929
    30 ## Setup toolchain
     30## Common rules for building apps.
    3131#
    3232
    33 include Makefile.common
    34 include $(LIBC_PREFIX)/Makefile.toolchain
    35 
    36 CFLAGS += -I$(LIBBLOCK_PREFIX) -I. -Icmds/ -Icmds/builtins -Icmds/modules
    37 
    38 ## Sources
     33# Individual makefiles set:
     34#
     35#       USPACE_PREFIX   relative path to uspace/ directory
     36#       LIBS            libraries to link with (with relative path)
     37#       EXTRA_CFLAGS    additional flags to pass to C compiler
     38#       JOB             job file name (like appname.job)
     39#       OUTPUT          output binary name (like appname)
     40#       SOURCES         list of source files
    3941#
    4042
    41 SOURCES = \
    42         cmds/modules/help/help.c \
    43         cmds/modules/mkdir/mkdir.c \
    44         cmds/modules/mkfile/mkfile.c \
    45         cmds/modules/rm/rm.c \
    46         cmds/modules/bdd/bdd.c \
    47         cmds/modules/cat/cat.c \
    48         cmds/modules/touch/touch.c \
    49         cmds/modules/ls/ls.c \
    50         cmds/modules/pwd/pwd.c \
    51         cmds/modules/sleep/sleep.c \
    52         cmds/modules/cp/cp.c \
    53         cmds/modules/mv/mv.c \
    54         cmds/modules/mount/mount.c \
    55         cmds/modules/kcon/kcon.c \
    56         cmds/builtins/exit/exit.c \
    57         cmds/builtins/cd/cd.c \
    58         cmds/mod_cmds.c \
    59         cmds/builtin_cmds.c \
    60         errors.c \
    61         input.c \
    62         util.c \
    63         exec.c \
    64         scli.c
     43DEPEND = Makefile.depend
     44DEPEND_PREV = $(DEPEND).prev
     45
     46LIBC_PREFIX = $(USPACE_PREFIX)/lib/libc
     47LIBBLOCK_PREFIX = $(USPACE_PREFIX)/lib/libblock
     48SOFTINT_PREFIX = $(USPACE_PREFIX)/lib/softint
     49
     50JOB = $(OUTPUT).job
    6551
    6652OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
    6753
    68 .PHONY: all
     54include $(LIBC_PREFIX)/Makefile.toolchain
    6955
    70 all: $(OUTPUT) $(OUTPUT).disasm
     56CFLAGS += $(EXTRA_CFLAGS)
     57
     58.PHONY: all build clean
     59
     60all: \
     61    $(LIBC_PREFIX)/../../../version \
     62    $(LIBC_PREFIX)/../../../Makefile.config \
     63    $(LIBC_PREFIX)/../../../config.h \
     64    $(LIBC_PREFIX)/../../../config.defs \
     65    $(LIBS) \
     66    \
     67    $(OUTPUT) $(OUTPUT).disasm
     68        -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV)
     69
     70clean:
     71        rm -f $(DEPEND) $(DEPEND_PREV) $(JOB) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm
     72        find . -name '*.o' -follow -exec rm \{\} \;
     73
     74build:
    7175
    7276-include $(DEPEND)

  • uspace/app/bdsh/Makefile

    r5edb1f5 re5773c6  
    2828#
    2929
    30 include Makefile.common
     30USPACE_PREFIX = ../..
     31LIBS = $(LIBBLOCK_PREFIX)/libblock.a $(LIBC_PREFIX)/libc.a
     32EXTRA_CFLAGS = -I$(LIBBLOCK_PREFIX) -I. -Icmds/ -Icmds/builtins -Icmds/modules
    3133
    32 .PHONY: all clean
     34OUTPUT = bdsh
    3335
    34 all: $(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)
     36SOURCES = \
     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
    3760
    38 clean:
    39         rm -f $(DEPEND) $(DEPEND_PREV) $(JOB) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm
    40         find . -name '*.o' -follow -exec rm \{\} \;
     61include ../Makefile.common

  • uspace/app/edit/Makefile

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

  • uspace/app/getterm/Makefile

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

  • uspace/app/init/Makefile

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

  • uspace/app/klog/Makefile

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

  • uspace/app/mkfat/Makefile

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

  • uspace/app/redir/Makefile

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

  • uspace/app/tester/Makefile

    r5edb1f5 re5773c6  
    2828#
    2929
    30 include Makefile.common
     30USPACE_PREFIX = ../..
     31LIBS = $(LIBC_PREFIX)/libc.a
    3132
    32 .PHONY: all clean
     33OUTPUT = tester
    3334
    34 all: $(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)
     35SOURCES = \
     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
    3754
    38 clean:
    39         rm -f $(DEPEND) $(DEPEND_PREV) $(JOB) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm
    40         find . -name '*.o' -follow -exec rm \{\} \;
     55include ../Makefile.common

  • uspace/app/tetris/Makefile

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

  • uspace/app/trace/Makefile

    r5edb1f5 re5773c6  
    2828#
    2929
    30 include Makefile.common
     30USPACE_PREFIX = ../..
     31LIBS = $(LIBC_PREFIX)/libc.a
    3132
    32 .PHONY: all clean
     33OUTPUT = trace
    3334
    34 all: $(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)
     35SOURCES = \
     36        trace.c \
     37        syscalls.c \
     38        ipcp.c \
     39        ipc_desc.c \
     40        proto.c \
     41        errors.c
    3742
    38 clean:
    39         rm -f $(DEPEND) $(DEPEND_PREV) $(JOB) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm
    40         find . -name '*.o' -follow -exec rm \{\} \;
     43include ../Makefile.common
Note: See TracChangeset for help on using the changeset viewer.