Changeset 6843a9c in mainline for uspace/lib/usb/Makefile


Ignore:
Timestamp:
2012-06-29T13:02:14Z (13 years ago)
Author:
Jan Vesely <jano.vesely@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
722912e
Parents:
ba72f2b (diff), 0bbd13e (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

Trivial conflicts.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/lib/usb/Makefile

    rba72f2b r6843a9c  
    3131EXTRA_CFLAGS += \
    3232        -I$(LIBDRV_PREFIX)/include \
     33        -I$(LIBUSBDEV_PREFIX)/include \
    3334        -Iinclude
    3435
    … …  
    3637        src/class.c \
    3738        src/ddfiface.c \
     39        src/dev.c \
    3840        src/debug.c \
    3941        src/dump.c \
    4042        src/hc.c \
    41         src/resolve.c \
    4243        src/usb.c
    4344
Note: See TracChangeset for help on using the changeset viewer.