Changeset b0f00a9 in mainline for uspace/drv/bus/usb/usbmast/Makefile

Timestamp:

2011-11-06T22:21:05Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

898e847

Parents:

2bdf8313 (diff), 7b5f4c9 (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/srv/hw/netif/ne2000/Makefile ) (2 diffs)

uspace/drv/bus/usb/usbmast/Makefile

@@ -1 +1 @@
 #
-# Copyright (c) 2005 Martin Decky
-# Copyright (c) 2007 Jakub Jermar
+# Copyright (c) 2011 Vojtech Horky
 # All rights reserved.
 #
@@ -29 +28 @@
 
 USPACE_PREFIX = ../../../..
-ROOT_PATH = $(USPACE_PREFIX)/..
-LIBS = $(LIBNET_PREFIX)/libnet.a
-EXTRA_CFLAGS = -I$(LIBNET_PREFIX)/include
 
-COMMON_MAKEFILE = $(ROOT_PATH)/Makefile.common
-CONFIG_MAKEFILE = $(ROOT_PATH)/Makefile.config
+LIBS = \
+        $(LIBUSBDEV_PREFIX)/libusbdev.a \
+        $(LIBUSB_PREFIX)/libusb.a \
+        $(LIBDRV_PREFIX)/libdrv.a \
+        $(LIBSCSI_PREFIX)/libscsi.a
 
--include $(COMMON_MAKEFILE)
--include $(CONFIG_MAKEFILE)
+EXTRA_CFLAGS += \
+        -I$(LIBUSB_PREFIX)/include \
+        -I$(LIBUSBDEV_PREFIX)/include \
+        -I$(LIBDRV_PREFIX)/include \
+        -I$(LIBSCSI_PREFIX)/include
 
-BINARY = ne2000
+BINARY = usbmast
 
 SOURCES = \
-        dp8390.c \
-        ne2000.c
+        bo_trans.c \
+        cmdw.c \
+        main.c \
+        scsi_ms.c
 
 include $(USPACE_PREFIX)/Makefile.common