From 0a199c36ed6903340716e2b2d2ec6805cd1c3b87 Mon Sep 17 00:00:00 2001 From: Alan Ott Date: Tue, 5 Jun 2012 16:18:49 -0400 Subject: [PATCH] Linux: Fix error in Makefile When the libusb implementation was moved into libusb/, this Makefile didn't get updated properly. --- linux/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/linux/Makefile b/linux/Makefile index f731519..04ce1de 100644 --- a/linux/Makefile +++ b/linux/Makefile @@ -19,7 +19,7 @@ CXXFLAGS ?= -Wall -g -fpic LDFLAGS ?= -Wall -g -COBJS_HIDRAW = hid.o +COBJS = hid.o CPPOBJS = ../hidtest/hidtest.o OBJS = $(COBJS) $(CPPOBJS) LIBS_UDEV = `pkg-config libudev --libs` -lrt @@ -28,11 +28,11 @@ INCLUDES ?= -I../hidapi `pkg-config libusb-1.0 --cflags` # Console Test Program -hidtest-hidraw: $(COBJS_HIDRAW) $(CPPOBJS) +hidtest-hidraw: $(COBJS) $(CPPOBJS) $(CXX) $(LDFLAGS) $^ $(LIBS_UDEV) -o $@ # Shared Libs -libhidapi-hidraw.so: $(COBJS_HIDRAW) +libhidapi-hidraw.so: $(COBJS) $(CC) $(LDFLAGS) $(LIBS_UDEV) -shared -fpic -Wl,-soname,$@.0 $^ -o $@ # Objects