Always set return value for parallel ports

[usb-driver] / Makefile

diff --git a/Makefile b/Makefile
index f8444845ae8c4f0f90296b19c89c0d0f8ac9660f..baff08d9d68c8fd95d6c89836f1832e6c4026ac8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,13 @@
 #Add -DFORCE_PC3_IDENT to CFLAGS to force the identification of
 #a Parallel Cable III
 #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
+
+LIBS=-ldl -lusb -lpthread
+
+SRC=usb-driver.c xpcu.c parport.c config.c jtagmon.c
+HEADER=usb-driver.h xpcu.h parport.h jtagkey.h config.h jtagmon.h

 
 ifeq ($(LIBVER),32)
 CFLAGS += -m32
 
 ifeq ($(LIBVER),32)
 CFLAGS += -m32


@@ -8,8 +15,9 @@ endif
 
 FTDI := $(shell libftdi-config --libs 2>/dev/null)
 ifneq ($(FTDI),)
 
 FTDI := $(shell libftdi-config --libs 2>/dev/null)
 ifneq ($(FTDI),)

-JTAGKEYSRC = jtagkey.c
+SRC += jtagkey.c

 CFLAGS += -DJTAGKEY
 CFLAGS += -DJTAGKEY

+LIBS += $(FTDI)

 endif
 
 SOBJECTS=libusb-driver.so libusb-driver-DEBUG.so
 endif
 
 SOBJECTS=libusb-driver.so libusb-driver-DEBUG.so


@@ -17,11 +25,11 @@ SOBJECTS=libusb-driver.so libusb-driver-DEBUG.so
 all: $(SOBJECTS)
        @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
 
 all: $(SOBJECTS)
        @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) LIBVER=32 clean all
 
 lib32:
        $(MAKE) LIBVER=32 clean all


@@ -29,4 +37,4 @@ lib32:
 clean:
        rm -f $(SOBJECTS)
 
 clean:
        rm -f $(SOBJECTS)
 

-.PHONY: clean all
+.PHONY: clean all lib32