Changeset 1fe9bf6 in mainline for uspace/Makefile


Ignore:
Timestamp:
2010-11-21T17:13:32Z (13 years ago)
Author:
Lubos Slovak <lubos.slovak@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
31860b7
Parents:
8b3bff5 (diff), 4087a33 (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 updates from HelenOS mainline + changes from branch

/vojtechhorky/ddf_proposal/

File:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/Makefile

    r8b3bff5 r1fe9bf6  
    5050        app/trace \
    5151        app/top \
     52        app/virtusbkbd \
    5253        app/netecho \
    5354        app/nettest1 \
    … …  
    8687        srv/net/tl/tcp \
    8788        srv/net/net \
    88         drv/root
     89        drv/root \
     90        drv/vhc
    8991
    9092## Networking
    … …  
    116118        DIRS += drv/isa
    117119        DIRS += drv/ns8250
     120        DIRS += drv/uhci
     121        DIRS += drv/usbkbd
    118122endif
    119123
    … …  
    141145        lib/packet \
    142146        lib/net
     147
     148ifeq ($(UARCH),amd64)
     149        LIBS += lib/usb
     150        LIBS += lib/usbvirt
     151endif
     152
     153ifeq ($(UARCH),ia32)
     154        LIBS += lib/usb
     155        LIBS += lib/usbvirt
     156endif
    143157
    144158LIBC_BUILD = $(addsuffix .build,$(LIBC))
Note: See TracChangeset for help on using the changeset viewer.