Changeset 92574f4 in mainline for uspace/drv/usbmid/Makefile

Timestamp:

2011-02-24T12:03:27Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

e7b7ebd5

Parents:

4837092 (diff), a80849c (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:

Merged development (changes in DDF, etc.).

Conflicts in uspace/drv/usbkbd/main.c

File:

• uspace/drv/usbmid/Makefile (moved) (moved from uspace/drv/uhci/Makefile ) (2 diffs)

uspace/drv/usbmid/Makefile

@@ -1 +1 @@
 #
-# Copyright (c) 2010 Vojtech Horky
+# Copyright (c) 2011 Vojtech Horky
 # All rights reserved.
 #
@@ -30 +30 @@
 LIBS = $(LIBDRV_PREFIX)/libdrv.a $(LIBUSB_PREFIX)/libusb.a
 EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include -I$(LIBUSB_PREFIX)/include
-BINARY = uhci
+BINARY = usbmid
 
 SOURCES = \
+        dump.c \
+        explore.c \
         main.c \
-        pci.c \
-        transfers.c
+        usbmid.c
 
 include $(USPACE_PREFIX)/Makefile.common