[Octave-cvsupdate] SF.net SVN: octave:[11091] trunk/octave-forge/main/instrument-control

[<ean...@us...>]

Revision: 11091
          http://octave.svn.sourceforge.net/octave/?rev=11091&view=rev
Author:   eandrius
Date:     2012-09-23 21:17:01 +0000 (Sun, 23 Sep 2012)
Log Message:
-----------
instrument-control: changes to Makefiles regarding autoloading/unloading of functions

Modified Paths:
--------------
    trunk/octave-forge/main/instrument-control/src/Makefile
    trunk/octave-forge/main/instrument-control/src/i2c/Makefile
    trunk/octave-forge/main/instrument-control/src/parallel/Makefile
    trunk/octave-forge/main/instrument-control/src/serial/Makefile

Removed Paths:
-------------
    trunk/octave-forge/main/instrument-control/PKG_ADD

Deleted: trunk/octave-forge/main/instrument-control/PKG_ADD
===================================================================
--- trunk/octave-forge/main/instrument-control/PKG_ADD	2012-09-23 15:47:11 UTC (rev 11090)
+++ trunk/octave-forge/main/instrument-control/PKG_ADD	2012-09-23 21:17:01 UTC (rev 11091)
@@ -1,26 +0,0 @@
-# Serial
-autoload ("serial", "instrument-control.oct");
-autoload ("srl_timeout", "instrument-control.oct");
-autoload ("srl_stopbits", "instrument-control.oct");
-autoload ("srl_read", "instrument-control.oct");
-autoload ("srl_parity", "instrument-control.oct");
-autoload ("srl_close", "instrument-control.oct");
-autoload ("srl_bytesize", "instrument-control.oct");
-autoload ("srl_write", "instrument-control.oct");
-autoload ("srl_flush", "instrument-control.oct");
-autoload ("srl_baudrate", "instrument-control.oct");
-
-# I2C
-autoload ("i2c", "instrument-control.oct");
-autoload ("i2c_addr", "instrument-control.oct");
-autoload ("i2c_read", "instrument-control.oct");
-autoload ("i2c_close", "instrument-control.oct");
-autoload ("i2c_write", "instrument-control.oct");
-
-# Parallel
-autoload ("parallel", "instrument-control.oct");
-autoload ("pp_close", "instrument-control.oct");
-autoload ("pp_ctrl", "instrument-control.oct");
-autoload ("pp_data", "instrument-control.oct");
-autoload ("pp_datadir", "instrument-control.oct");
-autoload ("pp_stat", "instrument-control.oct");
\ No newline at end of file

Modified: trunk/octave-forge/main/instrument-control/src/Makefile
===================================================================
--- trunk/octave-forge/main/instrument-control/src/Makefile	2012-09-23 15:47:11 UTC (rev 11090)
+++ trunk/octave-forge/main/instrument-control/src/Makefile	2012-09-23 21:17:01 UTC (rev 11091)
@@ -1,11 +1,11 @@
-OCT = instrument-control.oct
+#OCT = instrument-control.oct
 SUBDIRS = i2c serial parallel
 
 MKOCTFILE ?= mkoctfile
 
 all:
 	@for dir in $(SUBDIRS); do $(MAKE) -C $$dir; done
-	$(MKOCTFILE) i2c/*.o serial/*.o parallel/*.o -o $(OCT)
+	#$(MKOCTFILE) i2c/*.o serial/*.o parallel/*.o -o $(OCT)
 	
 clean:
 	 @for dir in $(SUBDIRS); do $(MAKE) -C $$dir clean; done

Modified: trunk/octave-forge/main/instrument-control/src/i2c/Makefile
===================================================================
--- trunk/octave-forge/main/instrument-control/src/i2c/Makefile	2012-09-23 15:47:11 UTC (rev 11090)
+++ trunk/octave-forge/main/instrument-control/src/i2c/Makefile	2012-09-23 21:17:01 UTC (rev 11091)
@@ -1,19 +1,12 @@
-OCT := i2c.oct
-OBJ := i2c.o i2c_close.o i2c_addr.o i2c_write.o i2c_read.o
+OCT := i2c.oct i2c_close.oct i2c_addr.oct i2c_write.oct i2c_read.oct
 
 MKOCTFILE ?= mkoctfile
 
-all: $(OBJ)
+all: $(OCT)
 
-oct: $(OCT)
+%.oct: %.cc
+	$(MKOCTFILE) $^ -o ../$@
 
-%.oct: $(OBJ)
-	$(MKOCTFILE) $^
-
-%.o: %.cc
-	$(MKOCTFILE) -c -s $<
-
-
 clean:
 	rm -f *.oct *.o
 

Modified: trunk/octave-forge/main/instrument-control/src/parallel/Makefile
===================================================================
--- trunk/octave-forge/main/instrument-control/src/parallel/Makefile	2012-09-23 15:47:11 UTC (rev 11090)
+++ trunk/octave-forge/main/instrument-control/src/parallel/Makefile	2012-09-23 21:17:01 UTC (rev 11091)
@@ -1,19 +1,12 @@
-OCT := parallel.oct
-OBJ := parallel.o pp_close.o pp_datadir.o pp_data.o pp_stat.o pp_ctrl.o
+OCT := parallel.oct pp_close.oct pp_datadir.oct pp_data.oct pp_stat.oct pp_ctrl.oct
 
 MKOCTFILE ?= mkoctfile
 
-all: $(OBJ)
+all: $(OCT)
 
-oct: $(OCT)
+%.oct: %.cc
+	$(MKOCTFILE) $^ -o ../$@
 
-%.oct: $(OBJ)
-	$(MKOCTFILE) $^
-
-%.o: %.cc
-	$(MKOCTFILE) -c -s $<
-
-
 clean:
 	rm -f *.oct *.o
 

Modified: trunk/octave-forge/main/instrument-control/src/serial/Makefile
===================================================================
--- trunk/octave-forge/main/instrument-control/src/serial/Makefile	2012-09-23 15:47:11 UTC (rev 11090)
+++ trunk/octave-forge/main/instrument-control/src/serial/Makefile	2012-09-23 21:17:01 UTC (rev 11091)
@@ -1,19 +1,13 @@
-OCT := serial.oct
-OBJ := serial.o srl_baudrate.o srl_timeout.o srl_bytesize.o srl_flush.o \
-	srl_parity.o srl_stopbits.o srl_write.o srl_close.o srl_read.o
+OCT := serial.oct srl_baudrate.oct srl_timeout.oct srl_bytesize.oct srl_flush.oct \
+	srl_parity.oct srl_stopbits.oct srl_write.oct srl_close.oct srl_read.oct
 
 MKOCTFILE ?= mkoctfile
 
-all: $(OBJ)
+all: $(OCT)
 
-oct: $(OCT)
+%.oct: %.cc
+	$(MKOCTFILE) $^ -o ../$@
 
-%.oct: $(OBJ)
-	$(MKOCTFILE) $^
-
-%.o: %.cc
-	$(MKOCTFILE) -c -s $<
-
 clean:
 	rm -f *.oct *.o
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.