Changeset f1fae414 in mainline for uspace/drv/bus/usb/uhci/Makefile

Timestamp:

2011-06-22T01:34:53Z (13 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

8d7e82c1, cac458f

Parents:

72ec8cc (diff), bf172825 (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/uhci/Makefile (moved) (moved from uspace/drv/uhci_hcd/Makefile ) (3 diffs)

uspace/drv/bus/usb/uhci/Makefile

@@ -27 +27 @@
 #
 
-USPACE_PREFIX = ../..
+USPACE_PREFIX = ../../../..
 
 LIBS = \
@@ -33 +33 @@
         $(LIBUSB_PREFIX)/libusb.a \
         $(LIBDRV_PREFIX)/libdrv.a
+
 EXTRA_CFLAGS += \
         -I$(LIBUSB_PREFIX)/include \
@@ -38 +39 @@
         -I$(LIBDRV_PREFIX)/include
 
-BINARY = uhci_hcd
+BINARY = uhci
 
 SOURCES = \