Merge branch 'master' into maverick

- Removed epicsmotor from motor.c
- Fixed a bad define in tasscanub.h
Conflicts:
	makefile_macosx

make_gen

@@ -46,7 +46,7 @@ SOBJ =  network.o ifile.o conman.o SCinter.o splitter.o passwd.o \
        rwpuffer.o asynnet.o background.o countersec.o hdbtable.o velosec.o \
        histmemsec.o sansbc.o sicsutil.o strlutil.o genbinprot.o trace.o\
        singlebinb.o taskobj.o sctcomtask.o tasmono.o multicountersec.o \
-       messagepipe.o sicsget.o
+       messagepipe.o sicsget.o remoteobject.o 
  
 MOTOROBJ = motor.o  simdriv.o  
 COUNTEROBJ =  countdriv.o simcter.o counter.o
@@ -63,7 +63,7 @@ OBJ = $(SOBJ) $(MOTOROBJ) $(COUNTEROBJ) $(VELOOBJ) $(DIFIL) $(EXTRA) $(EPICSOBJ)
 #--- This .SECONDARY. target is necessary to preserve generated .c files for debugging	
 .SECONDARY.: sicspoll.c polldriv.c
 
-all:	libmat libhlib libtecsl libpsi SICServer
+all:	libmat libhlib libpsi SICServer
 
 # use this target when some of the libraries SUBLIBS might be incomplete
 full:	purge all
@@ -81,12 +81,7 @@ $(SICSROOT)/sicspsi/hardsup/libhlib.a: libhlib
 libhlib:
 	cd $(SICSROOT)/sicspsi/hardsup; make $(MFLAGS) libhlib.a
 
-$(SICSROOT)/sicspsi/tecs/libtecsl.a: libtecsl
-
-libtecsl:
-	cd $(SICSROOT)/sicspsi/tecs; make $(MFLAGS) libtecsl.a
-
-$SICSROOT)/sicspsi/libpsi.a: libpsi
+$(SICSROOT)/sicspsi/libpsi.a: libpsi
 
 libpsi:
 	cd $(SICSROOT)/sicspsi; make $(MFLAGS) libpsi.a
@@ -98,7 +93,6 @@ clean:
 	rm -f *.o *.d SICServer
 	cd $(SICSROOT)/sicspsi/hardsup; make $(MFLAGS) clean
 	cd matrix; make $(MFLAGS) clean
-	cd $(SICSROOT)/sicspsi/tecs; make $(MFLAGS) clean
 	cd $(SICSROOT)/sicspsi; make $(MFLAGS) clean
 
 Dbg.o:  Dbg.c