--- old-phidget21.linux/Makefile	2006-09-23 15:15:32.000000000 -0700
+++ new-phidget21.linux/Makefile	2006-09-23 15:15:32.000000000 -0700
@@ -39,11 +39,6 @@
 	cusblinux.c \
 	phidget21.c
 
-libusb := libusb/usb.c \
-	libusb/descriptors.c \
-	libusb/linux.c \
-	libusb/error.c
-
 PHIDGET21_JNI_C_SRC := Java/com_phidgets_Phidget.c \
 	Java/com_phidgets_AccelerometerPhidget.c \
 	Java/com_phidgets_AdvancedServoPhidget.c \
@@ -64,17 +59,15 @@
 
 libphidget21objs := $(libphidget21cs:.c=.o)
 
-libusbobjs := $(libusb:.c=.o)
-
 jnistuffobjs := $(PHIDGET21_JNI_C_SRC:.c=.o)
 
 all: libphidget21.a libphidget21.so generateL.h
 
-libphidget21.a: $(libusbobjs) $(libphidget21objs) 
-	ar r libphidget21.a $(libusbobjs) $(libphidget21objs) 
+libphidget21.a: $(libphidget21objs) 
+	ar r libphidget21.a $(libphidget21objs) 
 
 libphidget21.so: $(libusbobjs) $(libphidget21objs)
-	gcc -g -shared -o libphidget21.so $(libusbobjs) $(libphidget21objs) -lpthread
+	gcc -g -shared -o libphidget21.so $(libphidget21objs) -lusb -lpthread
 
 jni: $(libusbobjs) $(libphidget21objs) $(jnistuffobjs) libphidget21.a
 	gcc -g -shared -o libphidget21.so $(libusbobjs) $(libphidget21objs) $(jnistuffobjs) -lpthread

--- old-phidget21.linux/cusblinux.c	2006-09-23 15:15:32.000000000 -0700
+++ new-phidget21.linux/cusblinux.c	2006-09-23 15:15:32.000000000 -0700
@@ -265,7 +265,7 @@
 
 void CUSBCleanup(void)
 {
-	usb_cleanup();
+	/* libusb no longer requires (or provides) a usb_cleanup() call */
 }
 /* 
 	CUSBOpenHandle takes a CPhidgetInfo structure, with