Changeset 6ef2c11 in mainline for uspace/Makefile


Ignore:
Timestamp:
2010-01-06T20:33:50Z (15 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
385a3d6
Parents:
4da7d79 (diff), 23efd30 (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

    r4da7d79 r6ef2c11  
    3333
    3434DIRS = \
     35        app/bdsh \
     36        app/edit \
     37        app/getterm \
     38        app/init \
     39        app/klog \
     40        app/redir \
     41        app/tester \
     42        app/tetris \
     43        app/trace \
     44        srv/clip \
     45        srv/devmap \
     46        srv/loader \
     47        srv/ns \
     48        srv/vfs \
    3549        srv/bd/ata_bd \
    3650        srv/bd/file_bd \
    3751        srv/bd/gxe_bd \
    3852        srv/bd/rd \
    39         srv/ns \
    40         srv/loader \
    41         srv/fb \
    42         srv/kbd \
    43         srv/char/i8042 \
    44         srv/console \
     53        srv/bd/part/mbr_part \
    4554        srv/fs/fat \
    4655        srv/fs/tmpfs \
    4756        srv/fs/devfs \
    48         srv/mouse/c_mouse \
    49         srv/vfs \
    50         srv/devmap \
    51         srv/part/mbr_part \
    52         srv/clip \
    53         app/edit \
    54         app/tetris \
    55         app/tester \
    56         app/trace \
    57         app/klog \
    58         app/init \
    59         app/getterm \
    60         app/redir \
    61         app/bdsh
     57        srv/hid/console \
     58        srv/hid/c_mouse \
     59        srv/hid/fb \
     60        srv/hid/kbd \
     61        srv/hw/char/i8042
    6262
    6363ifeq ($(UARCH),amd64)
    64         DIRS += srv/pci
     64        DIRS += srv/hw/bus/pci
    6565endif
    6666
    6767ifeq ($(UARCH),ia32)
    68         DIRS += srv/pci
     68        DIRS += srv/hw/bus/pci
    6969endif
    7070
    7171ifeq ($(UARCH),sparc64)
    7272        DIRS += \
    73                 srv/cir/fhc \
    74                 srv/cir/obio
     73                srv/hw/cir/fhc \
     74                srv/hw/cir/obio
    7575endif
    7676
    … …  
    9898
    9999$(BUILDS): $(LIBC_BUILD) $(LIBS_BUILD)
    100         $(MAKE) -C $(basename $@) all
     100        $(MAKE) -C $(basename $@) all PRECHECK=$(PRECHECK)
    101101
    102102$(LIBS_BUILD): $(LIBC_BUILD)
    103         $(MAKE) -C $(basename $@) all
     103        $(MAKE) -C $(basename $@) all PRECHECK=$(PRECHECK)
    104104
    105105$(LIBC_BUILD):
    106         $(MAKE) -C $(basename $@) all
     106        $(MAKE) -C $(basename $@) all PRECHECK=$(PRECHECK)
Note: See TracChangeset for help on using the changeset viewer.