Merge branch 'master' into maverick

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

makefile_linux

@@ -22,8 +22,7 @@ CFLAGS = -I$(HDFROOT)/include -I/usr/include/hdf -I$(TCLINC) -DHDF4 -DHDF5 \
 
 BINTARGET = bin
 EXTRA=nintf.o
-SUBLIBS = psi/libpsi.a psi/hardsup/libhlib.a matrix/libmatrix.a \
-	psi/tecs/libtecsl.a
+SUBLIBS = psi/libpsi.a psi/hardsup/libhlib.a matrix/libmatrix.a
 LIBS =  -L$(HDFROOT)/lib $(SUBLIBS) $(NILIB)\
         -ltcl  -lNeXus -lhdf5 -lmfhdf -ldf \
         -lmxml -lghttp -ljpeg -ljson -ldl -lz   -lm  -lc