Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset 827d73f in mainline for uspace/Makefile


Ignore:
Timestamp:
2010-02-12T14:09:22Z (12 years ago)
Author:
Lukas Mejdrech <lukasmejdrech@…>
Branches:
lfn, master
Children:
a70bda4
Parents:
918e9910 (diff), e70edd1 (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 the actual head

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/Makefile

    r918e9910 r827d73f  
    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/taskdump \
     43        app/tester \
     44        app/tetris \
     45        app/trace \
     46        srv/clip \
     47        srv/devmap \
     48        srv/loader \
     49        srv/ns \
     50        srv/taskmon \
     51        srv/vfs \
    3552        srv/bd/ata_bd \
    3653        srv/bd/file_bd \
    3754        srv/bd/gxe_bd \
    3855        srv/bd/rd \
    39         srv/ns \
    40         srv/loader \
    41         srv/fb \
    42         srv/kbd \
    43         srv/char/i8042 \
    44         srv/console \
     56        srv/bd/part/guid_part \
     57        srv/bd/part/mbr_part \
    4558        srv/fs/fat \
    4659        srv/fs/tmpfs \
    4760        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 \
     61        srv/hid/adb_mouse \
     62        srv/hid/console \
     63        srv/hid/char_mouse \
     64        srv/hid/fb \
     65        srv/hid/kbd \
     66        srv/hw/char/i8042 \
    6267        srv/net
    6368
    6469ifeq ($(UARCH),amd64)
    65         DIRS += srv/pci
     70        DIRS += srv/hw/bus/pci
    6671endif
    6772
    6873ifeq ($(UARCH),ia32)
    69         DIRS += srv/pci
     74        DIRS += srv/hw/bus/pci
     75endif
     76
     77ifeq ($(UARCH),ppc32)
     78        DIRS += srv/hw/bus/cuda_adb
    7079endif
    7180
    7281ifeq ($(UARCH),sparc64)
    7382        DIRS += \
    74                 srv/cir/fhc \
    75                 srv/cir/obio
     83                srv/hw/cir/fhc \
     84                srv/hw/cir/obio
    7685endif
    7786
     
    8190        lib/libblock \
    8291        lib/softint \
    83         lib/softfloat
     92        lib/softfloat \
     93
     94ifeq ($(UARCH),amd64)
     95        LIBS += lib/libpci
     96endif
     97
     98ifeq ($(UARCH),ia32)
     99        LIBS += lib/libpci
     100endif
     101
    84102
    85103LIBC_BUILD = $(addsuffix .build,$(LIBC))
     
    99117
    100118$(BUILDS): $(LIBC_BUILD) $(LIBS_BUILD)
    101         $(MAKE) -C $(basename $@) all
     119        $(MAKE) -C $(basename $@) all PRECHECK=$(PRECHECK)
    102120
    103121$(LIBS_BUILD): $(LIBC_BUILD)
    104         $(MAKE) -C $(basename $@) all
     122        $(MAKE) -C $(basename $@) all PRECHECK=$(PRECHECK)
    105123
    106124$(LIBC_BUILD):
    107         $(MAKE) -C $(basename $@) all
     125        $(MAKE) -C $(basename $@) all PRECHECK=$(PRECHECK)
Note: See TracChangeset for help on using the changeset viewer.