Changeset 03c971f in mainline for uspace/Makefile


Ignore:
Timestamp:
2013-08-15T14:20:16Z (12 years ago)
Author:
Jan Vesely <jano.vesely@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
bb2a5b2
Parents:
f2c19b0 (diff), 2921602 (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

    rf2c19b0 r03c971f  
    7373        app/nettest3 \
    7474        app/ping \
     75        app/ping6 \
    7576        app/sysinfo \
    7677        app/mkbd \
     
    9192        srv/net/inetsrv \
    9293        srv/net/loopip \
     94        srv/net/slip \
    9395        srv/net/tcp \
    9496        srv/net/udp \
     
    9698        srv/taskmon \
    9799        srv/vfs \
    98         srv/bd/ata_bd \
    99100        srv/bd/sata_bd \
    100101        srv/bd/file_bd \
     
    122123        drv/infrastructure/rootvirt \
    123124        drv/block/ahci \
     125        drv/block/ata_bd \
    124126        drv/char/i8042 \
    125127        drv/char/ps2mouse \
     
    141143        drv/nic/ne2k \
    142144        drv/nic/e1k \
    143         drv/nic/rtl8139 \
     145        drv/nic/rtl8139
    144146
    145147ifeq ($(CONFIG_PCC),y)
Note: See TracChangeset for help on using the changeset viewer.