fixes for cross-compilation

diff --git a/Makefile b/Makefile
index 1ba37e69e135208c97a139b53364af1612f966b9..2d5deab1fcb672ac6cd729087d57b09a532bc732 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -11,6 +11,12 @@ MAJOR=0
 
 CFLAGS = -Wall -O2
 
+CROSS   := 
+CC      := $(CROSS)gcc
+AR      := $(CROSS)ar
+LD      := $(CROSS)ld
+INSTALL := install
+
 TARGETS = comedilib
 ifeq ($(with_python),yes)
 TARGETS += python

diff --git a/lib/Makefile b/lib/Makefile
index 35b1a5a0af111449ced9a5063554d2b00f28aae8..d8d13fb11e9760b5729adc1d30de1385a04dcc2f 100644 (file)
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -5,9 +5,9 @@ OBJS=comedi.o timer.o sv.o range.o ioctl.o filler.o timed.o error.o \
        dio.o data.o get.o cmd.o buffer.o
 
 libcomedi.a: $(OBJS)
-       #gcc -shared -Wl,-soname,libcomedi.so,-T,version_script -o libcomedi.so.${VERSION_CODE} $(OBJS) -lm
-       gcc -shared -Wl,-soname,libcomedi.so.0 -o libcomedi.so.${version} $(OBJS) -lm
-       ar rs libcomedi.a $(OBJS)
+       #$(CC) -shared -Wl,-soname,libcomedi.so,-T,version_script -o libcomedi.so.${VERSION_CODE} $(OBJS) -lm
+       $(CC) -shared -Wl,-soname,libcomedi.so.0 -o libcomedi.so.${version} $(OBJS) -lm
+       $(AR) rs libcomedi.a $(OBJS)
        ln -sf libcomedi.so.${version} libcomedi.so
        ln -sf libcomedi.so.${version} libcomedi.so.0
 

diff --git a/testing/Makefile b/testing/Makefile
index 847c31b5f1f67b14090042504f4db55f0daabaf8..dd59caeee102b65898662e63d491841e714be2c4 100644 (file)
--- a/testing/Makefile
+++ b/testing/Makefile
@@ -2,12 +2,12 @@
 
 
 CFLAGS =-I ../include -I . -O2 -Wall -Wstrict-prototypes
-LDFLAGS=-L../lib/ -lcomedi -static
+LDFLAGS=-L../lib/ -lcomedi -lm -static
 
 
 TARG=comedi_test
 OBJS=main.o mode0_read.o insn_read.o info.o cmd_1.o insn_read_time.o \
-       cmd_2.o mmap.o select.o cmd_3.o bufconfig.o lib.o
+       cmd_2.o mmap.o select.o cmd_3.o bufconfig.o lib.o inttrig.o
 
 all: $(TARG)