add lib32 target to build a 32 bit library on 64 bit systems

[usb-driver] / Makefile

diff --git a/Makefile b/Makefile
index 1ce1b06b7aef966bbeb54f08e0c9b940e95a70a0..16817066407d9864e90309bb58898cd708cec233 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,16 +1,35 @@
 #Add -DFORCE_PC3_IDENT to CFLAGS to force the identification of
 #a Parallel Cable III
-CFLAGS=-Wall -fPIC #-DFORCE_PC3_IDENT
+CFLAGS=-Wall -fPIC -DUSB_DRIVER_VERSION="\"$(shell stat -c '%y' usb-driver.c |cut -d\. -f1)\"" #-DFORCE_PC3_IDENT
+
+MARCH := $(shell uname -m)
+ifeq ($(MARCH),x86_64)
+CFLAGS += -m64
+else
+CFLAGS += -m32
+endif
+
+FTDI := $(shell libftdi-config --libs 2>/dev/null)
+ifneq ($(FTDI),)
+JTAGKEYSRC = jtagkey.c
+CFLAGS += -DJTAGKEY
+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
+
+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: usb-driver.c usb-driver.h Makefile
-       gcc $(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
+       $(CC) -DDEBUG $(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 Makefile
-       gcc -DDEBUG $(CFLAGS) $< -o $@ -ldl -lusb -lpthread -shared
+lib32:
+       $(MAKE) MARCH=i386 clean all
 
 clean:
        rm -f $(SOBJECTS)