Changeset 94e46c9 in mainline for uspace/Makefile


Ignore:
Timestamp:
2015-05-23T04:09:11Z (10 years ago)
Author:
Jan Vesely <jano.vesely@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
b5143bd
Parents:
a25d893 (diff), 0683992 (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:

Mainline changes

File:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/Makefile

    ra25d893 r94e46c9  
    9494        app/wavplay \
    9595        app/websrv \
     96        app/wifi_supplicant \
    9697        srv/audio/hound \
    9798        srv/clipboard \
    … …  
    141142        drv/block/ahci \
    142143        drv/block/ata_bd \
     144        drv/block/ddisk \
    143145        drv/char/i8042 \
    144146        drv/char/pl050 \
    … …  
    162164        drv/nic/rtl8139 \
    163165        drv/nic/rtl8169 \
     166        drv/nic/ar9271 \
    164167        drv/platform/icp
    165168
    … …  
    179182
    180183ifeq ($(UARCH), $(filter $(UARCH),mips32 mips32eb))
     184ifeq ($(MACHINE),msim)
     185        DIRS += \
     186                drv/platform/msim
     187else
    181188        DIRS += \
    182189                drv/platform/malta \
    183190                drv/bus/pci/pciintel \
    184191                drv/bus/isa
     192endif
    185193endif
    186194
    … …  
    211219        lib/fs \
    212220        lib/block \
     221        lib/crypto \
    213222        lib/clui \
    214223        lib/fmtutil \
    … …  
    241250        lib/posix \
    242251        lib/mbr \
    243         lib/gpt
     252        lib/gpt \
     253        lib/ieee80211
    244254
    245255LIBC_BUILD = $(addsuffix .build,$(LIBC))
Note: See TracChangeset for help on using the changeset viewer.