Changeset 055a68a in mainline for uspace/Makefile


Ignore:
Timestamp:
2015-04-23T23:47:40Z (10 years ago)
Author:
Michal Koutný <xm.koutny+hos@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
a18a8b9
Parents:
acb8766e (diff), dcba819 (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

    racb8766e r055a68a  
    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 \
    … …  
    163165        drv/nic/rtl8139 \
    164166        drv/nic/rtl8169 \
     167        drv/nic/ar9271 \
    165168        drv/platform/icp
    166169
    … …  
    180183
    181184ifeq ($(UARCH), $(filter $(UARCH),mips32 mips32eb))
     185ifeq ($(MACHINE),msim)
     186        DIRS += \
     187                drv/platform/msim
     188else
    182189        DIRS += \
    183190                drv/platform/malta \
    184191                drv/bus/pci/pciintel \
    185192                drv/bus/isa
     193endif
    186194endif
    187195
    … …  
    212220        lib/fs \
    213221        lib/block \
     222        lib/crypto \
    214223        lib/clui \
    215224        lib/fmtutil \
    … …  
    242251        lib/posix \
    243252        lib/mbr \
    244         lib/gpt
     253        lib/gpt \
     254        lib/ieee80211
    245255
    246256LIBC_BUILD = $(addsuffix .build,$(LIBC))
Note: See TracChangeset for help on using the changeset viewer.