Changeset db6e419 in mainline for uspace/Makefile


Ignore:
Timestamp:
2011-08-16T18:53:00Z (13 years ago)
Author:
Petr Koupy <petr.koupy@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
49160c4
Parents:
e0e922d (diff), 45058baa (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

    re0e922d rdb6e419  
    6565        app/mkbd \
    6666        srv/clip \
    67         srv/devmap \
     67        srv/loc \
    6868        srv/devman \
    6969        srv/loader \
    … …  
    7979        srv/fs/fat \
    8080        srv/fs/tmpfs \
    81         srv/fs/devfs \
     81        srv/fs/locfs \
    8282        srv/fs/ext2fs \
     83        srv/hid/console \
    8384        srv/hid/s3c24xx_ts \
    8485        srv/hid/fb \
    … …  
    121122#
    122123
    123 ifneq ($(UARCH),abs32le)
    124         DIRS += srv/hid/console
    125 endif
    126 
    127124ifeq ($(UARCH),amd64)
    128125        DIRS += \
    … …  
    169166        lib/drv \
    170167        lib/packet \
     168        lib/imgmap \
    171169        lib/net \
    172170        lib/ext2 \
Note: See TracChangeset for help on using the changeset viewer.