Cleaned up ANSTO code to merge with sinqdev.sics

This is our new RELEASE-4_0 branch which was taken from ansto/93d9a7c
Conflicts:
	.gitignore
	SICSmain.c
	asynnet.c
	confvirtualmot.c
	counter.c
	devexec.c
	drive.c
	event.h
	exebuf.c
	exeman.c
	histmem.c
	interface.h
	motor.c
	motorlist.c
	motorsec.c
	multicounter.c
	napi.c
	napi.h
	napi4.c
	network.c
	nwatch.c
	nxscript.c
	nxxml.c
	nxxml.h
	ofac.c
	reflist.c
	scan.c
	sicshipadaba.c
	sicsobj.c
	site_ansto/docs/Copyright.txt
	site_ansto/instrument/lyrebird/config/tasmad/sicscommon/nxsupport.tcl
	site_ansto/instrument/lyrebird/config/tasmad/taspub_sics/tasscript.tcl
	statusfile.c
	tasdrive.c
	tasub.c
	tasub.h
	tasublib.c
	tasublib.h

make_gen

@@ -5,15 +5,18 @@
 # Markus Zolliker March 2003
 #---------------------------------------------------------------------------
 
+EPICSOBJ=epicsmotor.o
+#EPICSOBJ=
+
 COBJ = Sclient.o network.o ifile.o   intcli.o $(FORTIFYOBJ)  
 SOBJ =  network.o ifile.o conman.o SCinter.o splitter.o passwd.o \
        servlog.o sicvar.o nserver.o SICSmain.o motorlist.o\
        sicsexit.o  costa.o task.o $(FORTIFYOBJ) testprot.o\
-       macro.o ofac.o obpar.o obdes.o drive.o status.o intserv.o \
+       macro.o ofac.o obpar.o obdes.o drive.o status.o intserv.o  \
        devexec.o mumo.o mumoconf.o selector.o selvar.o fupa.o lld.o \
-       lld_blob.o  strrepl.o lin2ang.o fomerge.o  napi5.o napi4.o\
-       script.o o2t.o  alias.o napi.o  stringdict.o sdynar.o \
-       histmem.o histdriv.o histsim.o  interface.o callback.o nxio.o \
+       lld_blob.o  strrepl.o lin2ang.o fomerge.o  \
+       script.o o2t.o  alias.o  stringdict.o sdynar.o \
+       histmem.o histdriv.o histsim.o  interface.o callback.o  \
         event.o emon.o evcontroller.o evdriver.o simev.o perfmon.o \
        danu.o  nxdict.o varlog.o stptok.o nread.o trigd.o cell.o\
        scan.o fitcenter.o telnet.o token.o  wwildcard.o hklmot.o\
@@ -23,7 +26,7 @@ SOBJ =  network.o ifile.o conman.o SCinter.o splitter.o passwd.o \
        simchop.o choco.o chadapter.o  trim.o scaldate.o tasub.o\
        xytable.o   exebuf.o exeman.o ubfour.o ubcalc.o\
        circular.o  maximize.o sicscron.o  scanvar.o tasublib.o\
-       d_sign.o d_mod.o tcldrivable.o stdscan.o diffscan.o nxxml.o\
+       d_sign.o d_mod.o tcldrivable.o stdscan.o diffscan.o \
        synchronize.o definealias.o  oscillate.o tasdrive.o \
        hmcontrol.o userscan.o  rs232controller.o lomax.o tasscanub.o \
        fourlib.o motreg.o motreglist.o anticollider.o nxdataset.o \
@@ -36,19 +39,20 @@ SOBJ =  network.o ifile.o conman.o SCinter.o splitter.o passwd.o \
        moregress.o  multicounter.o regresscter.o histregress.o \
        sicshdbadapter.o polldriv.o sicspoll.o statemon.o hmslave.o \
        nwatch.o asyncqueue.o asyncprotocol.o sicsobj.o frame.o syncedprot.o\
-       nxcopy.o nxinterhelper.o nxinter_wrap.o  nxstack.o arrayutil.o \
+       nxcopy.o nxinterhelper.o nxinter_wrap.o   arrayutil.o \
        sctdriveadapter.o sctdriveobj.o reflist.o singlex.o fourmess.o \
        sgclib.o sgfind.o sgio.o sgsi.o sghkl.o singlediff.o singlebi.o \
        singlenb.o simindex.o simidx.o uselect.o singletas.o motorsec.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
+       singlebinb.o taskobj.o sctcomtask.o tasmono.o multicountersec.o \
+       messagepipe.o sicsget.o remoteobject.o 
  
 MOTOROBJ = motor.o  simdriv.o  
 COUNTEROBJ =  countdriv.o simcter.o counter.o
 VELOOBJ    = velo.o velosim.o 
 
-OBJ = $(SOBJ) $(MOTOROBJ) $(COUNTEROBJ) $(VELOOBJ) $(DIFIL) $(EXTRA)
+OBJ = $(SOBJ) $(MOTOROBJ) $(COUNTEROBJ) $(VELOOBJ) $(DIFIL) $(EXTRA) $(EPICSOBJ)
 
 .SUFFIXES:
 .SUFFIXES: .tcl .htm .c .o .tc
@@ -59,43 +63,37 @@ OBJ = $(SOBJ) $(MOTOROBJ) $(COUNTEROBJ) $(VELOOBJ) $(DIFIL) $(EXTRA)
 #--- 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
 
 SICServer: $(OBJ) $(SUBLIBS)
-	$(CC) -g  -o SICServer $(OBJ) $(LIBS)
+	g++ $(DBG)  -o SICServer $(OBJ) $(LIBS)
 
 matrix/libmatrix.a: libmat
 
 libmat:
 	cd matrix; make $(MFLAGS) libmatrix.a
 
-psi/hardsup/libhlib.a: libhlib
+$(SICSROOT)/sicspsi/hardsup/libhlib.a: libhlib
 
 libhlib:
-	cd psi/hardsup; make $(MFLAGS) libhlib.a
+	cd $(SICSROOT)/sicspsi/hardsup; make $(MFLAGS) libhlib.a
 
-psi/tecs/libtecsl.a: libtecsl
-
-libtecsl:
-	cd psi/tecs; make $(MFLAGS) libtecsl.a
-
-psi/libpsi.a: libpsi
+$(SICSROOT)/sicspsi/libpsi.a: libpsi
 
 libpsi:
-	cd psi; make $(MFLAGS) libpsi.a
+	cd $(SICSROOT)/sicspsi; make $(MFLAGS) libpsi.a
 
 purge:
 	rm -f SICServer $(SUBLIBS)
 
 clean:
 	rm -f *.o *.d SICServer
-	cd psi/hardsup; make $(MFLAGS) clean
+	cd $(SICSROOT)/sicspsi/hardsup; make $(MFLAGS) clean
 	cd matrix; make $(MFLAGS) clean
-	cd psi/tecs; make $(MFLAGS) clean
-	cd psi; make $(MFLAGS) clean
+	cd $(SICSROOT)/sicspsi; make $(MFLAGS) clean
 
 Dbg.o:  Dbg.c
 	cc -g  -I/data/koenneck/include -c Dbg.c