Changeset c2efbb4 in mainline for uspace/Makefile


Ignore:
Timestamp:
2010-02-20T20:54:53Z (14 years ago)
Author:
Pavel Rimsky <pavel@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
721d4e85, 95c4776
Parents:
f516bc2 (diff), b03a666 (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:

Synchronize with head.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/Makefile

    rf516bc2 rc2efbb4  
    6060        srv/fs/devfs \
    6161        srv/hid/adb_mouse \
    62         srv/hid/console \
    6362        srv/hid/char_mouse \
    6463        srv/hid/fb \
    6564        srv/hid/kbd \
    66         srv/hw/char/i8042
     65        srv/hw/char/i8042 \
     66        srv/net
     67
     68ifneq ($(UARCH),abs32le)
     69        DIRS += srv/hid/console
     70endif
    6771
    6872ifeq ($(UARCH),amd64)
Note: See TracChangeset for help on using the changeset viewer.