fix usb_reset. sharing the cable between applications is still possible.

[usb-driver] / Makefile

diff --git a/Makefile b/Makefile
index 16817066407d9864e90309bb58898cd708cec233..de3216dfdcc727bea5695f9c0ca279a0f1c18580 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,37 +1,40 @@
 #Add -DFORCE_PC3_IDENT to CFLAGS to force the identification of
 #a Parallel Cable III
-CFLAGS=-Wall -fPIC -DUSB_DRIVER_VERSION="\"$(shell stat -c '%y' usb-driver.c |cut -d\. -f1)\"" #-DFORCE_PC3_IDENT
+#Add -DNO_USB_RESET to disable the hard reset of the cable when
+#opening the device
+CFLAGS=-Wall -fPIC -DUSB_DRIVER_VERSION="\"$(shell stat -c '%y' usb-driver.c |cut -d\. -f1)\"" #-DFORCE_PC3_IDENT -DNO_USB_RESET
 
-MARCH := $(shell uname -m)
-ifeq ($(MARCH),x86_64)
-CFLAGS += -m64
-else
+LIBS=-ldl -lusb -lpthread
+
+SRC=usb-driver.c parport.c config.c jtagmon.c
+HEADER=usb-driver.h parport.h jtagkey.h config.h jtagmon.h
+
+ifeq ($(LIBVER),32)
 CFLAGS += -m32
 endif
 
 FTDI := $(shell libftdi-config --libs 2>/dev/null)
 ifneq ($(FTDI),)
-JTAGKEYSRC = jtagkey.c
+SRC += jtagkey.c
 CFLAGS += -DJTAGKEY
+LIBS += $(FTDI)
 endif
 
 SOBJECTS=libusb-driver.so libusb-driver-DEBUG.so
 
 all: $(SOBJECTS)
-ifeq ($(MARCH),x86_64)
-       @echo Built library is 64 bit. Run \`make lib32\' to build a 32 bit version
-endif
+       @file libusb-driver.so | grep x86-64 >/dev/null && echo Built library is 64 bit. Run \`make lib32\' to build a 32 bit version || true
 
-libusb-driver.so: usb-driver.c parport.c jtagkey.c config.c jtagmon.c usb-driver.h parport.h jtagkey.h config.h jtagmon.h Makefile
-       $(CC) $(CFLAGS) usb-driver.c parport.c config.c jtagmon.c $(JTAGKEYSRC) -o $@ -ldl -lusb -lpthread $(FTDI) -shared
+libusb-driver.so: $(SRC) $(HEADER) Makefile
+       $(CC) $(CFLAGS) $(SRC) -o $@ $(LIBS) -shared
 
-libusb-driver-DEBUG.so: usb-driver.c parport.c jtagkey.c config.c jtagmon.c usb-driver.h parport.h jtagkey.h config.h jtagmon.h Makefile
-       $(CC) -DDEBUG $(CFLAGS) usb-driver.c parport.c config.c jtagmon.c $(JTAGKEYSRC) -o $@ -ldl -lusb -lpthread $(FTDI) -shared
+libusb-driver-DEBUG.so: $(SRC) $(HEADER) Makefile
+       $(CC) -DDEBUG $(CFLAGS) $(SRC) -o $@ $(LIBS) -shared
 
 lib32:
-       $(MAKE) MARCH=i386 clean all
+       $(MAKE) LIBVER=32 clean all
 
 clean:
        rm -f $(SOBJECTS)
 
-.PHONY: clean all
+.PHONY: clean all lib32