Changeset 61c0402 in mainline for uspace/Makefile


Ignore:
Timestamp:
2010-01-15T19:36:53Z (14 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
92bee46
Parents:
50f9c3a (diff), 963462af (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:

Merge mainline changes.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/Makefile

    r50f9c3a r61c0402  
    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         app/edit \
    51         app/tetris \
    52         app/tester \
    53         app/trace \
    54         app/klog \
    55         app/init \
    56         app/getvc \
    57         app/redir \
    58         app/bdsh
     58        srv/hid/console \
     59        srv/hid/c_mouse \
     60        srv/hid/fb \
     61        srv/hid/kbd \
     62        srv/hw/char/i8042
    5963
    6064ifeq ($(UARCH),amd64)
    61         DIRS += srv/pci
     65        DIRS += srv/hw/bus/pci
    6266endif
    6367
    6468ifeq ($(UARCH),ia32)
    65         DIRS += srv/pci
     69        DIRS += srv/hw/bus/pci
    6670endif
    6771
    6872ifeq ($(UARCH),sparc64)
    6973        DIRS += \
    70                 srv/cir/fhc \
    71                 srv/cir/obio
     74                srv/hw/cir/fhc \
     75                srv/hw/cir/obio
    7276endif
    7377
    … …  
    9599
    96100$(BUILDS): $(LIBC_BUILD) $(LIBS_BUILD)
    97         $(MAKE) -C $(basename $@) all
     101        $(MAKE) -C $(basename $@) all PRECHECK=$(PRECHECK)
    98102
    99103$(LIBS_BUILD): $(LIBC_BUILD)
    100         $(MAKE) -C $(basename $@) all
     104        $(MAKE) -C $(basename $@) all PRECHECK=$(PRECHECK)
    101105
    102106$(LIBC_BUILD):
    103         $(MAKE) -C $(basename $@) all
     107        $(MAKE) -C $(basename $@) all PRECHECK=$(PRECHECK)
Note: See TracChangeset for help on using the changeset viewer.