Changeset 3b3e776 in mainline for uspace/Makefile


Ignore:
Timestamp:
2010-02-05T10:57:50Z (15 years ago)
Author:
Lenka Trochtova <trochtova.lenka@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
0358da0
Parents:
3f085132 (diff), b4cbef1 (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 with head

File:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/Makefile

    r3f085132 r3b3e776  
    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/shutters \
     43        app/taskdump \
     44        app/tester \
     45        app/test_serial \
     46        app/tetris \
     47        app/trace \
     48        srv/clip \
     49        srv/devmap \
     50        srv/loader \
     51        srv/ns \
     52        srv/taskmon \
     53        srv/vfs \
    3554        srv/bd/ata_bd \
    3655        srv/bd/file_bd \
    3756        srv/bd/gxe_bd \
    3857        srv/bd/rd \
    39         srv/ns \
    40         srv/loader \
    41         srv/fb \
    42         srv/kbd \
    43         srv/console \
     58        srv/bd/part/guid_part \
     59        srv/bd/part/mbr_part \
    4460        srv/fs/fat \
    4561        srv/fs/tmpfs \
    4662        srv/fs/devfs \
    47         srv/vfs \
    48         srv/devmap \
    49         srv/part/mbr_part \
    50         app/edit \
    51         app/tetris \
    52         app/shutters \
    53         app/test_serial \
    54         app/tester \
    55         app/trace \
    56         app/klog \
    57         app/init \
    58         app/getvc \
    59         app/redir \
    60         app/bdsh
     63        srv/hid/adb_mouse \
     64        srv/hid/console \
     65        srv/hid/char_mouse \
     66        srv/hid/fb \
     67        srv/hid/kbd \
     68        srv/hw/char/i8042
    6169
    6270ifeq ($(UARCH),amd64)
    63         DIRS += \
    64                 srv/dd
     71        DIRS += srv/dd
     72#       DIRS += srv/hw/bus/pci
    6573endif
    6674
    6775ifeq ($(UARCH),ia32)
    68         DIRS += \
    69                 srv/dd
     76        DIRS += srv/dd
     77#       DIRS += srv/hw/bus/pci
     78endif
     79
     80ifeq ($(UARCH),ppc32)
     81        DIRS += srv/hw/bus/cuda_adb
    7082endif
    7183
    … …  
    7385        DIRS += \
    7486                srv/dd \
    75                 srv/cir/fhc \
    76                 srv/cir/obio
     87                srv/hw/cir/fhc \
     88                srv/hw/cir/obio
    7789endif
    7890
    … …  
    8294        lib/libblock \
    8395        lib/softint \
    84         lib/softfloat
     96        lib/softfloat \
     97
     98ifeq ($(UARCH),amd64)
     99        LIBS += lib/libpci
     100endif
     101
     102ifeq ($(UARCH),ia32)
     103        LIBS += lib/libpci
     104endif
     105
    85106
    86107LIBC_BUILD = $(addsuffix .build,$(LIBC))
    … …  
    100121
    101122$(BUILDS): $(LIBC_BUILD) $(LIBS_BUILD)
    102         $(MAKE) -C $(basename $@) all
     123        $(MAKE) -C $(basename $@) all PRECHECK=$(PRECHECK)
    103124
    104125$(LIBS_BUILD): $(LIBC_BUILD)
    105         $(MAKE) -C $(basename $@) all
     126        $(MAKE) -C $(basename $@) all PRECHECK=$(PRECHECK)
    106127
    107128$(LIBC_BUILD):
    108         $(MAKE) -C $(basename $@) all
     129        $(MAKE) -C $(basename $@) all PRECHECK=$(PRECHECK)
Note: See TracChangeset for help on using the changeset viewer.