Changeset 99de22b in mainline for uspace/Makefile


Ignore:
Timestamp:
2010-01-15T18:30:25Z (15 years ago)
Author:
Pavel Rimsky <pavel@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
eeb643d
Parents:
387416b (diff), 563d6077 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merged latest trunk changes.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/Makefile

    r387416b r99de22b  
    3333
    3434DIRS = \
     35        app/bdsh \
     36        app/edit \
     37        app/getterm \
     38        app/init \
     39        app/klog \
     40        app/mkfat \
     41        app/redir \
     42        app/tester \
     43        app/tetris \
     44        app/trace \
     45        srv/clip \
     46        srv/devmap \
     47        srv/loader \
     48        srv/ns \
     49        srv/vfs \
    3550        srv/bd/ata_bd \
    3651        srv/bd/file_bd \
    3752        srv/bd/gxe_bd \
    3853        srv/bd/rd \
    39         srv/ns \
    40         srv/loader \
    41         srv/fb \
    42         srv/kbd \
    43         srv/console \
     54        srv/bd/part/mbr_part \
    4455        srv/fs/fat \
    4556        srv/fs/tmpfs \
    4657        srv/fs/devfs \
    47         srv/vfs \
    48         srv/devmap \
    49         srv/part/mbr_part \
    50         srv/clip \
    51         app/edit \
    52         app/tetris \
    53         app/tester \
    54         app/trace \
    55         app/klog \
    56         app/init \
    57         app/getvc \
    58         app/redir \
    59         app/bdsh
     58        srv/hid/console \
     59        srv/hid/c_mouse \
     60        srv/hid/fb \
     61        srv/hid/kbd \
     62        srv/hw/char/i8042
    6063
    6164ifeq ($(UARCH),amd64)
    62         DIRS += srv/pci
     65        DIRS += srv/hw/bus/pci
    6366endif
    6467
    6568ifeq ($(UARCH),ia32)
    66         DIRS += srv/pci
     69        DIRS += srv/hw/bus/pci
    6770endif
    6871
    6972ifeq ($(UARCH),sparc64)
    7073        DIRS += \
    71                 srv/cir/fhc \
    72                 srv/cir/obio
     74                srv/hw/cir/fhc \
     75                srv/hw/cir/obio
    7376endif
    7477
    … …  
    9699
    97100$(BUILDS): $(LIBC_BUILD) $(LIBS_BUILD)
    98         $(MAKE) -C $(basename $@) all
     101        $(MAKE) -C $(basename $@) all PRECHECK=$(PRECHECK)
    99102
    100103$(LIBS_BUILD): $(LIBC_BUILD)
    101         $(MAKE) -C $(basename $@) all
     104        $(MAKE) -C $(basename $@) all PRECHECK=$(PRECHECK)
    102105
    103106$(LIBC_BUILD):
    104         $(MAKE) -C $(basename $@) all
     107        $(MAKE) -C $(basename $@) all PRECHECK=$(PRECHECK)
Note: See TracChangeset for help on using the changeset viewer.