Learn how easy it is to sync an existing GitHub or Google Code repo to a SourceForge project! See Demo

Close

Commit [f1b75e] default Maximize Restore History

instrument control: improve autoconf, mainly for non linux targets

dac922 dac922 2013-03-08

1 2 > >> (Page 1 of 2)
changed instrument-control/src/tcp/tcp_close.cc
changed instrument-control/src/tcp/tcp_class.cc
changed instrument-control/src/tcp/tcp_read.cc
changed instrument-control/src/tcp/tcp_write.cc
changed instrument-control/src/tcp/tcp.cc
changed instrument-control/src/tcp/tcp_timeout.cc
changed instrument-control/src/usbtmc/usbtmc_read.cc
changed instrument-control/src/usbtmc/usbtmc_write.cc
changed instrument-control/src/usbtmc/usbtmc_class.cc
changed instrument-control/src/usbtmc/usbtmc.cc
changed instrument-control/src/usbtmc/usbtmc_close.cc
changed instrument-control/src/gpib/gpib_read.cc
changed instrument-control/src/gpib/gpib_class.cc
changed instrument-control/src/gpib/gpib.cc
changed instrument-control/src/gpib/gpib_timeout.cc
changed instrument-control/src/gpib/gpib_write.cc
changed instrument-control/src/gpib/gpib_close.cc
copied instrument-control/src/tcp/Makefile -> instrument-control/src/tcp/Makefile.in
copied instrument-control/src/usbtmc/Makefile -> instrument-control/src/usbtmc/Makefile.in
copied instrument-control/src/gpib/Makefile -> instrument-control/src/gpib/Makefile.in
copied instrument-control/src/vxi11/Makefile -> instrument-control/src/vxi11/Makefile.in
instrument-control/src/tcp/tcp_close.cc Diff Switch to side-by-side view
Loading...
instrument-control/src/tcp/tcp_class.cc Diff Switch to side-by-side view
Loading...
instrument-control/src/tcp/tcp_read.cc Diff Switch to side-by-side view
Loading...
instrument-control/src/tcp/tcp_write.cc Diff Switch to side-by-side view
Loading...
instrument-control/src/tcp/tcp.cc Diff Switch to side-by-side view
Loading...
instrument-control/src/tcp/tcp_timeout.cc Diff Switch to side-by-side view
Loading...
instrument-control/src/usbtmc/usbtmc_read.cc Diff Switch to side-by-side view
Loading...
instrument-control/src/usbtmc/usbtmc_write.cc Diff Switch to side-by-side view
Loading...
instrument-control/src/usbtmc/usbtmc_class.cc Diff Switch to side-by-side view
Loading...
instrument-control/src/usbtmc/usbtmc.cc Diff Switch to side-by-side view
Loading...
instrument-control/src/usbtmc/usbtmc_close.cc Diff Switch to side-by-side view
Loading...
instrument-control/src/gpib/gpib_read.cc Diff Switch to side-by-side view
Loading...
instrument-control/src/gpib/gpib_class.cc Diff Switch to side-by-side view
Loading...
instrument-control/src/gpib/gpib.cc Diff Switch to side-by-side view
Loading...
instrument-control/src/gpib/gpib_timeout.cc Diff Switch to side-by-side view
Loading...
instrument-control/src/gpib/gpib_write.cc Diff Switch to side-by-side view
Loading...
instrument-control/src/gpib/gpib_close.cc Diff Switch to side-by-side view
Loading...
instrument-control/src/tcp/Makefile to instrument-control/src/tcp/Makefile.in
--- a/instrument-control/src/tcp/Makefile
+++ b/instrument-control/src/tcp/Makefile.in
@@ -2,17 +2,22 @@
 OBJ := tcp_class.o
 
 MKOCTFILE ?= mkoctfile
-TCPLIBS   ?=
+
+CFLAGS     = @DEFS@
+LFLAGS     = @TCPLIBS@
 
 all: $(OBJ) $(OCT)
 
 %.o: %.cc
-	$(MKOCTFILE) -c $^
+	$(MKOCTFILE) $(CFLAGS) -c $^
 
 %.oct: %.o
-	$(MKOCTFILE) $^ $(OBJ) $(TCPLIBS) -o ../$@
+	$(MKOCTFILE) $^ $(OBJ) $(LFLAGS) $(TCPLIBS) -o ../$@
 
 clean:
 	rm -f *.oct *.o
 
+distclean: clean
+	rm Makefile
+
 .PHONY: all clean
instrument-control/src/usbtmc/Makefile to instrument-control/src/usbtmc/Makefile.in
--- a/instrument-control/src/usbtmc/Makefile
+++ b/instrument-control/src/usbtmc/Makefile.in
@@ -3,15 +3,20 @@
 
 MKOCTFILE ?= mkoctfile
 
+CFLAGS     = @DEFS@
+
 all: $(OBJ) $(OCT)
 
 %.o: %.cc
-	$(MKOCTFILE) -c $^
+	$(MKOCTFILE) $(CFLAGS) -c $^
 
 %.oct: %.o
 	$(MKOCTFILE) $^ $(OBJ) -o ../$@
 
 clean:
 	rm -f *.oct *.o
+	
+distclean: clean
+	rm Makefile
 
 .PHONY: all clean
instrument-control/src/gpib/Makefile to instrument-control/src/gpib/Makefile.in
--- a/instrument-control/src/gpib/Makefile
+++ b/instrument-control/src/gpib/Makefile.in
@@ -1,19 +1,23 @@
 OCT := gpib.oct gpib_timeout.oct gpib_write.oct gpib_close.oct gpib_read.oct
 OBJ := gpib_class.o
 
-MKOCTFILE ?= mkoctfile
+MKOCTFILE  ?= mkoctfile
 
-GPIBLIBS ?= -lgpib
+CFLAGS      = @DEFS@
+LFLAGS      = @GPIBLIBS@
 
 all: $(OBJ) $(OCT)
 
 %.o: %.cc
-	$(MKOCTFILE) -c $^
+	$(MKOCTFILE) $(CFLAGS) -c $^
 
 %.oct: %.o
-	$(MKOCTFILE) $^ $(OBJ) $(GPIBLIBS) -o ../$@
+	$(MKOCTFILE) $^ $(OBJ) $(LFLAGS) -o ../$@
 
 clean:
 	rm -f *.oct *.o
 
+distclean: clean
+	rm Makefile
+
 .PHONY: all clean
instrument-control/src/vxi11/Makefile to instrument-control/src/vxi11/Makefile.in
--- a/instrument-control/src/vxi11/Makefile
+++ b/instrument-control/src/vxi11/Makefile.in
@@ -5,22 +5,28 @@
 MKOCTFILE  ?= mkoctfile
 RPCGEN     ?= rpcgen
 
+CFLAGS      = @RPCINCLUDE@ @DEFS@
+LFLAGS      = @RPCLIBS@
+
 all: $(VXI) $(OBJ) $(OCT) 
 
 vxi11.h vxi11_clnt.c vxi11_xdr.c : vxi11.x
 	$(RPCGEN) -M vxi11.x
 
 %.o: %.c
-	$(MKOCTFILE) $(RPCINCLUDE) -c $^
+	$(MKOCTFILE) $(CFLAGS) $(RPCINCLUDE) -c $^
 	
 %.o: %.cc
-	$(MKOCTFILE) $(RPCINCLUDE) -c $^
+	$(MKOCTFILE) $(CFLAGS) $(RPCINCLUDE) -c $^
 
 %.oct: %.o
-	$(MKOCTFILE) $^ $(OBJ) $(VXI) $(RPCLIBS) -o ../$@
+	$(MKOCTFILE) $^ $(OBJ) $(VXI) $(LFLAGS) -o ../$@
 
 clean:
 	rm -f *.oct *.o
 	rm -f vxi11.h vxi11_clnt.c vxi11_xdr.c vxi11_svc.c 
+	
+distclean: clean
+	rm Makefile
 
 .PHONY: all clean
1 2 > >> (Page 1 of 2)