Changeset 8ff0bd2 in mainline for uspace/drv/bus/usb/usbmast/Makefile


Ignore:
Timestamp:
2011-09-04T11:30:58Z (15 years ago)
Author:
Maurizio Lombardi <m.lombardi85@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
03bc76a
Parents:
d2c67e7 (diff), deac215e (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 moved

Legend:

Unmodified
Added
Removed

  • uspace/drv/bus/usb/usbmast/Makefile

    rd2c67e7 r8ff0bd2  
    2727#
    2828
    29 USPACE_PREFIX = ../..
     29USPACE_PREFIX = ../../../..
    3030
    3131LIBS = \
    3232        $(LIBUSBDEV_PREFIX)/libusbdev.a \
    3333        $(LIBUSB_PREFIX)/libusb.a \
    34         $(LIBDRV_PREFIX)/libdrv.a
     34        $(LIBDRV_PREFIX)/libdrv.a \
     35        $(LIBSCSI_PREFIX)/libscsi.a
     36
    3537EXTRA_CFLAGS += \
    3638        -I$(LIBUSB_PREFIX)/include \
    3739        -I$(LIBUSBDEV_PREFIX)/include \
    38         -I$(LIBDRV_PREFIX)/include
     40        -I$(LIBDRV_PREFIX)/include \
     41        -I$(LIBSCSI_PREFIX)/include
    3942
    4043BINARY = usbmast
    4144
    4245SOURCES = \
    43         inquiry.c \
     46        bo_trans.c \
     47        cmdw.c \
    4448        main.c \
    45         mast.c
     49        scsi_ms.c
    4650
    4751include $(USPACE_PREFIX)/Makefile.common
Note: See TracChangeset for help on using the changeset viewer.