Changeset 9e195e2c in mainline for uspace/Makefile


Ignore:
Timestamp:
2011-05-12T09:03:00Z (14 years ago)
Author:
Lubos Slovak <lubos.slovak@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
d59d0bb
Parents:
456aea3 (diff), c372e03 (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 from development

File:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/Makefile

    r456aea3 r9e195e2c  
    4141        app/killall \
    4242        app/klog \
     43        app/lsusb \
    4344        app/mkfat \
    4445        app/redir \
    … …  
    5152        app/top \
    5253        app/usbinfo \
    53         app/virtusbkbd \
    5454        app/vuhid \
    5555        app/netecho \
    … …  
    177177ifeq ($(UARCH),amd64)
    178178        LIBS += lib/usb
     179        LIBS += lib/usbhost
     180        LIBS += lib/usbdev
     181        LIBS += lib/usbhid
    179182        LIBS += lib/usbvirt
    180183endif
    … …  
    182185ifeq ($(UARCH),ia32)
    183186        LIBS += lib/usb
     187        LIBS += lib/usbhost
     188        LIBS += lib/usbdev
     189        LIBS += lib/usbhid
    184190        LIBS += lib/usbvirt
    185191endif
Note: See TracChangeset for help on using the changeset viewer.