Changeset 69146b93 in mainline for uspace/Makefile


Ignore:
Timestamp:
2012-11-26T19:02:45Z (12 years ago)
Author:
Adam Hraska <adam.hraska+hos@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
04552324
Parents:
5d230a30 (diff), 7462674 (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 mainline,1723.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/Makefile

    r5d230a30 r69146b93  
    4040        app/devctl \
    4141        app/edit \
    42         app/ext2info \
    4342        app/getterm \
    4443        app/init \
     
    106105        srv/fs/mfs \
    107106        srv/fs/locfs \
    108         srv/fs/ext2fs \
    109107        srv/fs/ext4fs \
    110108        srv/hid/compositor \
     
    195193endif
    196194
     195ifeq ($(UARCH),arm32)
     196        DIRS += \
     197                drv/infrastructure/rootamdm37x
     198endif
     199
    197200## System libraries
    198201#
     
    214217        lib/net \
    215218        lib/nic \
    216         lib/ext2 \
    217219        lib/ext4 \
    218220        lib/urcu \
Note: See TracChangeset for help on using the changeset viewer.