Changeset 26e7d6d in mainline for uspace/drv/bus/usb/usbmast/Makefile

Timestamp:

2011-09-19T16:31:00Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

a347a11

Parents:

3842a955 (diff), 086290d (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:

• uspace/drv/bus/usb/usbmast/Makefile (moved) (moved from uspace/drv/usbmast/Makefile ) (1 diff)

uspace/drv/bus/usb/usbmast/Makefile

@@ -27 +27 @@
 #
 
-USPACE_PREFIX = ../..
+USPACE_PREFIX = ../../../..
 
 LIBS = \
         $(LIBUSBDEV_PREFIX)/libusbdev.a \
         $(LIBUSB_PREFIX)/libusb.a \
-        $(LIBDRV_PREFIX)/libdrv.a
+        $(LIBDRV_PREFIX)/libdrv.a \
+        $(LIBSCSI_PREFIX)/libscsi.a
+
 EXTRA_CFLAGS += \
         -I$(LIBUSB_PREFIX)/include \
         -I$(LIBUSBDEV_PREFIX)/include \
-        -I$(LIBDRV_PREFIX)/include
+        -I$(LIBDRV_PREFIX)/include \
+        -I$(LIBSCSI_PREFIX)/include
 
 BINARY = usbmast
 
 SOURCES = \
-        inquiry.c \
+        bo_trans.c \
+        cmdw.c \
         main.c \
-        mast.c
+        scsi_ms.c
 
 include $(USPACE_PREFIX)/Makefile.common