Changeset e035612 in mainline


Ignore:
Timestamp:
2009-10-14T15:00:02Z (15 years ago)
Author:
Martin Decky <martin@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
68834d85, 7c7a3209, 81342f7
Parents:
c088fd4
Message:

make parallel build (with -j n) possible

Files:
29 edited

Legend:

Unmodified
Added
Removed

  • Makefile

    rc088fd4 re035612  
    3030#
    3131
    32 .PHONY: all config distclean clean cscope
     32.PHONY: all config config_default distclean clean cscope
    3333
    3434all: Makefile.config config.h config.defs
    … …  
    3737        $(MAKE) -C boot
    3838
    39 Makefile.config config.h config.defs: HelenOS.config
     39Makefile.config: config_default
     40
     41config.h: config_default
     42
     43config.defs: config_default
     44
     45config_default: HelenOS.config
    4046        tools/config.py HelenOS.config default
    4147
    42 config:
     48config: HelenOS.config
    4349        tools/config.py HelenOS.config
    4450

  • uspace/Makefile

    rc088fd4 re035612  
    3333
    3434DIRS = \
    35         lib/libc \
    36         lib/libfs \
    37         lib/libblock \
    38         lib/softint \
    39         lib/softfloat \
    4035        srv/bd/ata_bd \
    4136        srv/bd/file_bd \
    … …  
    7671endif
    7772
     73LIBC = lib/libc
     74LIBS = \
     75        lib/libfs \
     76        lib/libblock \
     77        lib/softint \
     78        lib/softfloat
     79
     80LIBC_BUILD = $(addsuffix .build,$(LIBC))
     81LIBS_BUILD = $(addsuffix .build,$(LIBS))
     82
    7883BUILDS := $(addsuffix .build,$(DIRS))
    79 CLEANS := $(addsuffix .clean,$(DIRS))
     84CLEANS := $(addsuffix .clean,$(DIRS)) $(addsuffix .clean,$(LIBS)) $(addsuffix .clean,$(LIBC))
    8085
    81 .PHONY: all $(BUILDS) $(CLEANS) clean
     86.PHONY: all $(LIBC_BUILD) $(LIBS_BUILD) $(BUILDS) $(CLEANS) clean
    8287
    8388all: ../Makefile.config ../config.h ../config.defs $(BUILDS)
    … …  
    8893        -$(MAKE) -C $(basename $@) clean
    8994
    90 $(BUILDS):
     95$(BUILDS): $(LIBC_BUILD) $(LIBS_BUILD)
    9196        $(MAKE) -C $(basename $@) all
     97
     98$(LIBS_BUILD): $(LIBC_BUILD)
     99        $(MAKE) -C $(basename $@) all
     100
     101$(LIBC_BUILD):
     102        $(MAKE) -C $(basename $@) all

  • uspace/app/bdsh/Makefile

    rc088fd4 re035612  
    117117
    118118# Everything else is a phony target
    119 .PHONY: all clean distclean depend disasm
     119.PHONY: all clean distclean depend
    120120
    121 all: $(PROGRAM) disasm
     121all: $(PROGRAM) $(PROGRAM).disasm
    122122
    123123clean:
    … …  
    131131        @echo ''
    132132
    133 disasm:
    134         $(OBJDUMP) -d $(PROGRAM) >$(PROGRAM).disasm
     133$(PROGRAM).disasm: $(PROGRAM)
     134        $(OBJDUMP) -d $< > $@
    135135
    136136distclean: clean

  • uspace/app/edit/Makefile

    rc088fd4 re035612  
    4848OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
    4949
    50 .PHONY: all clean depend disasm
     50.PHONY: all clean depend
    5151
    5252all: $(OUTPUT) $(OUTPUT).disasm
    … …  
    6363        $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
    6464
    65 disasm: $(OUTPUT).disasm
    66 
    6765$(OUTPUT).disasm: $(OUTPUT)
    6866        $(OBJDUMP) -d $< > $@

  • uspace/app/getvc/Makefile

    rc088fd4 re035612  
    5050OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
    5151
    52 .PHONY: all clean depend disasm
     52.PHONY: all clean depend
    5353
    5454all: $(OUTPUT) $(OUTPUT).disasm
    … …  
    6565        $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
    6666
    67 disasm: $(OUTPUT).disasm
    68 
    6967$(OUTPUT).disasm: $(OUTPUT)
    7068        $(OBJDUMP) -d $< > $@

  • uspace/app/init/Makefile

    rc088fd4 re035612  
    4747OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
    4848
    49 .PHONY: all clean depend disasm
     49.PHONY: all clean depend
    5050
    5151all: $(OUTPUT) $(OUTPUT).disasm
    … …  
    6262        $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
    6363
    64 disasm: $(OUTPUT).disasm
    65 
    6664$(OUTPUT).disasm: $(OUTPUT)
    6765        $(OBJDUMP) -d $< > $@

  • uspace/app/klog/Makefile

    rc088fd4 re035612  
    4747OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
    4848
    49 .PHONY: all clean depend disasm
     49.PHONY: all clean depend
    5050
    5151all: $(OUTPUT) $(OUTPUT).disasm
    … …  
    6262        $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
    6363
    64 disasm: $(OUTPUT).disasm
    65 
    6664$(OUTPUT).disasm: $(OUTPUT)
    6765        $(OBJDUMP) -d $< > $@

  • uspace/app/tester/Makefile

    rc088fd4 re035612  
    7878        $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
    7979
    80 disasm: $(OUTPUT).disasm
    81 
    8280$(OUTPUT).disasm: $(OUTPUT)
    8381        $(OBJDUMP) -d $< > $@

  • uspace/app/tetris/Makefile

    rc088fd4 re035612  
    1010OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
    1111
    12 .PHONY: all clean depend disasm
     12.PHONY: all clean depend
    1313
    1414all: $(OUTPUT) $(OUTPUT).disasm
    … …  
    2525        -rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend *.o
    2626
    27 disasm: $(OUTPUT).disasm
    28 
    2927$(OUTPUT).disasm: $(OUTPUT)
    3028        $(OBJDUMP) -d $< > $@

  • uspace/app/trace/Makefile

    rc088fd4 re035612  
    5252OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
    5353
    54 .PHONY: all clean depend disasm
     54.PHONY: all clean depend
    5555
    56 all: $(OUTPUT) disasm
     56all: $(OUTPUT) $(OUTPUT).disasm
    5757
    5858-include Makefile.depend
    … …  
    6767        $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
    6868
    69 disasm:
    70         $(OBJDUMP) -d $(OUTPUT) >$(OUTPUT).disasm
     69$(OUTPUT).disasm: $(OUTPUT)
     70        $(OBJDUMP) -d $< > $@
    7171
    7272%.o: %.S

  • uspace/lib/libc/Makefile

    rc088fd4 re035612  
    9696.PHONY: all clean depend kerninc
    9797
    98 all: kerninc libc.a arch/$(UARCH)/_link.ld
    99 
    100 kerninc:
    101         ln -sfn ../../../../kernel/generic/include include/kernel
    102         ln -sfn kernel/arch include/arch
    103         ln -sfn ../arch/$(UARCH)/include include/libarch
     98all: libc.a
    10499
    105100-include Makefile.depend
    … …  
    109104        find generic/ arch/$(UARCH)/ -name '*.o' -follow -exec rm \{\} \;
    110105
    111 depend: kerninc
     106depend: kerninc arch/$(UARCH)/_link.ld
    112107        -makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(ARCH_SOURCES) $(GENERIC_SOURCES) > Makefile.depend 2> /dev/null
    113108
    114109libc.a: depend $(ARCH_OBJECTS) $(GENERIC_OBJECTS)
    115110        $(AR) rc libc.a $(LIBS) $(ARCH_OBJECTS) $(GENERIC_OBJECTS)
     111
     112kerninc:
     113        ln -sfn ../../../../kernel/generic/include include/kernel
     114        ln -sfn kernel/arch include/arch
     115        ln -sfn ../arch/$(UARCH)/include include/libarch
    116116
    117117arch/$(UARCH)/_link.ld: arch/$(UARCH)/_link.ld.in

  • uspace/srv/bd/ata_bd/Makefile

    rc088fd4 re035612  
    4747OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
    4848
    49 .PHONY: all clean depend disasm
     49.PHONY: all clean depend
    5050
    5151all: $(OUTPUT) $(OUTPUT).disasm
    … …  
    6262        $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
    6363
    64 disasm: $(OUTPUT).disasm
    65 
    6664$(OUTPUT).disasm: $(OUTPUT)
    6765        $(OBJDUMP) -d $< > $@

  • uspace/srv/bd/file_bd/Makefile

    rc088fd4 re035612  
    4747OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
    4848
    49 .PHONY: all clean depend disasm
     49.PHONY: all clean depend
    5050
    5151all: $(OUTPUT) $(OUTPUT).disasm
    … …  
    6262        $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
    6363
    64 disasm: $(OUTPUT).disasm
    65 
    6664$(OUTPUT).disasm: $(OUTPUT)
    6765        $(OBJDUMP) -d $< > $@

  • uspace/srv/bd/gxe_bd/Makefile

    rc088fd4 re035612  
    4747OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
    4848
    49 .PHONY: all clean depend disasm
     49.PHONY: all clean depend
    5050
    5151all: $(OUTPUT) $(OUTPUT).disasm
    … …  
    6262        $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
    6363
    64 disasm: $(OUTPUT).disasm
    65 
    6664$(OUTPUT).disasm: $(OUTPUT)
    6765        $(OBJDUMP) -d $< > $@

  • uspace/srv/bd/rd/Makefile

    rc088fd4 re035612  
    4747OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
    4848
    49 .PHONY: all clean depend disasm
     49.PHONY: all clean depend
    5050
    5151all: $(OUTPUT) $(OUTPUT).disasm
    … …  
    6262        $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
    6363
    64 disasm: $(OUTPUT).disasm
    65 
    6664$(OUTPUT).disasm: $(OUTPUT)
    6765        $(OBJDUMP) -d $< > $@

  • uspace/srv/cir/fhc/Makefile

    rc088fd4 re035612  
    4747OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
    4848
    49 .PHONY: all clean depend disasm
     49.PHONY: all clean depend
    5050
    5151all: $(OUTPUT) $(OUTPUT).disasm
    … …  
    6262        $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
    6363
    64 disasm: $(OUTPUT).disasm
    65 
    6664$(OUTPUT).disasm: $(OUTPUT)
    6765        $(OBJDUMP) -d $< > $@

  • uspace/srv/cir/obio/Makefile

    rc088fd4 re035612  
    4747OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
    4848
    49 .PHONY: all clean depend disasm
     49.PHONY: all clean depend
    5050
    5151all: $(OUTPUT) $(OUTPUT).disasm
    … …  
    6262        $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
    6363
    64 disasm: $(OUTPUT).disasm
    65 
    6664$(OUTPUT).disasm: $(OUTPUT)
    6765        $(OBJDUMP) -d $< > $@

  • uspace/srv/console/Makefile

    rc088fd4 re035612  
    6767OBJECTS := $(GENERIC_OBJECTS)
    6868
    69 .PHONY: all clean depend disasm
     69.PHONY: all clean depend
    7070
    7171all: $(OUTPUT) $(OUTPUT).disasm
    … …  
    8181$(OUTPUT): $(OBJECTS) $(LIBS)
    8282        $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
    83 
    84 disasm: $(OUTPUT).disasm
    8583
    8684$(OUTPUT).disasm: $(OUTPUT)

  • uspace/srv/devmap/Makefile

    rc088fd4 re035612  
    4848OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
    4949
    50 .PHONY: all clean depend disasm
     50.PHONY: all clean depend
    5151
    5252all: $(OUTPUT) $(OUTPUT).disasm
    … …  
    6363        $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
    6464
    65 disasm: $(OUTPUT).disasm
    66 
    6765$(OUTPUT).disasm: $(OUTPUT)
    6866        $(OBJDUMP) -d $< > $@

  • uspace/srv/fb/Makefile

    rc088fd4 re035612  
    8686OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
    8787
    88 .PHONY: all clean depend disasm
     88.PHONY: all clean depend
    8989
    9090all: $(OUTPUT) $(OUTPUT).disasm
    … …  
    101101        $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
    102102
    103 disasm: $(OUTPUT).disasm
    104 
    105103$(OUTPUT).disasm: $(OUTPUT)
    106104        $(OBJDUMP) -d $< > $@

  • uspace/srv/fs/devfs/Makefile

    rc088fd4 re035612  
    3636include $(LIBC_PREFIX)/Makefile.toolchain
    3737
    38 CFLAGS += -I $(LIBFS_PREFIX) 
     38CFLAGS += -I $(LIBFS_PREFIX)
    3939
    4040LIBS = \
    … …  
    5353OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
    5454
    55 .PHONY: all clean depend disasm
     55.PHONY: all clean depend
    5656
    5757all: $(OUTPUT) $(OUTPUT).disasm
    … …  
    6868        $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
    6969
    70 disasm: $(OUTPUT).disasm
    71 
    7270$(OUTPUT).disasm: $(OUTPUT)
    7371        $(OBJDUMP) -d $< > $@

  • uspace/srv/fs/fat/Makefile

    rc088fd4 re035612  
    5757OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
    5858
    59 .PHONY: all clean depend disasm
     59.PHONY: all clean depend
    6060
    6161all: $(OUTPUT) $(OUTPUT).disasm
    … …  
    7272        $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
    7373
    74 disasm: $(OUTPUT).disasm
    75 
    7674$(OUTPUT).disasm: $(OUTPUT)
    7775        $(OBJDUMP) -d $< > $@

  • uspace/srv/fs/tmpfs/Makefile

    rc088fd4 re035612  
    5555OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
    5656
    57 .PHONY: all clean depend disasm
     57.PHONY: all clean depend
    5858
    5959all: $(OUTPUT) $(OUTPUT).disasm
    … …  
    7070        $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
    7171
    72 disasm: $(OUTPUT).disasm
    73 
    7472$(OUTPUT).disasm: $(OUTPUT)
    7573        $(OBJDUMP) -d $< > $@

  • uspace/srv/kbd/Makefile

    rc088fd4 re035612  
    156156OBJECTS := $(ARCH_OBJECTS) $(GENERIC_OBJECTS) $(GENARCH_OBJECTS)
    157157
    158 .PHONY: all clean depend disasm links
     158.PHONY: all clean depend
    159159
    160160all: $(OUTPUT) $(OUTPUT).disasm
    … …  
    171171        $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
    172172
    173 disasm: $(OUTPUT).disasm
    174 
    175173$(OUTPUT).disasm: $(OUTPUT)
    176174        $(OBJDUMP) -d $< > $@

  • uspace/srv/loader/Makefile

    rc088fd4 re035612  
    5353OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
    5454
    55 .PHONY: all clean depend disasm
     55.PHONY: all clean depend
    5656
    57 all: $(OUTPUT) disasm
     57all: $(OUTPUT) $(OUTPUT).disasm
    5858
    5959-include Makefile.depend
    … …  
    6868        $(LD) -T arch/$(UARCH)/_link.ld $(LFLAGS) $(OBJECTS) $(LIBS) -o $@ -Map $(OUTPUT).map
    6969
    70 disasm:
    71         $(OBJDUMP) -d $(OUTPUT) >$(OUTPUT).disasm
     70$(OUTPUT).disasm: $(OUTPUT)
     71        $(OBJDUMP) -d $< > $@
    7272
    7373arch/$(UARCH)/_link.ld: arch/$(UARCH)/_link.ld.in

  • uspace/srv/ns/Makefile

    rc088fd4 re035612  
    4949OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
    5050
    51 .PHONY: all clean depend disasm
     51.PHONY: all clean depend
    5252
    5353all: $(OUTPUT) $(OUTPUT).disasm
    … …  
    6464        $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
    6565
    66 disasm: $(OUTPUT).disasm
    67 
    6866$(OUTPUT).disasm: $(OUTPUT)
    6967        $(OBJDUMP) -d $< > $@

  • uspace/srv/part/mbr_part/Makefile

    rc088fd4 re035612  
    4949OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
    5050
    51 .PHONY: all clean depend disasm
     51.PHONY: all clean depend
    5252
    5353all: $(OUTPUT) $(OUTPUT).disasm
    … …  
    6464        $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
    6565
    66 disasm: $(OUTPUT).disasm
    67 
    6866$(OUTPUT).disasm: $(OUTPUT)
    6967        $(OBJDUMP) -d $< > $@

  • uspace/srv/pci/Makefile

    rc088fd4 re035612  
    4747OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
    4848
    49 .PHONY: all clean depend disasm
     49.PHONY: all clean depend
    5050
    51 all: $(OUTPUT) disasm
     51all: $(OUTPUT) $(OUTPUT).disasm
    5252
    5353-include Makefile.depend
    … …  
    6464        $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
    6565
    66 disasm:
    67         $(OBJDUMP) -d $(OUTPUT) >$(OUTPUT).disasm
     66$(OUTPUT).disasm: $(OUTPUT)
     67        $(OBJDUMP) -d $< > $@
    6868
    6969%.o: %.S

  • uspace/srv/vfs/Makefile

    rc088fd4 re035612  
    5252OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
    5353
    54 .PHONY: all clean depend disasm
     54.PHONY: all clean depend
    5555
    5656all: $(OUTPUT) $(OUTPUT).disasm
    … …  
    6767        $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
    6868
    69 disasm: $(OUTPUT).disasm
    70 
    7169$(OUTPUT).disasm: $(OUTPUT)
    7270        $(OBJDUMP) -d $< > $@
Note: See TracChangeset for help on using the changeset viewer.