projects
/
usb-driver
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
7517e9f
)
work correclty on 64bit systems with 32bit userland
author
Michael Gernoth
<michael@gernoth.net>
Sat, 26 May 2007 21:19:25 +0000
(23:19 +0200)
committer
Michael Gernoth
<michael@gernoth.net>
Sat, 26 May 2007 21:19:25 +0000
(23:19 +0200)
Makefile
patch
|
blob
|
blame
|
history
diff --git
a/Makefile
b/Makefile
index 16817066407d9864e90309bb58898cd708cec233..f8444845ae8c4f0f90296b19c89c0d0f8ac9660f 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-2,10
+2,7
@@
#a Parallel Cable III
CFLAGS=-Wall -fPIC -DUSB_DRIVER_VERSION="\"$(shell stat -c '%y' usb-driver.c |cut -d\. -f1)\"" #-DFORCE_PC3_IDENT
#a Parallel Cable III
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
+ifeq ($(LIBVER),32)
CFLAGS += -m32
endif
CFLAGS += -m32
endif
@@
-18,9
+15,7
@@
endif
SOBJECTS=libusb-driver.so libusb-driver-DEBUG.so
all: $(SOBJECTS)
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: 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
@@
-29,7
+24,7
@@
libusb-driver-DEBUG.so: usb-driver.c parport.c jtagkey.c config.c jtagmon.c usb-
$(CC) -DDEBUG $(CFLAGS) usb-driver.c parport.c config.c jtagmon.c $(JTAGKEYSRC) -o $@ -ldl -lusb -lpthread $(FTDI) -shared
lib32:
$(CC) -DDEBUG $(CFLAGS) usb-driver.c parport.c config.c jtagmon.c $(JTAGKEYSRC) -o $@ -ldl -lusb -lpthread $(FTDI) -shared
lib32:
- $(MAKE)
MARCH=i386
clean all
+ $(MAKE)
LIBVER=32
clean all
clean:
rm -f $(SOBJECTS)
clean:
rm -f $(SOBJECTS)
Impressum
,
Datenschutz