better check for NULL on access

[usb-driver] / Makefile

diff --git a/Makefile b/Makefile
index 3325a89f5b026de9a160f90d68e72b97fbdd92c0..bd63135ce7c5cc842962cbb428fbea1b4c0a43c9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,17 +1,22 @@
-CFLAGS=-Wall -fPIC
+#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
 
-SOBJECTS=libusb-driver.so libusb-driver-DEBUG.so libusb-driver-trenz.so
+FTDI := $(shell libftdi-config --libs 2>/dev/null)
+ifneq ($(FTDI),)
+JTAGKEYSRC = jtagkey.c
+CFLAGS += -DJTAGKEY
+endif
 
-all: $(SOBJECTS)
+SOBJECTS=libusb-driver.so libusb-driver-DEBUG.so
 
-libusb-driver.so: usb-driver.c usb-driver.h
-       gcc $(CFLAGS) $< -o $@ -ldl -lusb -lpthread -shared
+all: $(SOBJECTS)
 
-libusb-driver-trenz.so: usb-driver.c usb-driver.h
-       gcc -DTRENZ $(CFLAGS) $< -o $@ -ldl -lusb -lpthread -shared
+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
+       gcc $(CFLAGS) usb-driver.c parport.c config.c jtagmon.c $(JTAGKEYSRC) -o $@ -ldl -lusb -lpthread $(FTDI) -shared
 
-libusb-driver-DEBUG.so: usb-driver.c usb-driver.h
-       gcc -DDEBUG $(CFLAGS) $< -o $@ -ldl -lusb -lpthread -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
+       gcc -DDEBUG $(CFLAGS) usb-driver.c parport.c config.c jtagmon.c $(JTAGKEYSRC) -o $@ -ldl -lusb -lpthread $(FTDI) -shared
 
 clean:
        rm -f $(SOBJECTS)