Index: trunk/FACT++/Makefile.in
===================================================================
--- trunk/FACT++/Makefile.in	(revision 18354)
+++ trunk/FACT++/Makefile.in	(revision 18355)
@@ -51,27 +51,15 @@
 	fadctrl$(EXEEXT) fscctrl$(EXEEXT) gcn$(EXEEXT) \
 	chatclient$(EXEEXT) chatserv$(EXEEXT) biasctrl$(EXEEXT) \
-	spsctrl$(EXEEXT) ccdctrl$(EXEEXT) agilentctrl$(EXEEXT) \
+	drivectrl$(EXEEXT) cosyctrl$(EXEEXT) agilentctrl$(EXEEXT) \
 	mcp$(EXEEXT) feedback$(EXEEXT) ratescan$(EXEEXT) \
 	ratecontrol$(EXEEXT) tngweather$(EXEEXT) lidctrl$(EXEEXT) \
 	gpsctrl$(EXEEXT) pfminictrl$(EXEEXT) sqmctrl$(EXEEXT) \
-<<<<<<< .mine
 	pwrctrl$(EXEEXT) magicweather$(EXEEXT) magiclidar$(EXEEXT) \
 	smartfact$(EXEEXT) evtserver$(EXEEXT) getevent$(EXEEXT) \
 	temperature$(EXEEXT) timecheck$(EXEEXT) showlog$(EXEEXT) \
-	fitsdump$(EXEEXT) fitsselect$(EXEEXT) fitscheck$(EXEEXT) \
-	zfits$(EXEEXT) slalib-test$(EXEEXT) $(am__EXEEXT_1) \
-	$(am__EXEEXT_2) $(am__EXEEXT_3) $(am__EXEEXT_4) \
-	$(am__EXEEXT_5) $(am__EXEEXT_6) $(am__EXEEXT_7) \
-	$(am__EXEEXT_8)
-=======
-	pfminictrl$(EXEEXT) sqmctrl$(EXEEXT) pwrctrl$(EXEEXT) \
-	magicweather$(EXEEXT) magiclidar$(EXEEXT) smartfact$(EXEEXT) \
-	evtserver$(EXEEXT) getevent$(EXEEXT) temperature$(EXEEXT) \
-	timecheck$(EXEEXT) showlog$(EXEEXT) fitsdump$(EXEEXT) \
-	fitscheck$(EXEEXT) fitsselect$(EXEEXT) zfits$(EXEEXT) \
-	$(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_3) \
+	fitsdump$(EXEEXT) fitscheck$(EXEEXT) fitsselect$(EXEEXT) \
+	zfits$(EXEEXT) $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_3) \
 	$(am__EXEEXT_4) $(am__EXEEXT_5) $(am__EXEEXT_6) \
 	$(am__EXEEXT_7) $(am__EXEEXT_8)
->>>>>>> .r18350
 @HAS_GUI_TRUE@am__append_1 = fact
 @HAS_DBUS_TRUE@am__append_2 = skypeclient
@@ -187,42 +175,34 @@
 	pal/palRefz.lo pal/palAmpqk.lo pal/palRdplan.lo pal/palDt.lo \
 	pal/palPvobs.lo pal/palNut.lo pal/palDmoon.lo pal/palPlanet.lo \
-	pal/palNutc.lo pal/palDeuler.lo sofa/src/dat.lo \
-	sofa/src/cal2jd.lo sofa/src/jd2cal.lo sofa/src/epj.lo \
-	sofa/src/pn.lo sofa/src/rxpv.lo sofa/src/rz.lo sofa/src/zp.lo \
-	sofa/src/pnm06a.lo sofa/src/ir.lo sofa/src/pmat06.lo \
-	sofa/src/pm.lo sofa/src/sxp.lo sofa/src/epv00.lo \
-	sofa/src/rxr.lo sofa/src/rx.lo sofa/src/p06e.lo \
-	sofa/src/epj2jd.lo sofa/src/obl06.lo sofa/src/cr.lo \
-	sofa/src/fw2m.lo sofa/src/nut06a.lo sofa/src/rxp.lo \
-	sofa/src/pfw06.lo sofa/src/nut00a.lo sofa/src/cp.lo \
-	sofa/src/faur03.lo sofa/src/fapa03.lo sofa/src/fave03.lo \
-	sofa/src/fal03.lo sofa/src/fasa03.lo sofa/src/fame03.lo \
-	sofa/src/faf03.lo sofa/src/faom03.lo sofa/src/faju03.lo \
-	sofa/src/fae03.lo sofa/src/fama03.lo sofa/src/a2af.lo \
-	sofa/src/c2s.lo sofa/src/epb.lo sofa/src/ee06a.lo \
-	sofa/src/anp.lo sofa/src/pap.lo sofa/src/af2a.lo \
-	sofa/src/s2c.lo sofa/src/tf2d.lo sofa/src/rv2m.lo \
-	sofa/src/rm2v.lo sofa/src/pdp.lo sofa/src/anpm.lo \
-	sofa/src/d2tf.lo sofa/src/sepp.lo sofa/src/fk5hz.lo \
-	sofa/src/trxp.lo sofa/src/pxp.lo sofa/src/tf2a.lo \
-	sofa/src/gmst06.lo sofa/src/hfk5z.lo sofa/src/epb2jd.lo \
-	sofa/src/seps.lo sofa/src/a2tf.lo sofa/src/pmp.lo \
-	sofa/src/pv2s.lo sofa/src/pas.lo sofa/src/tr.lo \
-	sofa/src/fk5hip.lo sofa/src/era00.lo sofa/src/gst06a.lo \
-	sofa/src/gst06.lo sofa/src/bpn2xy.lo sofa/src/eors.lo \
-	sofa/src/s06.lo sofa/src/falp03.lo sofa/src/fad03.lo \
-	sofa/src/gd2gc.lo sofa/src/plan94.lo sofa/src/gd2gce.lo \
-	sofa/src/eform.lo sofa/src/ry.lo
+	pal/palNutc.lo pal/palDeuler.lo erfa/src/gd2gc.lo \
+	erfa/src/p06e.lo erfa/src/c2s.lo erfa/src/eform.lo \
+	erfa/src/s2c.lo erfa/src/pas.lo erfa/src/pmat06.lo \
+	erfa/src/epv00.lo erfa/src/plan94.lo erfa/src/anpm.lo \
+	erfa/src/obl06.lo erfa/src/dat.lo erfa/src/af2a.lo \
+	erfa/src/rxr.lo erfa/src/gmst06.lo erfa/src/sepp.lo \
+	erfa/src/rz.lo erfa/src/zp.lo erfa/src/rxpv.lo erfa/src/pn.lo \
+	erfa/src/cr.lo erfa/src/seps.lo erfa/src/ry.lo erfa/src/pdp.lo \
+	erfa/src/pnm06a.lo erfa/src/hfk5z.lo erfa/src/epj2jd.lo \
+	erfa/src/pv2s.lo erfa/src/tf2a.lo erfa/src/pm.lo \
+	erfa/src/sxp.lo erfa/src/a2af.lo erfa/src/rxp.lo \
+	erfa/src/pxp.lo erfa/src/fk5hip.lo erfa/src/fw2m.lo \
+	erfa/src/rx.lo erfa/src/tf2d.lo erfa/src/cal2jd.lo \
+	erfa/src/cp.lo erfa/src/nut06a.lo erfa/src/rm2v.lo \
+	erfa/src/nut00a.lo erfa/src/ee06a.lo erfa/src/fk5hz.lo \
+	erfa/src/epb2jd.lo erfa/src/refco.lo erfa/src/a2tf.lo \
+	erfa/src/fapa03.lo erfa/src/gst06a.lo erfa/src/faf03.lo \
+	erfa/src/faur03.lo erfa/src/faju03.lo erfa/src/fal03.lo \
+	erfa/src/fasa03.lo erfa/src/fame03.lo erfa/src/fave03.lo \
+	erfa/src/fama03.lo erfa/src/faom03.lo erfa/src/gst06.lo \
+	erfa/src/jd2cal.lo erfa/src/gd2gce.lo erfa/src/anp.lo \
+	erfa/src/fae03.lo erfa/src/ir.lo erfa/src/pfw06.lo \
+	erfa/src/bpn2xy.lo erfa/src/eors.lo erfa/src/s06.lo \
+	erfa/src/trxp.lo erfa/src/era00.lo erfa/src/epj.lo \
+	erfa/src/d2tf.lo erfa/src/epb.lo erfa/src/rv2m.lo \
+	erfa/src/pap.lo erfa/src/fad03.lo erfa/src/pmp.lo \
+	erfa/src/tr.lo erfa/src/falp03.lo sofa/src/anpm.lo \
+	sofa/src/rxr.lo sofa/src/s2c.lo sofa/src/c2s.lo sofa/src/cr.lo \
+	sofa/src/cp.lo
 libPal_la_OBJECTS = $(am_libPal_la_OBJECTS)
-libSlalib_la_LIBADD =
-am_libSlalib_la_OBJECTS = slalib/aopqk.lo slalib/mappa.lo \
-	slalib/aoppa.lo slalib/dtt.lo slalib/mapqkz.lo slalib/refco.lo \
-	slalib/refro.lo slalib/epj.lo slalib/geoc.lo slalib/dranrm.lo \
-	slalib/refz.lo slalib/dvn.lo slalib/dcc2s.lo slalib/aoppat.lo \
-	slalib/dcs2c.lo slalib/evp.lo slalib/eqeqx.lo slalib/dat.lo \
-	slalib/prenut.lo slalib/gmst.lo slalib/prec.lo slalib/dmxm.lo \
-	slalib/nutc.lo slalib/nut.lo slalib/drange.lo slalib/dvdv.lo \
-	slalib/dmxv.lo slalib/deuler.lo
-libSlalib_la_OBJECTS = $(am_libSlalib_la_OBJECTS)
 libStateMachine_la_LIBADD =
 am_libStateMachine_la_OBJECTS = src/WindowLog.lo src/Readline.lo \
@@ -271,8 +251,4 @@
 biasctrl_DEPENDENCIES = libDim++.la libDim.la libDimExtension.la \
 	libStateMachine.la libTools.la libTime.la libConfiguration.la
-am_ccdctrl_OBJECTS = src/ccdctrl.$(OBJEXT)
-ccdctrl_OBJECTS = $(am_ccdctrl_OBJECTS)
-ccdctrl_DEPENDENCIES = libDim++.la libDim.la libDimExtension.la \
-	libStateMachine.la libTools.la libTime.la libConfiguration.la
 am_chatclient_OBJECTS = src/chatclient.$(OBJEXT)
 chatclient_OBJECTS = $(am_chatclient_OBJECTS)
@@ -284,4 +260,8 @@
 	libConfiguration.la libTime.la libDim++.la libDim.la \
 	libDimExtension.la
+am_cosyctrl_OBJECTS = src/cosyctrl.$(OBJEXT) src/HeadersFTM.$(OBJEXT)
+cosyctrl_OBJECTS = $(am_cosyctrl_OBJECTS)
+cosyctrl_DEPENDENCIES = libDim++.la libDim.la libDimExtension.la \
+	libStateMachine.la libTools.la libTime.la libConfiguration.la
 am__datalogger_SOURCES_DIST = src/datalogger.cc src/LocalControl.h \
 	src/DimState.cc src/DimState.h src/FitsFile.h src/FitsFile.cc \
@@ -319,4 +299,9 @@
 dns_OBJECTS = $(am_dns_OBJECTS)
 dns_DEPENDENCIES = libDim.la libDimExtension.la
+am_drivectrl_OBJECTS = src/drivectrl.$(OBJEXT)
+drivectrl_OBJECTS = $(am_drivectrl_OBJECTS)
+drivectrl_DEPENDENCIES = libDim++.la libDim.la libDimExtension.la \
+	libStateMachine.la libTools.la libTime.la libConfiguration.la \
+	libPal.la
 am_dserver2_OBJECTS = src/dserver2.$(OBJEXT)
 dserver2_OBJECTS = $(am_dserver2_OBJECTS)
@@ -394,13 +379,7 @@
 fitsloader_DEPENDENCIES = libStateMachine.la libTools.la libTime.la \
 	libDim++.la libDim.la libConfiguration.la
-<<<<<<< .mine
-fitsselect_SOURCES = fitsselect.c
-fitsselect_OBJECTS = fitsselect.$(OBJEXT)
-fitsselect_LDADD = $(LDADD)
-=======
 am_fitsselect_OBJECTS = src/fitsselect.$(OBJEXT)
 fitsselect_OBJECTS = $(am_fitsselect_OBJECTS)
 fitsselect_DEPENDENCIES = libConfiguration.la
->>>>>>> .r18350
 am_fsc_OBJECTS = src/fsc.$(OBJEXT)
 fsc_OBJECTS = $(am_fsc_OBJECTS)
@@ -499,27 +478,12 @@
 skypeclient_DEPENDENCIES = libStateMachine.la libTools.la libTime.la \
 	libDim++.la libDim.la libDimExtension.la libConfiguration.la
-am_slalib_test_OBJECTS = src/slalib-test.$(OBJEXT)
-slalib_test_OBJECTS = $(am_slalib_test_OBJECTS)
-slalib_test_DEPENDENCIES = libSlalib.la libTime.la
 am_smartfact_OBJECTS = src/smartfact.$(OBJEXT) src/PixelMap.$(OBJEXT)
 smartfact_OBJECTS = $(am_smartfact_OBJECTS)
 smartfact_DEPENDENCIES = libDim++.la libDim.la libDimExtension.la \
 	libStateMachine.la libTools.la libTime.la libConfiguration.la
-<<<<<<< .mine
-am_spsctrl_OBJECTS = src/spsctrl.$(OBJEXT)
-spsctrl_OBJECTS = $(am_spsctrl_OBJECTS)
-spsctrl_DEPENDENCIES = libPal.la libDim++.la libDim.la \
-	libDimExtension.la libStateMachine.la libTools.la libTime.la \
-	libConfiguration.la
 am_sqmctrl_OBJECTS = src/sqmctrl.$(OBJEXT)
 sqmctrl_OBJECTS = $(am_sqmctrl_OBJECTS)
 sqmctrl_DEPENDENCIES = libDim++.la libDim.la libDimExtension.la \
 	libStateMachine.la libTools.la libTime.la libConfiguration.la
-=======
-am_sqmctrl_OBJECTS = src/sqmctrl.$(OBJEXT)
-sqmctrl_OBJECTS = $(am_sqmctrl_OBJECTS)
-sqmctrl_DEPENDENCIES = libDim++.la libDim.la libDimExtension.la \
-	libStateMachine.la libTools.la libTime.la libConfiguration.la
->>>>>>> .r18350
 am_temperature_OBJECTS = src/temperature.$(OBJEXT)
 temperature_OBJECTS = $(am_temperature_OBJECTS)
@@ -626,29 +590,9 @@
 SOURCES = $(libConfiguration_la_SOURCES) $(libDim___la_SOURCES) \
 	$(libDim_la_SOURCES) $(libDimExtension_la_SOURCES) \
-	$(libPal_la_SOURCES) $(libSlalib_la_SOURCES) \
-	$(libStateMachine_la_SOURCES) $(libTime_la_SOURCES) \
-	$(libTools_la_SOURCES) $(agilentctrl_SOURCES) $(argv_SOURCES) \
-<<<<<<< .mine
-	astro.c $(biasctrl_SOURCES) $(ccdctrl_SOURCES) \
-	$(chatclient_SOURCES) $(chatserv_SOURCES) \
-	$(datalogger_SOURCES) $(dclient5_SOURCES) $(did_SOURCES) \
-	$(dimctrl_SOURCES) $(dimserver_SOURCES) $(dns_SOURCES) \
-	$(dserver2_SOURCES) $(evtserver_SOURCES) $(fact_SOURCES) \
-	$(fad_SOURCES) $(fadctrl_SOURCES) $(feedback_SOURCES) \
-	$(fitscheck_SOURCES) $(fitsdump_SOURCES) fitsgrep.c \
-	$(fitsloader_SOURCES) fitsselect.c $(fsc_SOURCES) \
-	$(fscctrl_SOURCES) $(ftm_SOURCES) $(ftmctrl_SOURCES) \
-	$(gcn_SOURCES) $(getevent_SOURCES) $(gpsctrl_SOURCES) \
-	$(lidctrl_SOURCES) $(log_SOURCES) $(logtime_SOURCES) \
-	$(magiclidar_SOURCES) $(magicweather_SOURCES) \
-	$(makedata_SOURCES) $(makeplots_SOURCES) $(mcp_SOURCES) \
-	$(moon_SOURCES) $(pfminictrl_SOURCES) $(pwrctrl_SOURCES) \
-	$(ratecontrol_SOURCES) $(ratescan_SOURCES) $(readfits_SOURCES) \
-	sched.c $(scheduler_SOURCES) $(showlog_SOURCES) \
-	$(skypeclient_SOURCES) $(slalib_test_SOURCES) \
-	$(smartfact_SOURCES) $(spsctrl_SOURCES) $(sqmctrl_SOURCES) \
-=======
-	astro.c $(biasctrl_SOURCES) $(chatclient_SOURCES) \
-	$(chatserv_SOURCES) $(datalogger_SOURCES) $(dclient5_SOURCES) \
+	$(libPal_la_SOURCES) $(libStateMachine_la_SOURCES) \
+	$(libTime_la_SOURCES) $(libTools_la_SOURCES) \
+	$(agilentctrl_SOURCES) $(argv_SOURCES) astro.c \
+	$(biasctrl_SOURCES) $(chatclient_SOURCES) $(chatserv_SOURCES) \
+	$(cosyctrl_SOURCES) $(datalogger_SOURCES) $(dclient5_SOURCES) \
 	$(did_SOURCES) $(dimctrl_SOURCES) $(dimserver_SOURCES) \
 	$(dns_SOURCES) $(drivectrl_SOURCES) $(dserver2_SOURCES) \
@@ -666,5 +610,4 @@
 	sched.c $(scheduler_SOURCES) $(showlog_SOURCES) \
 	$(skypeclient_SOURCES) $(smartfact_SOURCES) $(sqmctrl_SOURCES) \
->>>>>>> .r18350
 	$(temperature_SOURCES) $(test_SOURCES) $(time_SOURCES) \
 	$(timecheck_SOURCES) $(tngweather_SOURCES) \
@@ -673,37 +616,15 @@
 DIST_SOURCES = $(libConfiguration_la_SOURCES) $(libDim___la_SOURCES) \
 	$(libDim_la_SOURCES) $(libDimExtension_la_SOURCES) \
-	$(libPal_la_SOURCES) $(libSlalib_la_SOURCES) \
-	$(libStateMachine_la_SOURCES) $(libTime_la_SOURCES) \
-	$(libTools_la_SOURCES) $(agilentctrl_SOURCES) $(argv_SOURCES) \
-<<<<<<< .mine
-	astro.c $(biasctrl_SOURCES) $(ccdctrl_SOURCES) \
-	$(chatclient_SOURCES) $(chatserv_SOURCES) \
-	$(am__datalogger_SOURCES_DIST) $(dclient5_SOURCES) \
-	$(did_SOURCES) $(dimctrl_SOURCES) $(dimserver_SOURCES) \
-	$(dns_SOURCES) $(dserver2_SOURCES) $(evtserver_SOURCES) \
-	$(am__fact_SOURCES_DIST) $(fad_SOURCES) \
-=======
-	astro.c $(biasctrl_SOURCES) $(chatclient_SOURCES) \
-	$(chatserv_SOURCES) $(am__datalogger_SOURCES_DIST) \
+	$(libPal_la_SOURCES) $(libStateMachine_la_SOURCES) \
+	$(libTime_la_SOURCES) $(libTools_la_SOURCES) \
+	$(agilentctrl_SOURCES) $(argv_SOURCES) astro.c \
+	$(biasctrl_SOURCES) $(chatclient_SOURCES) $(chatserv_SOURCES) \
+	$(cosyctrl_SOURCES) $(am__datalogger_SOURCES_DIST) \
 	$(dclient5_SOURCES) $(did_SOURCES) $(dimctrl_SOURCES) \
 	$(dimserver_SOURCES) $(dns_SOURCES) $(drivectrl_SOURCES) \
 	$(dserver2_SOURCES) $(evtserver_SOURCES) \
 	$(am__fact_SOURCES_DIST) $(fad_SOURCES) \
->>>>>>> .r18350
 	$(am__fadctrl_SOURCES_DIST) $(feedback_SOURCES) \
 	$(fitscheck_SOURCES) $(fitsdump_SOURCES) fitsgrep.c \
-<<<<<<< .mine
-	$(fitsloader_SOURCES) fitsselect.c $(fsc_SOURCES) \
-	$(fscctrl_SOURCES) $(ftm_SOURCES) $(ftmctrl_SOURCES) \
-	$(gcn_SOURCES) $(getevent_SOURCES) $(gpsctrl_SOURCES) \
-	$(lidctrl_SOURCES) $(log_SOURCES) $(logtime_SOURCES) \
-	$(magiclidar_SOURCES) $(magicweather_SOURCES) \
-	$(makedata_SOURCES) $(makeplots_SOURCES) $(mcp_SOURCES) \
-	$(moon_SOURCES) $(pfminictrl_SOURCES) $(pwrctrl_SOURCES) \
-	$(ratecontrol_SOURCES) $(ratescan_SOURCES) $(readfits_SOURCES) \
-	sched.c $(scheduler_SOURCES) $(showlog_SOURCES) \
-	$(skypeclient_SOURCES) $(slalib_test_SOURCES) \
-	$(smartfact_SOURCES) $(spsctrl_SOURCES) $(sqmctrl_SOURCES) \
-=======
 	$(fitsloader_SOURCES) $(fitsselect_SOURCES) $(fsc_SOURCES) \
 	$(fscctrl_SOURCES) $(ftm_SOURCES) $(ftmctrl_SOURCES) \
@@ -716,5 +637,4 @@
 	sched.c $(scheduler_SOURCES) $(showlog_SOURCES) \
 	$(skypeclient_SOURCES) $(smartfact_SOURCES) $(sqmctrl_SOURCES) \
->>>>>>> .r18350
 	$(temperature_SOURCES) $(test_SOURCES) $(time_SOURCES) \
 	$(timecheck_SOURCES) $(tngweather_SOURCES) \
@@ -998,10 +918,10 @@
 	libDim++.la libDim.la libDimExtension.la \
 	libConfiguration.la libStateMachine.la libTime.la libTools.la \
-	libSlalib.la libPal.la
-
-# 	libAstro.la
+	libPal.la
+
 @HAS_HELP2MAN_TRUE@dist_man1_MANS = \
 @HAS_HELP2MAN_TRUE@	biasctrl.man \
 @HAS_HELP2MAN_TRUE@	datalogger.man \
+@HAS_HELP2MAN_TRUE@	cosyctrl.man \
 @HAS_HELP2MAN_TRUE@	dimctrl.man \
 @HAS_HELP2MAN_TRUE@	dimserver.man \
@@ -1029,10 +949,5 @@
 @HAS_HELP2MAN_TRUE@	showlog.man \
 @HAS_HELP2MAN_TRUE@	smartfact.man \
-<<<<<<< .mine
-@HAS_HELP2MAN_TRUE@	evtserver.man \
-@HAS_HELP2MAN_TRUE@	getevent.man \
-=======
 @HAS_HELP2MAN_TRUE@	sqmctrl.man \
->>>>>>> .r18350
 @HAS_HELP2MAN_TRUE@	temperature.man \
 @HAS_HELP2MAN_TRUE@	timecheck.man \
@@ -1160,58 +1075,4 @@
 #libAstro_la_SOURCES = src/Astro.h src/Astro.cc
 libTools_la_SOURCES = src/tools.h src/tools.cc
-libSlalib_la_SOURCES = slalib/slalib.h slalib/slamac.h \
-	slalib/aopqk.c	slalib/mappa.c	slalib/aoppa.c	slalib/dtt.c 	\
-	slalib/mapqkz.c	slalib/refco.c	slalib/refro.c	slalib/epj.c	\
-	slalib/geoc.c	slalib/dranrm.c	slalib/refz.c	slalib/dvn.c	\
-	slalib/dcc2s.c	slalib/aoppat.c	slalib/dcs2c.c	slalib/evp.c	\
-	slalib/eqeqx.c	slalib/dat.c	slalib/prenut.c slalib/gmst.c	\
-	slalib/prec.c	slalib/dmxm.c	slalib/nutc.c	slalib/nut.c	\
-	slalib/drange.c	slalib/dvdv.c	slalib/dmxv.c	slalib/deuler.c
-
-#	slalib/addet.c  slalib/afin.c	slalib/airmas.c slalib/altaz.c  \
-#	slalib/amp.c	slalib/ampqk.c	slalib/aop.c	slalib/aoppa.c  \
-#	slalib/aoppat.c	slalib/aopqk.c	slalib/atmdsp.c	slalib/av2m.c   \
-#	slalib/bear.c	slalib/caf2r.c 	slalib/caldj.c 	slalib/calyd.c	\
-#	slalib/cc2s.c 	slalib/cc62s.c	slalib/cd2tf.c	slalib/cldj.c	\
-#	slalib/clyd.c	slalib/combn.c	slalib/cr2af.c	slalib/cr2tf.c	\
-#	slalib/cs2c6.c	slalib/cs2c.c	slalib/ctf2d.c	slalib/ctf2r.c 	\
-#	slalib/daf2r.c	slalib/dafin.c	slalib/dat.c	slalib/dav2m.c	\
-#	slalib/dbear.c	slalib/dbjin.c	slalib/dc62s.c	slalib/dcc2s.c  \
-#	slalib/dcmpf.c	slalib/dcs2c.c	slalib/dd2tf.c	slalib/de2h.c	\
-#	slalib/deuler.c slalib/dfltin.c	slalib/dh2e.c	slalib/dimxv.c  \
-#	slalib/djcal.c	slalib/djcl.c	slalib/dm2av.c	slalib/dmat.c 	\
-#	slalib/dmoon.c	slalib/dmxm.c	slalib/dmxv.c	slalib/dpav.c	\
-#	slalib/dr2af.c	slalib/dr2tf.c	slalib/drange.c	slalib/dranrm.c	\
-#	slalib/ds2c6.c	slalib/ds2tp.c	slalib/dsep.c	slalib/dt.c	\
-#	slalib/dtf2d.c	slalib/dtf2r.c	slalib/dtp2s.c	slalib/dtp2v.c	\
-#	slalib/dtps2c.c	slalib/dtpv2c.c	slalib/dtt.c	slalib/dv2tp.c	\
-#	slalib/dvdv.c	slalib/dvn.c	slalib/dvxv.c	slalib/e2h.c	\
-#	slalib/earth.c	slalib/ecleq.c	slalib/ecmat.c	slalib/ecor.c	\
-#	slalib/eg50.c	slalib/el2ue.c	slalib/epb2d.c	slalib/epb.c	\
-#	slalib/epco.c	slalib/epj2d.c	slalib/epj.c	slalib/eqecl.c	\
-#	slalib/eqeqx.c	slalib/eqgal.c	slalib/etrms.c	slalib/euler.c	\
-#	slalib/evp.c	slalib/fitxy.c	slalib/fk425.c	slalib/fk45z.c	\
-#	slalib/fk524.c	slalib/fk52h.c	slalib/fk54z.c	slalib/fk5hz.c	\
-#	slalib/flotin.c	slalib/galeq.c	slalib/galsup.c	slalib/ge50.c	\
-#	slalib/geoc.c	slalib/gmsta.c	slalib/gmst.c	slalib/h2e.c	\
-#	slalib/h2fk5.c	slalib/hfk5z.c	slalib/imxv.c	slalib/intin.c	\
-#	slalib/invf.c	slalib/kbj.c	slalib/m2av.c	slalib/map.c	\
-#	slalib/mappa.c	slalib/mapqk.c	slalib/mapqkz.c	slalib/moon.c	\
-#	slalib/mxm.c	slalib/mxv.c	slalib/nut.c	slalib/nutc.c	\
-#	slalib/oap.c	slalib/oapqk.c	slalib/obs.c	slalib/pa.c	\
-#	slalib/pav.c	slalib/pcd.c	slalib/pda2h.c	slalib/pdq2h.c	\
-#	slalib/permut.c	slalib/pertel.c	slalib/pertue.c	slalib/planel.c	\
-#	slalib/planet.c	slalib/plante.c	slalib/pm.c	slalib/polmo.c	\
-#	slalib/prebn.c	slalib/prec.c	slalib/preces.c	slalib/precl.c	\
-#	slalib/prenut.c	slalib/pv2el.c	slalib/pv2ue.c	slalib/pvobs.c	\
-#	slalib/pxy.c	slalib/range.c	slalib/ranorm.c	slalib/rcc.c    \
-#	slalib/rdplan.c	slalib/refco.c	slalib/refcoq.c	slalib/refro.c	\
-#	slalib/refv.c	slalib/refz.c	slalib/rverot.c	slalib/rvgalc.c	\
-#	slalib/rvlg.c	slalib/rvlsrd.c	slalib/rvlsrk.c	slalib/s2tp.c	\
-#	slalib/sep.c	slalib/smat.c	slalib/subet.c	slalib/supgal.c	\
-#	slalib/svd.c	slalib/svdcov.c	slalib/svdsol.c	slalib/tp2s.c	\
-#	slalib/tp2v.c	slalib/tps2c.c	slalib/tpv2c.c	slalib/ue2el.c	\
-#	slalib/ue2pv.c	slalib/unpcd.c	slalib/v2tp.c	slalib/vdv.c	\
-#	slalib/vn.c	slalib/vxv.c	slalib/xy2xy.c	slalib/zd.c
 libPal_la_SOURCES = pal/pal.h \
 	pal/palDtt.c 		pal/palDat.c 		pal/palMappa.c		\
@@ -1224,36 +1085,38 @@
 	pal/palDmoon.c 		pal/palPlanet.c 	pal/palNutc.c           \
 	pal/palDeuler.c \
-	sofa/src/dat.c  	sofa/src/cal2jd.c 	sofa/src/jd2cal.c 	\
-	sofa/src/epj.c		sofa/src/pn.c		sofa/src/rxpv.c 	\
-	sofa/src/rz.c		sofa/src/zp.c		sofa/src/pnm06a.c 	\
-	sofa/src/ir.c		sofa/src/pmat06.c	sofa/src/pm.c		\
-	sofa/src/sxp.c		sofa/src/epv00.c	sofa/src/rxr.c		\
-	sofa/src/rx.c		sofa/src/p06e.c		sofa/src/epj2jd.c	\
-	sofa/src/obl06.c	sofa/src/cr.c		sofa/src/fw2m.c		\
-	sofa/src/nut06a.c	sofa/src/rxp.c		sofa/src/pfw06.c        \
-	sofa/src/nut00a.c	sofa/src/cp.c		sofa/src/faur03.c       \
-	sofa/src/fapa03.c	sofa/src/fave03.c	sofa/src/fal03.c        \
-	sofa/src/fasa03.c	sofa/src/fame03.c	sofa/src/faf03.c        \
-	sofa/src/faom03.c	sofa/src/faju03.c	sofa/src/fae03.c        \
-	sofa/src/fama03.c       sofa/src/a2af.c		sofa/src/c2s.c          \
-	sofa/src/epb.c          sofa/src/ee06a.c	sofa/src/anp.c          \
-	sofa/src/pap.c          sofa/src/af2a.c		sofa/src/s2c.c          \
-	sofa/src/tf2d.c         sofa/src/rv2m.c		sofa/src/rm2v.c         \
-        sofa/src/pdp.c          sofa/src/anpm.c 	sofa/src/d2tf.c         \
-	sofa/src/sepp.c         sofa/src/fk5hz.c	sofa/src/trxp.c         \
-	sofa/src/pxp.c          sofa/src/tf2a.c  	sofa/src/gmst06.c       \
-	sofa/src/hfk5z.c        sofa/src/epb2jd.c  	sofa/src/seps.c         \
-	sofa/src/a2tf.c         sofa/src/pmp.c     	sofa/src/pv2s.c         \
-	sofa/src/pas.c          sofa/src/tr.c      	sofa/src/fk5hip.c       \
-	sofa/src/era00.c        sofa/src/gst06a.c       sofa/src/gst06.c        \
-	sofa/src/bpn2xy.c       sofa/src/eors.c         sofa/src/s06.c          \
-	sofa/src/falp03.c       sofa/src/fad03.c        sofa/src/gd2gc.c        \
-	sofa/src/plan94.c       sofa/src/gd2gce.c       sofa/src/eform.c        \
-	sofa/src/ry.c
+	\
+	erfa/src/gd2gc.c	erfa/src/p06e.c		erfa/src/c2s.c 		\
+	erfa/src/eform.c	erfa/src/s2c.c		erfa/src/pas.c		\
+	erfa/src/pmat06.c	erfa/src/epv00.c	erfa/src/plan94.c	\
+	erfa/src/anpm.c		erfa/src/obl06.c	erfa/src/dat.c		\
+	erfa/src/af2a.c		erfa/src/rxr.c		erfa/src/gmst06.c	\
+	erfa/src/sepp.c		erfa/src/rz.c		erfa/src/zp.c		\
+	erfa/src/rxpv.c		erfa/src/pn.c		erfa/src/cr.c		\
+	erfa/src/seps.c		erfa/src/ry.c		erfa/src/pdp.c		\
+	erfa/src/pnm06a.c	erfa/src/hfk5z.c	erfa/src/epj2jd.c	\
+	erfa/src/pv2s.c		erfa/src/tf2a.c		erfa/src/pm.c		\
+	erfa/src/sxp.c		erfa/src/a2af.c		erfa/src/rxp.c		\
+	erfa/src/pxp.c		erfa/src/fk5hip.c	erfa/src/fw2m.c		\
+	erfa/src/rx.c		erfa/src/tf2d.c		erfa/src/cal2jd.c	\
+	erfa/src/cp.c		erfa/src/nut06a.c	erfa/src/rm2v.c		\
+	erfa/src/nut00a.c	erfa/src/ee06a.c	erfa/src/fk5hz.c	\
+	erfa/src/epb2jd.c	erfa/src/refco.c	erfa/src/a2tf.c		\
+	erfa/src/fapa03.c	erfa/src/gst06a.c	erfa/src/faf03.c	\
+	erfa/src/faur03.c	erfa/src/faju03.c	erfa/src/fal03.c	\
+	erfa/src/fasa03.c	erfa/src/fame03.c 	erfa/src/fave03.c  	\
+	erfa/src/fama03.c 	erfa/src/faom03.c 	erfa/src/gst06.c	\
+	erfa/src/jd2cal.c	erfa/src/gd2gce.c	erfa/src/anp.c		\
+	erfa/src/fae03.c	erfa/src/ir.c		erfa/src/pfw06.c	\
+	erfa/src/bpn2xy.c	erfa/src/eors.c		erfa/src/s06.c		\
+	erfa/src/trxp.c		erfa/src/era00.c	erfa/src/epj.c		\
+	erfa/src/d2tf.c		erfa/src/epb.c		erfa/src/rv2m.c		\
+	erfa/src/pap.c		erfa/src/fad03.c	erfa/src/pmp.c		\
+	erfa/src/tr.c		erfa/src/falp03.c	\
+	\
+	sofa/src/anpm.c		sofa/src/rxr.c		sofa/src/s2c.c		\
+	sofa/src/c2s.c		sofa/src/cr.c		sofa/src/cp.c	
 
 dserver2_SOURCES = src/dserver2.cc 
 dserver2_LDADD = libTime.la libTools.la
-slalib_test_SOURCES = src/slalib-test.cc 
-slalib_test_LDADD = libSlalib.la libTime.la
 ftm_SOURCES = src/ftm.cc src/HeadersFTM.cc
 ftm_LDADD = libTime.la libTools.la libDim++.la libDim.la libConfiguration.la libDimExtension.la
@@ -1285,18 +1148,13 @@
 	libConfiguration.la
 
-drivectrl_SOURCES = src/drivectrl.cc src/LocalControl.h src/HeadersFTM.cc
+cosyctrl_SOURCES = src/cosyctrl.cc src/LocalControl.h src/HeadersFTM.cc
+cosyctrl_LDADD = libDim++.la libDim.la libDimExtension.la \
+ 	libStateMachine.la libTools.la libTime.la \
+    	libConfiguration.la
+
+drivectrl_SOURCES = src/drivectrl.cc src/LocalControl.h
 drivectrl_LDADD = libDim++.la libDim.la libDimExtension.la \
  	libStateMachine.la libTools.la libTime.la \
-    	libConfiguration.la
-
-spsctrl_SOURCES = src/spsctrl.cc src/LocalControl.h src/HeadersDrive.h
-spsctrl_LDADD = libPal.la libDim++.la libDim.la libDimExtension.la \
- 	libStateMachine.la libTools.la libTime.la \
-    	libConfiguration.la
-
-ccdctrl_SOURCES = src/ccdctrl.cc src/LocalControl.h # src/HeadersSPS.h
-ccdctrl_LDADD = libDim++.la libDim.la libDimExtension.la \
- 	libStateMachine.la libTools.la libTime.la \
-    	libConfiguration.la
+    	libConfiguration.la libPal.la
 
 agilentctrl_SOURCES = src/agilentctrl.cc src/LocalControl.h src/HeadersAgilent.h
@@ -1330,5 +1188,4 @@
     	libConfiguration.la
 
-<<<<<<< .mine
 pfminictrl_SOURCES = src/pfminictrl.cc src/LocalControl.h
 pfminictrl_LDADD = libDim++.la libDim.la libDimExtension.la \
@@ -1338,19 +1195,7 @@
 sqmctrl_SOURCES = src/sqmctrl.cc src/LocalControl.h
 sqmctrl_LDADD = libDim++.la libDim.la libDimExtension.la \
- 	libStateMachine.la libTools.la libTime.la \
-    	libConfiguration.la
-
-=======
-pfminictrl_SOURCES = src/pfminictrl.cc src/LocalControl.h
-pfminictrl_LDADD = libDim++.la libDim.la libDimExtension.la \
- 	libStateMachine.la libTools.la libTime.la \
-    	libConfiguration.la
-
-sqmctrl_SOURCES = src/sqmctrl.cc src/LocalControl.h
-sqmctrl_LDADD = libDim++.la libDim.la libDimExtension.la \
        libStateMachine.la libTools.la libTime.la \
        libConfiguration.la
 
->>>>>>> .r18350
 temperature_SOURCES = src/temperature.cc src/LocalControl.h
 temperature_LDADD = libDim++.la libDim.la libDimExtension.la \
@@ -1400,9 +1245,4 @@
        libStateMachine.la libTools.la libTime.la \
        libConfiguration.la -lQtXml
-
-nsa_SOURCES = src/nsa.cc src/LocalControl.h
-nsa_LDADD = libDim++.la libDim.la  libDimExtension.la \
-       libStateMachine.la libTools.la libTime.la \
-       libConfiguration.la
 
 biasctrl_SOURCES = src/biasctrl.cc src/LocalControl.h src/PixelMap.cc
@@ -1712,4 +1552,170 @@
 pal/palNutc.lo: pal/$(am__dirstamp) pal/$(DEPDIR)/$(am__dirstamp)
 pal/palDeuler.lo: pal/$(am__dirstamp) pal/$(DEPDIR)/$(am__dirstamp)
+erfa/src/$(am__dirstamp):
+	@$(MKDIR_P) erfa/src
+	@: > erfa/src/$(am__dirstamp)
+erfa/src/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) erfa/src/$(DEPDIR)
+	@: > erfa/src/$(DEPDIR)/$(am__dirstamp)
+erfa/src/gd2gc.lo: erfa/src/$(am__dirstamp) \
+	erfa/src/$(DEPDIR)/$(am__dirstamp)
+erfa/src/p06e.lo: erfa/src/$(am__dirstamp) \
+	erfa/src/$(DEPDIR)/$(am__dirstamp)
+erfa/src/c2s.lo: erfa/src/$(am__dirstamp) \
+	erfa/src/$(DEPDIR)/$(am__dirstamp)
+erfa/src/eform.lo: erfa/src/$(am__dirstamp) \
+	erfa/src/$(DEPDIR)/$(am__dirstamp)
+erfa/src/s2c.lo: erfa/src/$(am__dirstamp) \
+	erfa/src/$(DEPDIR)/$(am__dirstamp)
+erfa/src/pas.lo: erfa/src/$(am__dirstamp) \
+	erfa/src/$(DEPDIR)/$(am__dirstamp)
+erfa/src/pmat06.lo: erfa/src/$(am__dirstamp) \
+	erfa/src/$(DEPDIR)/$(am__dirstamp)
+erfa/src/epv00.lo: erfa/src/$(am__dirstamp) \
+	erfa/src/$(DEPDIR)/$(am__dirstamp)
+erfa/src/plan94.lo: erfa/src/$(am__dirstamp) \
+	erfa/src/$(DEPDIR)/$(am__dirstamp)
+erfa/src/anpm.lo: erfa/src/$(am__dirstamp) \
+	erfa/src/$(DEPDIR)/$(am__dirstamp)
+erfa/src/obl06.lo: erfa/src/$(am__dirstamp) \
+	erfa/src/$(DEPDIR)/$(am__dirstamp)
+erfa/src/dat.lo: erfa/src/$(am__dirstamp) \
+	erfa/src/$(DEPDIR)/$(am__dirstamp)
+erfa/src/af2a.lo: erfa/src/$(am__dirstamp) \
+	erfa/src/$(DEPDIR)/$(am__dirstamp)
+erfa/src/rxr.lo: erfa/src/$(am__dirstamp) \
+	erfa/src/$(DEPDIR)/$(am__dirstamp)
+erfa/src/gmst06.lo: erfa/src/$(am__dirstamp) \
+	erfa/src/$(DEPDIR)/$(am__dirstamp)
+erfa/src/sepp.lo: erfa/src/$(am__dirstamp) \
+	erfa/src/$(DEPDIR)/$(am__dirstamp)
+erfa/src/rz.lo: erfa/src/$(am__dirstamp) \
+	erfa/src/$(DEPDIR)/$(am__dirstamp)
+erfa/src/zp.lo: erfa/src/$(am__dirstamp) \
+	erfa/src/$(DEPDIR)/$(am__dirstamp)
+erfa/src/rxpv.lo: erfa/src/$(am__dirstamp) \
+	erfa/src/$(DEPDIR)/$(am__dirstamp)
+erfa/src/pn.lo: erfa/src/$(am__dirstamp) \
+	erfa/src/$(DEPDIR)/$(am__dirstamp)
+erfa/src/cr.lo: erfa/src/$(am__dirstamp) \
+	erfa/src/$(DEPDIR)/$(am__dirstamp)
+erfa/src/seps.lo: erfa/src/$(am__dirstamp) \
+	erfa/src/$(DEPDIR)/$(am__dirstamp)
+erfa/src/ry.lo: erfa/src/$(am__dirstamp) \
+	erfa/src/$(DEPDIR)/$(am__dirstamp)
+erfa/src/pdp.lo: erfa/src/$(am__dirstamp) \
+	erfa/src/$(DEPDIR)/$(am__dirstamp)
+erfa/src/pnm06a.lo: erfa/src/$(am__dirstamp) \
+	erfa/src/$(DEPDIR)/$(am__dirstamp)
+erfa/src/hfk5z.lo: erfa/src/$(am__dirstamp) \
+	erfa/src/$(DEPDIR)/$(am__dirstamp)
+erfa/src/epj2jd.lo: erfa/src/$(am__dirstamp) \
+	erfa/src/$(DEPDIR)/$(am__dirstamp)
+erfa/src/pv2s.lo: erfa/src/$(am__dirstamp) \
+	erfa/src/$(DEPDIR)/$(am__dirstamp)
+erfa/src/tf2a.lo: erfa/src/$(am__dirstamp) \
+	erfa/src/$(DEPDIR)/$(am__dirstamp)
+erfa/src/pm.lo: erfa/src/$(am__dirstamp) \
+	erfa/src/$(DEPDIR)/$(am__dirstamp)
+erfa/src/sxp.lo: erfa/src/$(am__dirstamp) \
+	erfa/src/$(DEPDIR)/$(am__dirstamp)
+erfa/src/a2af.lo: erfa/src/$(am__dirstamp) \
+	erfa/src/$(DEPDIR)/$(am__dirstamp)
+erfa/src/rxp.lo: erfa/src/$(am__dirstamp) \
+	erfa/src/$(DEPDIR)/$(am__dirstamp)
+erfa/src/pxp.lo: erfa/src/$(am__dirstamp) \
+	erfa/src/$(DEPDIR)/$(am__dirstamp)
+erfa/src/fk5hip.lo: erfa/src/$(am__dirstamp) \
+	erfa/src/$(DEPDIR)/$(am__dirstamp)
+erfa/src/fw2m.lo: erfa/src/$(am__dirstamp) \
+	erfa/src/$(DEPDIR)/$(am__dirstamp)
+erfa/src/rx.lo: erfa/src/$(am__dirstamp) \
+	erfa/src/$(DEPDIR)/$(am__dirstamp)
+erfa/src/tf2d.lo: erfa/src/$(am__dirstamp) \
+	erfa/src/$(DEPDIR)/$(am__dirstamp)
+erfa/src/cal2jd.lo: erfa/src/$(am__dirstamp) \
+	erfa/src/$(DEPDIR)/$(am__dirstamp)
+erfa/src/cp.lo: erfa/src/$(am__dirstamp) \
+	erfa/src/$(DEPDIR)/$(am__dirstamp)
+erfa/src/nut06a.lo: erfa/src/$(am__dirstamp) \
+	erfa/src/$(DEPDIR)/$(am__dirstamp)
+erfa/src/rm2v.lo: erfa/src/$(am__dirstamp) \
+	erfa/src/$(DEPDIR)/$(am__dirstamp)
+erfa/src/nut00a.lo: erfa/src/$(am__dirstamp) \
+	erfa/src/$(DEPDIR)/$(am__dirstamp)
+erfa/src/ee06a.lo: erfa/src/$(am__dirstamp) \
+	erfa/src/$(DEPDIR)/$(am__dirstamp)
+erfa/src/fk5hz.lo: erfa/src/$(am__dirstamp) \
+	erfa/src/$(DEPDIR)/$(am__dirstamp)
+erfa/src/epb2jd.lo: erfa/src/$(am__dirstamp) \
+	erfa/src/$(DEPDIR)/$(am__dirstamp)
+erfa/src/refco.lo: erfa/src/$(am__dirstamp) \
+	erfa/src/$(DEPDIR)/$(am__dirstamp)
+erfa/src/a2tf.lo: erfa/src/$(am__dirstamp) \
+	erfa/src/$(DEPDIR)/$(am__dirstamp)
+erfa/src/fapa03.lo: erfa/src/$(am__dirstamp) \
+	erfa/src/$(DEPDIR)/$(am__dirstamp)
+erfa/src/gst06a.lo: erfa/src/$(am__dirstamp) \
+	erfa/src/$(DEPDIR)/$(am__dirstamp)
+erfa/src/faf03.lo: erfa/src/$(am__dirstamp) \
+	erfa/src/$(DEPDIR)/$(am__dirstamp)
+erfa/src/faur03.lo: erfa/src/$(am__dirstamp) \
+	erfa/src/$(DEPDIR)/$(am__dirstamp)
+erfa/src/faju03.lo: erfa/src/$(am__dirstamp) \
+	erfa/src/$(DEPDIR)/$(am__dirstamp)
+erfa/src/fal03.lo: erfa/src/$(am__dirstamp) \
+	erfa/src/$(DEPDIR)/$(am__dirstamp)
+erfa/src/fasa03.lo: erfa/src/$(am__dirstamp) \
+	erfa/src/$(DEPDIR)/$(am__dirstamp)
+erfa/src/fame03.lo: erfa/src/$(am__dirstamp) \
+	erfa/src/$(DEPDIR)/$(am__dirstamp)
+erfa/src/fave03.lo: erfa/src/$(am__dirstamp) \
+	erfa/src/$(DEPDIR)/$(am__dirstamp)
+erfa/src/fama03.lo: erfa/src/$(am__dirstamp) \
+	erfa/src/$(DEPDIR)/$(am__dirstamp)
+erfa/src/faom03.lo: erfa/src/$(am__dirstamp) \
+	erfa/src/$(DEPDIR)/$(am__dirstamp)
+erfa/src/gst06.lo: erfa/src/$(am__dirstamp) \
+	erfa/src/$(DEPDIR)/$(am__dirstamp)
+erfa/src/jd2cal.lo: erfa/src/$(am__dirstamp) \
+	erfa/src/$(DEPDIR)/$(am__dirstamp)
+erfa/src/gd2gce.lo: erfa/src/$(am__dirstamp) \
+	erfa/src/$(DEPDIR)/$(am__dirstamp)
+erfa/src/anp.lo: erfa/src/$(am__dirstamp) \
+	erfa/src/$(DEPDIR)/$(am__dirstamp)
+erfa/src/fae03.lo: erfa/src/$(am__dirstamp) \
+	erfa/src/$(DEPDIR)/$(am__dirstamp)
+erfa/src/ir.lo: erfa/src/$(am__dirstamp) \
+	erfa/src/$(DEPDIR)/$(am__dirstamp)
+erfa/src/pfw06.lo: erfa/src/$(am__dirstamp) \
+	erfa/src/$(DEPDIR)/$(am__dirstamp)
+erfa/src/bpn2xy.lo: erfa/src/$(am__dirstamp) \
+	erfa/src/$(DEPDIR)/$(am__dirstamp)
+erfa/src/eors.lo: erfa/src/$(am__dirstamp) \
+	erfa/src/$(DEPDIR)/$(am__dirstamp)
+erfa/src/s06.lo: erfa/src/$(am__dirstamp) \
+	erfa/src/$(DEPDIR)/$(am__dirstamp)
+erfa/src/trxp.lo: erfa/src/$(am__dirstamp) \
+	erfa/src/$(DEPDIR)/$(am__dirstamp)
+erfa/src/era00.lo: erfa/src/$(am__dirstamp) \
+	erfa/src/$(DEPDIR)/$(am__dirstamp)
+erfa/src/epj.lo: erfa/src/$(am__dirstamp) \
+	erfa/src/$(DEPDIR)/$(am__dirstamp)
+erfa/src/d2tf.lo: erfa/src/$(am__dirstamp) \
+	erfa/src/$(DEPDIR)/$(am__dirstamp)
+erfa/src/epb.lo: erfa/src/$(am__dirstamp) \
+	erfa/src/$(DEPDIR)/$(am__dirstamp)
+erfa/src/rv2m.lo: erfa/src/$(am__dirstamp) \
+	erfa/src/$(DEPDIR)/$(am__dirstamp)
+erfa/src/pap.lo: erfa/src/$(am__dirstamp) \
+	erfa/src/$(DEPDIR)/$(am__dirstamp)
+erfa/src/fad03.lo: erfa/src/$(am__dirstamp) \
+	erfa/src/$(DEPDIR)/$(am__dirstamp)
+erfa/src/pmp.lo: erfa/src/$(am__dirstamp) \
+	erfa/src/$(DEPDIR)/$(am__dirstamp)
+erfa/src/tr.lo: erfa/src/$(am__dirstamp) \
+	erfa/src/$(DEPDIR)/$(am__dirstamp)
+erfa/src/falp03.lo: erfa/src/$(am__dirstamp) \
+	erfa/src/$(DEPDIR)/$(am__dirstamp)
 sofa/src/$(am__dirstamp):
 	@$(MKDIR_P) sofa/src
@@ -1718,222 +1724,18 @@
 	@$(MKDIR_P) sofa/src/$(DEPDIR)
 	@: > sofa/src/$(DEPDIR)/$(am__dirstamp)
-sofa/src/dat.lo: sofa/src/$(am__dirstamp) \
-	sofa/src/$(DEPDIR)/$(am__dirstamp)
-sofa/src/cal2jd.lo: sofa/src/$(am__dirstamp) \
-	sofa/src/$(DEPDIR)/$(am__dirstamp)
-sofa/src/jd2cal.lo: sofa/src/$(am__dirstamp) \
-	sofa/src/$(DEPDIR)/$(am__dirstamp)
-sofa/src/epj.lo: sofa/src/$(am__dirstamp) \
-	sofa/src/$(DEPDIR)/$(am__dirstamp)
-sofa/src/pn.lo: sofa/src/$(am__dirstamp) \
-	sofa/src/$(DEPDIR)/$(am__dirstamp)
-sofa/src/rxpv.lo: sofa/src/$(am__dirstamp) \
-	sofa/src/$(DEPDIR)/$(am__dirstamp)
-sofa/src/rz.lo: sofa/src/$(am__dirstamp) \
-	sofa/src/$(DEPDIR)/$(am__dirstamp)
-sofa/src/zp.lo: sofa/src/$(am__dirstamp) \
-	sofa/src/$(DEPDIR)/$(am__dirstamp)
-sofa/src/pnm06a.lo: sofa/src/$(am__dirstamp) \
-	sofa/src/$(DEPDIR)/$(am__dirstamp)
-sofa/src/ir.lo: sofa/src/$(am__dirstamp) \
-	sofa/src/$(DEPDIR)/$(am__dirstamp)
-sofa/src/pmat06.lo: sofa/src/$(am__dirstamp) \
-	sofa/src/$(DEPDIR)/$(am__dirstamp)
-sofa/src/pm.lo: sofa/src/$(am__dirstamp) \
-	sofa/src/$(DEPDIR)/$(am__dirstamp)
-sofa/src/sxp.lo: sofa/src/$(am__dirstamp) \
-	sofa/src/$(DEPDIR)/$(am__dirstamp)
-sofa/src/epv00.lo: sofa/src/$(am__dirstamp) \
+sofa/src/anpm.lo: sofa/src/$(am__dirstamp) \
 	sofa/src/$(DEPDIR)/$(am__dirstamp)
 sofa/src/rxr.lo: sofa/src/$(am__dirstamp) \
 	sofa/src/$(DEPDIR)/$(am__dirstamp)
-sofa/src/rx.lo: sofa/src/$(am__dirstamp) \
+sofa/src/s2c.lo: sofa/src/$(am__dirstamp) \
 	sofa/src/$(DEPDIR)/$(am__dirstamp)
-sofa/src/p06e.lo: sofa/src/$(am__dirstamp) \
-	sofa/src/$(DEPDIR)/$(am__dirstamp)
-sofa/src/epj2jd.lo: sofa/src/$(am__dirstamp) \
-	sofa/src/$(DEPDIR)/$(am__dirstamp)
-sofa/src/obl06.lo: sofa/src/$(am__dirstamp) \
+sofa/src/c2s.lo: sofa/src/$(am__dirstamp) \
 	sofa/src/$(DEPDIR)/$(am__dirstamp)
 sofa/src/cr.lo: sofa/src/$(am__dirstamp) \
 	sofa/src/$(DEPDIR)/$(am__dirstamp)
-sofa/src/fw2m.lo: sofa/src/$(am__dirstamp) \
-	sofa/src/$(DEPDIR)/$(am__dirstamp)
-sofa/src/nut06a.lo: sofa/src/$(am__dirstamp) \
-	sofa/src/$(DEPDIR)/$(am__dirstamp)
-sofa/src/rxp.lo: sofa/src/$(am__dirstamp) \
-	sofa/src/$(DEPDIR)/$(am__dirstamp)
-sofa/src/pfw06.lo: sofa/src/$(am__dirstamp) \
-	sofa/src/$(DEPDIR)/$(am__dirstamp)
-sofa/src/nut00a.lo: sofa/src/$(am__dirstamp) \
-	sofa/src/$(DEPDIR)/$(am__dirstamp)
 sofa/src/cp.lo: sofa/src/$(am__dirstamp) \
-	sofa/src/$(DEPDIR)/$(am__dirstamp)
-sofa/src/faur03.lo: sofa/src/$(am__dirstamp) \
-	sofa/src/$(DEPDIR)/$(am__dirstamp)
-sofa/src/fapa03.lo: sofa/src/$(am__dirstamp) \
-	sofa/src/$(DEPDIR)/$(am__dirstamp)
-sofa/src/fave03.lo: sofa/src/$(am__dirstamp) \
-	sofa/src/$(DEPDIR)/$(am__dirstamp)
-sofa/src/fal03.lo: sofa/src/$(am__dirstamp) \
-	sofa/src/$(DEPDIR)/$(am__dirstamp)
-sofa/src/fasa03.lo: sofa/src/$(am__dirstamp) \
-	sofa/src/$(DEPDIR)/$(am__dirstamp)
-sofa/src/fame03.lo: sofa/src/$(am__dirstamp) \
-	sofa/src/$(DEPDIR)/$(am__dirstamp)
-sofa/src/faf03.lo: sofa/src/$(am__dirstamp) \
-	sofa/src/$(DEPDIR)/$(am__dirstamp)
-sofa/src/faom03.lo: sofa/src/$(am__dirstamp) \
-	sofa/src/$(DEPDIR)/$(am__dirstamp)
-sofa/src/faju03.lo: sofa/src/$(am__dirstamp) \
-	sofa/src/$(DEPDIR)/$(am__dirstamp)
-sofa/src/fae03.lo: sofa/src/$(am__dirstamp) \
-	sofa/src/$(DEPDIR)/$(am__dirstamp)
-sofa/src/fama03.lo: sofa/src/$(am__dirstamp) \
-	sofa/src/$(DEPDIR)/$(am__dirstamp)
-sofa/src/a2af.lo: sofa/src/$(am__dirstamp) \
-	sofa/src/$(DEPDIR)/$(am__dirstamp)
-sofa/src/c2s.lo: sofa/src/$(am__dirstamp) \
-	sofa/src/$(DEPDIR)/$(am__dirstamp)
-sofa/src/epb.lo: sofa/src/$(am__dirstamp) \
-	sofa/src/$(DEPDIR)/$(am__dirstamp)
-sofa/src/ee06a.lo: sofa/src/$(am__dirstamp) \
-	sofa/src/$(DEPDIR)/$(am__dirstamp)
-sofa/src/anp.lo: sofa/src/$(am__dirstamp) \
-	sofa/src/$(DEPDIR)/$(am__dirstamp)
-sofa/src/pap.lo: sofa/src/$(am__dirstamp) \
-	sofa/src/$(DEPDIR)/$(am__dirstamp)
-sofa/src/af2a.lo: sofa/src/$(am__dirstamp) \
-	sofa/src/$(DEPDIR)/$(am__dirstamp)
-sofa/src/s2c.lo: sofa/src/$(am__dirstamp) \
-	sofa/src/$(DEPDIR)/$(am__dirstamp)
-sofa/src/tf2d.lo: sofa/src/$(am__dirstamp) \
-	sofa/src/$(DEPDIR)/$(am__dirstamp)
-sofa/src/rv2m.lo: sofa/src/$(am__dirstamp) \
-	sofa/src/$(DEPDIR)/$(am__dirstamp)
-sofa/src/rm2v.lo: sofa/src/$(am__dirstamp) \
-	sofa/src/$(DEPDIR)/$(am__dirstamp)
-sofa/src/pdp.lo: sofa/src/$(am__dirstamp) \
-	sofa/src/$(DEPDIR)/$(am__dirstamp)
-sofa/src/anpm.lo: sofa/src/$(am__dirstamp) \
-	sofa/src/$(DEPDIR)/$(am__dirstamp)
-sofa/src/d2tf.lo: sofa/src/$(am__dirstamp) \
-	sofa/src/$(DEPDIR)/$(am__dirstamp)
-sofa/src/sepp.lo: sofa/src/$(am__dirstamp) \
-	sofa/src/$(DEPDIR)/$(am__dirstamp)
-sofa/src/fk5hz.lo: sofa/src/$(am__dirstamp) \
-	sofa/src/$(DEPDIR)/$(am__dirstamp)
-sofa/src/trxp.lo: sofa/src/$(am__dirstamp) \
-	sofa/src/$(DEPDIR)/$(am__dirstamp)
-sofa/src/pxp.lo: sofa/src/$(am__dirstamp) \
-	sofa/src/$(DEPDIR)/$(am__dirstamp)
-sofa/src/tf2a.lo: sofa/src/$(am__dirstamp) \
-	sofa/src/$(DEPDIR)/$(am__dirstamp)
-sofa/src/gmst06.lo: sofa/src/$(am__dirstamp) \
-	sofa/src/$(DEPDIR)/$(am__dirstamp)
-sofa/src/hfk5z.lo: sofa/src/$(am__dirstamp) \
-	sofa/src/$(DEPDIR)/$(am__dirstamp)
-sofa/src/epb2jd.lo: sofa/src/$(am__dirstamp) \
-	sofa/src/$(DEPDIR)/$(am__dirstamp)
-sofa/src/seps.lo: sofa/src/$(am__dirstamp) \
-	sofa/src/$(DEPDIR)/$(am__dirstamp)
-sofa/src/a2tf.lo: sofa/src/$(am__dirstamp) \
-	sofa/src/$(DEPDIR)/$(am__dirstamp)
-sofa/src/pmp.lo: sofa/src/$(am__dirstamp) \
-	sofa/src/$(DEPDIR)/$(am__dirstamp)
-sofa/src/pv2s.lo: sofa/src/$(am__dirstamp) \
-	sofa/src/$(DEPDIR)/$(am__dirstamp)
-sofa/src/pas.lo: sofa/src/$(am__dirstamp) \
-	sofa/src/$(DEPDIR)/$(am__dirstamp)
-sofa/src/tr.lo: sofa/src/$(am__dirstamp) \
-	sofa/src/$(DEPDIR)/$(am__dirstamp)
-sofa/src/fk5hip.lo: sofa/src/$(am__dirstamp) \
-	sofa/src/$(DEPDIR)/$(am__dirstamp)
-sofa/src/era00.lo: sofa/src/$(am__dirstamp) \
-	sofa/src/$(DEPDIR)/$(am__dirstamp)
-sofa/src/gst06a.lo: sofa/src/$(am__dirstamp) \
-	sofa/src/$(DEPDIR)/$(am__dirstamp)
-sofa/src/gst06.lo: sofa/src/$(am__dirstamp) \
-	sofa/src/$(DEPDIR)/$(am__dirstamp)
-sofa/src/bpn2xy.lo: sofa/src/$(am__dirstamp) \
-	sofa/src/$(DEPDIR)/$(am__dirstamp)
-sofa/src/eors.lo: sofa/src/$(am__dirstamp) \
-	sofa/src/$(DEPDIR)/$(am__dirstamp)
-sofa/src/s06.lo: sofa/src/$(am__dirstamp) \
-	sofa/src/$(DEPDIR)/$(am__dirstamp)
-sofa/src/falp03.lo: sofa/src/$(am__dirstamp) \
-	sofa/src/$(DEPDIR)/$(am__dirstamp)
-sofa/src/fad03.lo: sofa/src/$(am__dirstamp) \
-	sofa/src/$(DEPDIR)/$(am__dirstamp)
-sofa/src/gd2gc.lo: sofa/src/$(am__dirstamp) \
-	sofa/src/$(DEPDIR)/$(am__dirstamp)
-sofa/src/plan94.lo: sofa/src/$(am__dirstamp) \
-	sofa/src/$(DEPDIR)/$(am__dirstamp)
-sofa/src/gd2gce.lo: sofa/src/$(am__dirstamp) \
-	sofa/src/$(DEPDIR)/$(am__dirstamp)
-sofa/src/eform.lo: sofa/src/$(am__dirstamp) \
-	sofa/src/$(DEPDIR)/$(am__dirstamp)
-sofa/src/ry.lo: sofa/src/$(am__dirstamp) \
 	sofa/src/$(DEPDIR)/$(am__dirstamp)
 libPal.la: $(libPal_la_OBJECTS) $(libPal_la_DEPENDENCIES) $(EXTRA_libPal_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(LINK) -rpath $(libdir) $(libPal_la_OBJECTS) $(libPal_la_LIBADD) $(LIBS)
-slalib/$(am__dirstamp):
-	@$(MKDIR_P) slalib
-	@: > slalib/$(am__dirstamp)
-slalib/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) slalib/$(DEPDIR)
-	@: > slalib/$(DEPDIR)/$(am__dirstamp)
-slalib/aopqk.lo: slalib/$(am__dirstamp) \
-	slalib/$(DEPDIR)/$(am__dirstamp)
-slalib/mappa.lo: slalib/$(am__dirstamp) \
-	slalib/$(DEPDIR)/$(am__dirstamp)
-slalib/aoppa.lo: slalib/$(am__dirstamp) \
-	slalib/$(DEPDIR)/$(am__dirstamp)
-slalib/dtt.lo: slalib/$(am__dirstamp) slalib/$(DEPDIR)/$(am__dirstamp)
-slalib/mapqkz.lo: slalib/$(am__dirstamp) \
-	slalib/$(DEPDIR)/$(am__dirstamp)
-slalib/refco.lo: slalib/$(am__dirstamp) \
-	slalib/$(DEPDIR)/$(am__dirstamp)
-slalib/refro.lo: slalib/$(am__dirstamp) \
-	slalib/$(DEPDIR)/$(am__dirstamp)
-slalib/epj.lo: slalib/$(am__dirstamp) slalib/$(DEPDIR)/$(am__dirstamp)
-slalib/geoc.lo: slalib/$(am__dirstamp) \
-	slalib/$(DEPDIR)/$(am__dirstamp)
-slalib/dranrm.lo: slalib/$(am__dirstamp) \
-	slalib/$(DEPDIR)/$(am__dirstamp)
-slalib/refz.lo: slalib/$(am__dirstamp) \
-	slalib/$(DEPDIR)/$(am__dirstamp)
-slalib/dvn.lo: slalib/$(am__dirstamp) slalib/$(DEPDIR)/$(am__dirstamp)
-slalib/dcc2s.lo: slalib/$(am__dirstamp) \
-	slalib/$(DEPDIR)/$(am__dirstamp)
-slalib/aoppat.lo: slalib/$(am__dirstamp) \
-	slalib/$(DEPDIR)/$(am__dirstamp)
-slalib/dcs2c.lo: slalib/$(am__dirstamp) \
-	slalib/$(DEPDIR)/$(am__dirstamp)
-slalib/evp.lo: slalib/$(am__dirstamp) slalib/$(DEPDIR)/$(am__dirstamp)
-slalib/eqeqx.lo: slalib/$(am__dirstamp) \
-	slalib/$(DEPDIR)/$(am__dirstamp)
-slalib/dat.lo: slalib/$(am__dirstamp) slalib/$(DEPDIR)/$(am__dirstamp)
-slalib/prenut.lo: slalib/$(am__dirstamp) \
-	slalib/$(DEPDIR)/$(am__dirstamp)
-slalib/gmst.lo: slalib/$(am__dirstamp) \
-	slalib/$(DEPDIR)/$(am__dirstamp)
-slalib/prec.lo: slalib/$(am__dirstamp) \
-	slalib/$(DEPDIR)/$(am__dirstamp)
-slalib/dmxm.lo: slalib/$(am__dirstamp) \
-	slalib/$(DEPDIR)/$(am__dirstamp)
-slalib/nutc.lo: slalib/$(am__dirstamp) \
-	slalib/$(DEPDIR)/$(am__dirstamp)
-slalib/nut.lo: slalib/$(am__dirstamp) slalib/$(DEPDIR)/$(am__dirstamp)
-slalib/drange.lo: slalib/$(am__dirstamp) \
-	slalib/$(DEPDIR)/$(am__dirstamp)
-slalib/dvdv.lo: slalib/$(am__dirstamp) \
-	slalib/$(DEPDIR)/$(am__dirstamp)
-slalib/dmxv.lo: slalib/$(am__dirstamp) \
-	slalib/$(DEPDIR)/$(am__dirstamp)
-slalib/deuler.lo: slalib/$(am__dirstamp) \
-	slalib/$(DEPDIR)/$(am__dirstamp)
-libSlalib.la: $(libSlalib_la_OBJECTS) $(libSlalib_la_DEPENDENCIES) $(EXTRA_libSlalib_la_DEPENDENCIES) 
-	$(AM_V_CCLD)$(LINK) -rpath $(libdir) $(libSlalib_la_OBJECTS) $(libSlalib_la_LIBADD) $(LIBS)
 src/WindowLog.lo: src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
 src/Readline.lo: src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
@@ -2057,9 +1859,4 @@
 	@rm -f biasctrl$(EXEEXT)
 	$(AM_V_CXXLD)$(CXXLINK) $(biasctrl_OBJECTS) $(biasctrl_LDADD) $(LIBS)
-src/ccdctrl.$(OBJEXT): src/$(am__dirstamp) \
-	src/$(DEPDIR)/$(am__dirstamp)
-ccdctrl$(EXEEXT): $(ccdctrl_OBJECTS) $(ccdctrl_DEPENDENCIES) $(EXTRA_ccdctrl_DEPENDENCIES) 
-	@rm -f ccdctrl$(EXEEXT)
-	$(AM_V_CXXLD)$(CXXLINK) $(ccdctrl_OBJECTS) $(ccdctrl_LDADD) $(LIBS)
 src/chatclient.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
@@ -2072,4 +1869,11 @@
 	@rm -f chatserv$(EXEEXT)
 	$(AM_V_CXXLD)$(CXXLINK) $(chatserv_OBJECTS) $(chatserv_LDADD) $(LIBS)
+src/cosyctrl.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+src/HeadersFTM.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+cosyctrl$(EXEEXT): $(cosyctrl_OBJECTS) $(cosyctrl_DEPENDENCIES) $(EXTRA_cosyctrl_DEPENDENCIES) 
+	@rm -f cosyctrl$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(cosyctrl_OBJECTS) $(cosyctrl_LDADD) $(LIBS)
 src/datalogger.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
@@ -2118,4 +1922,9 @@
 	@rm -f dns$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(dns_OBJECTS) $(dns_LDADD) $(LIBS)
+src/drivectrl.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+drivectrl$(EXEEXT): $(drivectrl_OBJECTS) $(drivectrl_DEPENDENCIES) $(EXTRA_drivectrl_DEPENDENCIES) 
+	@rm -f drivectrl$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(drivectrl_OBJECTS) $(drivectrl_LDADD) $(LIBS)
 src/dserver2.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
@@ -2159,6 +1968,4 @@
 gui/FactGui.$(OBJEXT): gui/$(am__dirstamp) \
 	gui/$(DEPDIR)/$(am__dirstamp)
-src/HeadersFTM.$(OBJEXT): src/$(am__dirstamp) \
-	src/$(DEPDIR)/$(am__dirstamp)
 fact$(EXEEXT): $(fact_OBJECTS) $(fact_DEPENDENCIES) $(EXTRA_fact_DEPENDENCIES) 
 	@rm -f fact$(EXEEXT)
@@ -2210,9 +2017,4 @@
 	@rm -f fitsloader$(EXEEXT)
 	$(AM_V_CXXLD)$(CXXLINK) $(fitsloader_OBJECTS) $(fitsloader_LDADD) $(LIBS)
-<<<<<<< .mine
-fitsselect$(EXEEXT): $(fitsselect_OBJECTS) $(fitsselect_DEPENDENCIES) $(EXTRA_fitsselect_DEPENDENCIES) 
-	@rm -f fitsselect$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(fitsselect_OBJECTS) $(fitsselect_LDADD) $(LIBS)
-=======
 src/fitsselect.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
@@ -2220,5 +2022,4 @@
 	@rm -f fitsselect$(EXEEXT)
 	$(AM_V_CXXLD)$(CXXLINK) $(fitsselect_OBJECTS) $(fitsselect_LDADD) $(LIBS)
->>>>>>> .r18350
 src/fsc.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
 fsc$(EXEEXT): $(fsc_OBJECTS) $(fsc_DEPENDENCIES) $(EXTRA_fsc_DEPENDENCIES) 
@@ -2340,9 +2141,4 @@
 	@rm -f skypeclient$(EXEEXT)
 	$(AM_V_CXXLD)$(CXXLINK) $(skypeclient_OBJECTS) $(skypeclient_LDADD) $(LIBS)
-src/slalib-test.$(OBJEXT): src/$(am__dirstamp) \
-	src/$(DEPDIR)/$(am__dirstamp)
-slalib-test$(EXEEXT): $(slalib_test_OBJECTS) $(slalib_test_DEPENDENCIES) $(EXTRA_slalib_test_DEPENDENCIES) 
-	@rm -f slalib-test$(EXEEXT)
-	$(AM_V_CXXLD)$(CXXLINK) $(slalib_test_OBJECTS) $(slalib_test_LDADD) $(LIBS)
 src/smartfact.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
@@ -2350,10 +2146,4 @@
 	@rm -f smartfact$(EXEEXT)
 	$(AM_V_CXXLD)$(CXXLINK) $(smartfact_OBJECTS) $(smartfact_LDADD) $(LIBS)
-<<<<<<< .mine
-src/spsctrl.$(OBJEXT): src/$(am__dirstamp) \
-	src/$(DEPDIR)/$(am__dirstamp)
-spsctrl$(EXEEXT): $(spsctrl_OBJECTS) $(spsctrl_DEPENDENCIES) $(EXTRA_spsctrl_DEPENDENCIES) 
-	@rm -f spsctrl$(EXEEXT)
-	$(AM_V_CXXLD)$(CXXLINK) $(spsctrl_OBJECTS) $(spsctrl_LDADD) $(LIBS)
 src/sqmctrl.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
@@ -2361,11 +2151,4 @@
 	@rm -f sqmctrl$(EXEEXT)
 	$(AM_V_CXXLD)$(CXXLINK) $(sqmctrl_OBJECTS) $(sqmctrl_LDADD) $(LIBS)
-=======
-src/sqmctrl.$(OBJEXT): src/$(am__dirstamp) \
-	src/$(DEPDIR)/$(am__dirstamp)
-sqmctrl$(EXEEXT): $(sqmctrl_OBJECTS) $(sqmctrl_DEPENDENCIES) $(EXTRA_sqmctrl_DEPENDENCIES) 
-	@rm -f sqmctrl$(EXEEXT)
-	$(AM_V_CXXLD)$(CXXLINK) $(sqmctrl_OBJECTS) $(sqmctrl_LDADD) $(LIBS)
->>>>>>> .r18350
 src/temperature.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
@@ -2495,4 +2278,164 @@
 	-rm -f dim/src/webDid/webDid-webDid.$(OBJEXT)
 	-rm -f dim/src/webDid/webDid-webTcpip.$(OBJEXT)
+	-rm -f erfa/src/a2af.$(OBJEXT)
+	-rm -f erfa/src/a2af.lo
+	-rm -f erfa/src/a2tf.$(OBJEXT)
+	-rm -f erfa/src/a2tf.lo
+	-rm -f erfa/src/af2a.$(OBJEXT)
+	-rm -f erfa/src/af2a.lo
+	-rm -f erfa/src/anp.$(OBJEXT)
+	-rm -f erfa/src/anp.lo
+	-rm -f erfa/src/anpm.$(OBJEXT)
+	-rm -f erfa/src/anpm.lo
+	-rm -f erfa/src/bpn2xy.$(OBJEXT)
+	-rm -f erfa/src/bpn2xy.lo
+	-rm -f erfa/src/c2s.$(OBJEXT)
+	-rm -f erfa/src/c2s.lo
+	-rm -f erfa/src/cal2jd.$(OBJEXT)
+	-rm -f erfa/src/cal2jd.lo
+	-rm -f erfa/src/cp.$(OBJEXT)
+	-rm -f erfa/src/cp.lo
+	-rm -f erfa/src/cr.$(OBJEXT)
+	-rm -f erfa/src/cr.lo
+	-rm -f erfa/src/d2tf.$(OBJEXT)
+	-rm -f erfa/src/d2tf.lo
+	-rm -f erfa/src/dat.$(OBJEXT)
+	-rm -f erfa/src/dat.lo
+	-rm -f erfa/src/ee06a.$(OBJEXT)
+	-rm -f erfa/src/ee06a.lo
+	-rm -f erfa/src/eform.$(OBJEXT)
+	-rm -f erfa/src/eform.lo
+	-rm -f erfa/src/eors.$(OBJEXT)
+	-rm -f erfa/src/eors.lo
+	-rm -f erfa/src/epb.$(OBJEXT)
+	-rm -f erfa/src/epb.lo
+	-rm -f erfa/src/epb2jd.$(OBJEXT)
+	-rm -f erfa/src/epb2jd.lo
+	-rm -f erfa/src/epj.$(OBJEXT)
+	-rm -f erfa/src/epj.lo
+	-rm -f erfa/src/epj2jd.$(OBJEXT)
+	-rm -f erfa/src/epj2jd.lo
+	-rm -f erfa/src/epv00.$(OBJEXT)
+	-rm -f erfa/src/epv00.lo
+	-rm -f erfa/src/era00.$(OBJEXT)
+	-rm -f erfa/src/era00.lo
+	-rm -f erfa/src/fad03.$(OBJEXT)
+	-rm -f erfa/src/fad03.lo
+	-rm -f erfa/src/fae03.$(OBJEXT)
+	-rm -f erfa/src/fae03.lo
+	-rm -f erfa/src/faf03.$(OBJEXT)
+	-rm -f erfa/src/faf03.lo
+	-rm -f erfa/src/faju03.$(OBJEXT)
+	-rm -f erfa/src/faju03.lo
+	-rm -f erfa/src/fal03.$(OBJEXT)
+	-rm -f erfa/src/fal03.lo
+	-rm -f erfa/src/falp03.$(OBJEXT)
+	-rm -f erfa/src/falp03.lo
+	-rm -f erfa/src/fama03.$(OBJEXT)
+	-rm -f erfa/src/fama03.lo
+	-rm -f erfa/src/fame03.$(OBJEXT)
+	-rm -f erfa/src/fame03.lo
+	-rm -f erfa/src/faom03.$(OBJEXT)
+	-rm -f erfa/src/faom03.lo
+	-rm -f erfa/src/fapa03.$(OBJEXT)
+	-rm -f erfa/src/fapa03.lo
+	-rm -f erfa/src/fasa03.$(OBJEXT)
+	-rm -f erfa/src/fasa03.lo
+	-rm -f erfa/src/faur03.$(OBJEXT)
+	-rm -f erfa/src/faur03.lo
+	-rm -f erfa/src/fave03.$(OBJEXT)
+	-rm -f erfa/src/fave03.lo
+	-rm -f erfa/src/fk5hip.$(OBJEXT)
+	-rm -f erfa/src/fk5hip.lo
+	-rm -f erfa/src/fk5hz.$(OBJEXT)
+	-rm -f erfa/src/fk5hz.lo
+	-rm -f erfa/src/fw2m.$(OBJEXT)
+	-rm -f erfa/src/fw2m.lo
+	-rm -f erfa/src/gd2gc.$(OBJEXT)
+	-rm -f erfa/src/gd2gc.lo
+	-rm -f erfa/src/gd2gce.$(OBJEXT)
+	-rm -f erfa/src/gd2gce.lo
+	-rm -f erfa/src/gmst06.$(OBJEXT)
+	-rm -f erfa/src/gmst06.lo
+	-rm -f erfa/src/gst06.$(OBJEXT)
+	-rm -f erfa/src/gst06.lo
+	-rm -f erfa/src/gst06a.$(OBJEXT)
+	-rm -f erfa/src/gst06a.lo
+	-rm -f erfa/src/hfk5z.$(OBJEXT)
+	-rm -f erfa/src/hfk5z.lo
+	-rm -f erfa/src/ir.$(OBJEXT)
+	-rm -f erfa/src/ir.lo
+	-rm -f erfa/src/jd2cal.$(OBJEXT)
+	-rm -f erfa/src/jd2cal.lo
+	-rm -f erfa/src/nut00a.$(OBJEXT)
+	-rm -f erfa/src/nut00a.lo
+	-rm -f erfa/src/nut06a.$(OBJEXT)
+	-rm -f erfa/src/nut06a.lo
+	-rm -f erfa/src/obl06.$(OBJEXT)
+	-rm -f erfa/src/obl06.lo
+	-rm -f erfa/src/p06e.$(OBJEXT)
+	-rm -f erfa/src/p06e.lo
+	-rm -f erfa/src/pap.$(OBJEXT)
+	-rm -f erfa/src/pap.lo
+	-rm -f erfa/src/pas.$(OBJEXT)
+	-rm -f erfa/src/pas.lo
+	-rm -f erfa/src/pdp.$(OBJEXT)
+	-rm -f erfa/src/pdp.lo
+	-rm -f erfa/src/pfw06.$(OBJEXT)
+	-rm -f erfa/src/pfw06.lo
+	-rm -f erfa/src/plan94.$(OBJEXT)
+	-rm -f erfa/src/plan94.lo
+	-rm -f erfa/src/pm.$(OBJEXT)
+	-rm -f erfa/src/pm.lo
+	-rm -f erfa/src/pmat06.$(OBJEXT)
+	-rm -f erfa/src/pmat06.lo
+	-rm -f erfa/src/pmp.$(OBJEXT)
+	-rm -f erfa/src/pmp.lo
+	-rm -f erfa/src/pn.$(OBJEXT)
+	-rm -f erfa/src/pn.lo
+	-rm -f erfa/src/pnm06a.$(OBJEXT)
+	-rm -f erfa/src/pnm06a.lo
+	-rm -f erfa/src/pv2s.$(OBJEXT)
+	-rm -f erfa/src/pv2s.lo
+	-rm -f erfa/src/pxp.$(OBJEXT)
+	-rm -f erfa/src/pxp.lo
+	-rm -f erfa/src/refco.$(OBJEXT)
+	-rm -f erfa/src/refco.lo
+	-rm -f erfa/src/rm2v.$(OBJEXT)
+	-rm -f erfa/src/rm2v.lo
+	-rm -f erfa/src/rv2m.$(OBJEXT)
+	-rm -f erfa/src/rv2m.lo
+	-rm -f erfa/src/rx.$(OBJEXT)
+	-rm -f erfa/src/rx.lo
+	-rm -f erfa/src/rxp.$(OBJEXT)
+	-rm -f erfa/src/rxp.lo
+	-rm -f erfa/src/rxpv.$(OBJEXT)
+	-rm -f erfa/src/rxpv.lo
+	-rm -f erfa/src/rxr.$(OBJEXT)
+	-rm -f erfa/src/rxr.lo
+	-rm -f erfa/src/ry.$(OBJEXT)
+	-rm -f erfa/src/ry.lo
+	-rm -f erfa/src/rz.$(OBJEXT)
+	-rm -f erfa/src/rz.lo
+	-rm -f erfa/src/s06.$(OBJEXT)
+	-rm -f erfa/src/s06.lo
+	-rm -f erfa/src/s2c.$(OBJEXT)
+	-rm -f erfa/src/s2c.lo
+	-rm -f erfa/src/sepp.$(OBJEXT)
+	-rm -f erfa/src/sepp.lo
+	-rm -f erfa/src/seps.$(OBJEXT)
+	-rm -f erfa/src/seps.lo
+	-rm -f erfa/src/sxp.$(OBJEXT)
+	-rm -f erfa/src/sxp.lo
+	-rm -f erfa/src/tf2a.$(OBJEXT)
+	-rm -f erfa/src/tf2a.lo
+	-rm -f erfa/src/tf2d.$(OBJEXT)
+	-rm -f erfa/src/tf2d.lo
+	-rm -f erfa/src/tr.$(OBJEXT)
+	-rm -f erfa/src/tr.lo
+	-rm -f erfa/src/trxp.$(OBJEXT)
+	-rm -f erfa/src/trxp.lo
+	-rm -f erfa/src/zp.$(OBJEXT)
+	-rm -f erfa/src/zp.lo
 	-rm -f gui/BasicGlCamera.$(OBJEXT)
 	-rm -f gui/BasicGlCamera.moc.$(OBJEXT)
@@ -2566,218 +2509,16 @@
 	-rm -f pal/palRefz.$(OBJEXT)
 	-rm -f pal/palRefz.lo
-	-rm -f slalib/aoppa.$(OBJEXT)
-	-rm -f slalib/aoppa.lo
-	-rm -f slalib/aoppat.$(OBJEXT)
-	-rm -f slalib/aoppat.lo
-	-rm -f slalib/aopqk.$(OBJEXT)
-	-rm -f slalib/aopqk.lo
-	-rm -f slalib/dat.$(OBJEXT)
-	-rm -f slalib/dat.lo
-	-rm -f slalib/dcc2s.$(OBJEXT)
-	-rm -f slalib/dcc2s.lo
-	-rm -f slalib/dcs2c.$(OBJEXT)
-	-rm -f slalib/dcs2c.lo
-	-rm -f slalib/deuler.$(OBJEXT)
-	-rm -f slalib/deuler.lo
-	-rm -f slalib/dmxm.$(OBJEXT)
-	-rm -f slalib/dmxm.lo
-	-rm -f slalib/dmxv.$(OBJEXT)
-	-rm -f slalib/dmxv.lo
-	-rm -f slalib/drange.$(OBJEXT)
-	-rm -f slalib/drange.lo
-	-rm -f slalib/dranrm.$(OBJEXT)
-	-rm -f slalib/dranrm.lo
-	-rm -f slalib/dtt.$(OBJEXT)
-	-rm -f slalib/dtt.lo
-	-rm -f slalib/dvdv.$(OBJEXT)
-	-rm -f slalib/dvdv.lo
-	-rm -f slalib/dvn.$(OBJEXT)
-	-rm -f slalib/dvn.lo
-	-rm -f slalib/epj.$(OBJEXT)
-	-rm -f slalib/epj.lo
-	-rm -f slalib/eqeqx.$(OBJEXT)
-	-rm -f slalib/eqeqx.lo
-	-rm -f slalib/evp.$(OBJEXT)
-	-rm -f slalib/evp.lo
-	-rm -f slalib/geoc.$(OBJEXT)
-	-rm -f slalib/geoc.lo
-	-rm -f slalib/gmst.$(OBJEXT)
-	-rm -f slalib/gmst.lo
-	-rm -f slalib/mappa.$(OBJEXT)
-	-rm -f slalib/mappa.lo
-	-rm -f slalib/mapqkz.$(OBJEXT)
-	-rm -f slalib/mapqkz.lo
-	-rm -f slalib/nut.$(OBJEXT)
-	-rm -f slalib/nut.lo
-	-rm -f slalib/nutc.$(OBJEXT)
-	-rm -f slalib/nutc.lo
-	-rm -f slalib/prec.$(OBJEXT)
-	-rm -f slalib/prec.lo
-	-rm -f slalib/prenut.$(OBJEXT)
-	-rm -f slalib/prenut.lo
-	-rm -f slalib/refco.$(OBJEXT)
-	-rm -f slalib/refco.lo
-	-rm -f slalib/refro.$(OBJEXT)
-	-rm -f slalib/refro.lo
-	-rm -f slalib/refz.$(OBJEXT)
-	-rm -f slalib/refz.lo
-	-rm -f sofa/src/a2af.$(OBJEXT)
-	-rm -f sofa/src/a2af.lo
-	-rm -f sofa/src/a2tf.$(OBJEXT)
-	-rm -f sofa/src/a2tf.lo
-	-rm -f sofa/src/af2a.$(OBJEXT)
-	-rm -f sofa/src/af2a.lo
-	-rm -f sofa/src/anp.$(OBJEXT)
-	-rm -f sofa/src/anp.lo
 	-rm -f sofa/src/anpm.$(OBJEXT)
 	-rm -f sofa/src/anpm.lo
-	-rm -f sofa/src/bpn2xy.$(OBJEXT)
-	-rm -f sofa/src/bpn2xy.lo
 	-rm -f sofa/src/c2s.$(OBJEXT)
 	-rm -f sofa/src/c2s.lo
-	-rm -f sofa/src/cal2jd.$(OBJEXT)
-	-rm -f sofa/src/cal2jd.lo
 	-rm -f sofa/src/cp.$(OBJEXT)
 	-rm -f sofa/src/cp.lo
 	-rm -f sofa/src/cr.$(OBJEXT)
 	-rm -f sofa/src/cr.lo
-	-rm -f sofa/src/d2tf.$(OBJEXT)
-	-rm -f sofa/src/d2tf.lo
-	-rm -f sofa/src/dat.$(OBJEXT)
-	-rm -f sofa/src/dat.lo
-	-rm -f sofa/src/ee06a.$(OBJEXT)
-	-rm -f sofa/src/ee06a.lo
-	-rm -f sofa/src/eform.$(OBJEXT)
-	-rm -f sofa/src/eform.lo
-	-rm -f sofa/src/eors.$(OBJEXT)
-	-rm -f sofa/src/eors.lo
-	-rm -f sofa/src/epb.$(OBJEXT)
-	-rm -f sofa/src/epb.lo
-	-rm -f sofa/src/epb2jd.$(OBJEXT)
-	-rm -f sofa/src/epb2jd.lo
-	-rm -f sofa/src/epj.$(OBJEXT)
-	-rm -f sofa/src/epj.lo
-	-rm -f sofa/src/epj2jd.$(OBJEXT)
-	-rm -f sofa/src/epj2jd.lo
-	-rm -f sofa/src/epv00.$(OBJEXT)
-	-rm -f sofa/src/epv00.lo
-	-rm -f sofa/src/era00.$(OBJEXT)
-	-rm -f sofa/src/era00.lo
-	-rm -f sofa/src/fad03.$(OBJEXT)
-	-rm -f sofa/src/fad03.lo
-	-rm -f sofa/src/fae03.$(OBJEXT)
-	-rm -f sofa/src/fae03.lo
-	-rm -f sofa/src/faf03.$(OBJEXT)
-	-rm -f sofa/src/faf03.lo
-	-rm -f sofa/src/faju03.$(OBJEXT)
-	-rm -f sofa/src/faju03.lo
-	-rm -f sofa/src/fal03.$(OBJEXT)
-	-rm -f sofa/src/fal03.lo
-	-rm -f sofa/src/falp03.$(OBJEXT)
-	-rm -f sofa/src/falp03.lo
-	-rm -f sofa/src/fama03.$(OBJEXT)
-	-rm -f sofa/src/fama03.lo
-	-rm -f sofa/src/fame03.$(OBJEXT)
-	-rm -f sofa/src/fame03.lo
-	-rm -f sofa/src/faom03.$(OBJEXT)
-	-rm -f sofa/src/faom03.lo
-	-rm -f sofa/src/fapa03.$(OBJEXT)
-	-rm -f sofa/src/fapa03.lo
-	-rm -f sofa/src/fasa03.$(OBJEXT)
-	-rm -f sofa/src/fasa03.lo
-	-rm -f sofa/src/faur03.$(OBJEXT)
-	-rm -f sofa/src/faur03.lo
-	-rm -f sofa/src/fave03.$(OBJEXT)
-	-rm -f sofa/src/fave03.lo
-	-rm -f sofa/src/fk5hip.$(OBJEXT)
-	-rm -f sofa/src/fk5hip.lo
-	-rm -f sofa/src/fk5hz.$(OBJEXT)
-	-rm -f sofa/src/fk5hz.lo
-	-rm -f sofa/src/fw2m.$(OBJEXT)
-	-rm -f sofa/src/fw2m.lo
-	-rm -f sofa/src/gd2gc.$(OBJEXT)
-	-rm -f sofa/src/gd2gc.lo
-	-rm -f sofa/src/gd2gce.$(OBJEXT)
-	-rm -f sofa/src/gd2gce.lo
-	-rm -f sofa/src/gmst06.$(OBJEXT)
-	-rm -f sofa/src/gmst06.lo
-	-rm -f sofa/src/gst06.$(OBJEXT)
-	-rm -f sofa/src/gst06.lo
-	-rm -f sofa/src/gst06a.$(OBJEXT)
-	-rm -f sofa/src/gst06a.lo
-	-rm -f sofa/src/hfk5z.$(OBJEXT)
-	-rm -f sofa/src/hfk5z.lo
-	-rm -f sofa/src/ir.$(OBJEXT)
-	-rm -f sofa/src/ir.lo
-	-rm -f sofa/src/jd2cal.$(OBJEXT)
-	-rm -f sofa/src/jd2cal.lo
-	-rm -f sofa/src/nut00a.$(OBJEXT)
-	-rm -f sofa/src/nut00a.lo
-	-rm -f sofa/src/nut06a.$(OBJEXT)
-	-rm -f sofa/src/nut06a.lo
-	-rm -f sofa/src/obl06.$(OBJEXT)
-	-rm -f sofa/src/obl06.lo
-	-rm -f sofa/src/p06e.$(OBJEXT)
-	-rm -f sofa/src/p06e.lo
-	-rm -f sofa/src/pap.$(OBJEXT)
-	-rm -f sofa/src/pap.lo
-	-rm -f sofa/src/pas.$(OBJEXT)
-	-rm -f sofa/src/pas.lo
-	-rm -f sofa/src/pdp.$(OBJEXT)
-	-rm -f sofa/src/pdp.lo
-	-rm -f sofa/src/pfw06.$(OBJEXT)
-	-rm -f sofa/src/pfw06.lo
-	-rm -f sofa/src/plan94.$(OBJEXT)
-	-rm -f sofa/src/plan94.lo
-	-rm -f sofa/src/pm.$(OBJEXT)
-	-rm -f sofa/src/pm.lo
-	-rm -f sofa/src/pmat06.$(OBJEXT)
-	-rm -f sofa/src/pmat06.lo
-	-rm -f sofa/src/pmp.$(OBJEXT)
-	-rm -f sofa/src/pmp.lo
-	-rm -f sofa/src/pn.$(OBJEXT)
-	-rm -f sofa/src/pn.lo
-	-rm -f sofa/src/pnm06a.$(OBJEXT)
-	-rm -f sofa/src/pnm06a.lo
-	-rm -f sofa/src/pv2s.$(OBJEXT)
-	-rm -f sofa/src/pv2s.lo
-	-rm -f sofa/src/pxp.$(OBJEXT)
-	-rm -f sofa/src/pxp.lo
-	-rm -f sofa/src/rm2v.$(OBJEXT)
-	-rm -f sofa/src/rm2v.lo
-	-rm -f sofa/src/rv2m.$(OBJEXT)
-	-rm -f sofa/src/rv2m.lo
-	-rm -f sofa/src/rx.$(OBJEXT)
-	-rm -f sofa/src/rx.lo
-	-rm -f sofa/src/rxp.$(OBJEXT)
-	-rm -f sofa/src/rxp.lo
-	-rm -f sofa/src/rxpv.$(OBJEXT)
-	-rm -f sofa/src/rxpv.lo
 	-rm -f sofa/src/rxr.$(OBJEXT)
 	-rm -f sofa/src/rxr.lo
-	-rm -f sofa/src/ry.$(OBJEXT)
-	-rm -f sofa/src/ry.lo
-	-rm -f sofa/src/rz.$(OBJEXT)
-	-rm -f sofa/src/rz.lo
-	-rm -f sofa/src/s06.$(OBJEXT)
-	-rm -f sofa/src/s06.lo
 	-rm -f sofa/src/s2c.$(OBJEXT)
 	-rm -f sofa/src/s2c.lo
-	-rm -f sofa/src/sepp.$(OBJEXT)
-	-rm -f sofa/src/sepp.lo
-	-rm -f sofa/src/seps.$(OBJEXT)
-	-rm -f sofa/src/seps.lo
-	-rm -f sofa/src/sxp.$(OBJEXT)
-	-rm -f sofa/src/sxp.lo
-	-rm -f sofa/src/tf2a.$(OBJEXT)
-	-rm -f sofa/src/tf2a.lo
-	-rm -f sofa/src/tf2d.$(OBJEXT)
-	-rm -f sofa/src/tf2d.lo
-	-rm -f sofa/src/tr.$(OBJEXT)
-	-rm -f sofa/src/tr.lo
-	-rm -f sofa/src/trxp.$(OBJEXT)
-	-rm -f sofa/src/trxp.lo
-	-rm -f sofa/src/zp.$(OBJEXT)
-	-rm -f sofa/src/zp.lo
 	-rm -f src/Configuration.$(OBJEXT)
 	-rm -f src/Configuration.lo
@@ -2857,11 +2598,12 @@
 	-rm -f src/argv.$(OBJEXT)
 	-rm -f src/biasctrl.$(OBJEXT)
-	-rm -f src/ccdctrl.$(OBJEXT)
 	-rm -f src/chatclient.$(OBJEXT)
 	-rm -f src/chatserv.$(OBJEXT)
+	-rm -f src/cosyctrl.$(OBJEXT)
 	-rm -f src/datalogger.$(OBJEXT)
 	-rm -f src/dclient5.$(OBJEXT)
 	-rm -f src/dimctrl.$(OBJEXT)
 	-rm -f src/dns.$(OBJEXT)
+	-rm -f src/drivectrl.$(OBJEXT)
 	-rm -f src/dserver2.$(OBJEXT)
 	-rm -f src/evtserver.$(OBJEXT)
@@ -2897,12 +2639,6 @@
 	-rm -f src/showlog.$(OBJEXT)
 	-rm -f src/skypeclient.$(OBJEXT)
-	-rm -f src/slalib-test.$(OBJEXT)
 	-rm -f src/smartfact.$(OBJEXT)
-<<<<<<< .mine
-	-rm -f src/spsctrl.$(OBJEXT)
 	-rm -f src/sqmctrl.$(OBJEXT)
-=======
-	-rm -f src/sqmctrl.$(OBJEXT)
->>>>>>> .r18350
 	-rm -f src/temperature.$(OBJEXT)
 	-rm -f src/test.$(OBJEXT)
@@ -2925,5 +2661,4 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/astro.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fitsgrep.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fitsselect.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sched.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@dim/src/$(DEPDIR)/conn_handler.Plo@am__quote@
@@ -2949,4 +2684,84 @@
 @AMDEP_TRUE@@am__include@ @am__quote@dim/src/webDid/$(DEPDIR)/webDid-webDid.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@dim/src/webDid/$(DEPDIR)/webDid-webTcpip.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@erfa/src/$(DEPDIR)/a2af.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@erfa/src/$(DEPDIR)/a2tf.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@erfa/src/$(DEPDIR)/af2a.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@erfa/src/$(DEPDIR)/anp.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@erfa/src/$(DEPDIR)/anpm.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@erfa/src/$(DEPDIR)/bpn2xy.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@erfa/src/$(DEPDIR)/c2s.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@erfa/src/$(DEPDIR)/cal2jd.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@erfa/src/$(DEPDIR)/cp.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@erfa/src/$(DEPDIR)/cr.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@erfa/src/$(DEPDIR)/d2tf.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@erfa/src/$(DEPDIR)/dat.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@erfa/src/$(DEPDIR)/ee06a.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@erfa/src/$(DEPDIR)/eform.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@erfa/src/$(DEPDIR)/eors.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@erfa/src/$(DEPDIR)/epb.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@erfa/src/$(DEPDIR)/epb2jd.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@erfa/src/$(DEPDIR)/epj.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@erfa/src/$(DEPDIR)/epj2jd.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@erfa/src/$(DEPDIR)/epv00.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@erfa/src/$(DEPDIR)/era00.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@erfa/src/$(DEPDIR)/fad03.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@erfa/src/$(DEPDIR)/fae03.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@erfa/src/$(DEPDIR)/faf03.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@erfa/src/$(DEPDIR)/faju03.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@erfa/src/$(DEPDIR)/fal03.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@erfa/src/$(DEPDIR)/falp03.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@erfa/src/$(DEPDIR)/fama03.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@erfa/src/$(DEPDIR)/fame03.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@erfa/src/$(DEPDIR)/faom03.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@erfa/src/$(DEPDIR)/fapa03.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@erfa/src/$(DEPDIR)/fasa03.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@erfa/src/$(DEPDIR)/faur03.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@erfa/src/$(DEPDIR)/fave03.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@erfa/src/$(DEPDIR)/fk5hip.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@erfa/src/$(DEPDIR)/fk5hz.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@erfa/src/$(DEPDIR)/fw2m.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@erfa/src/$(DEPDIR)/gd2gc.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@erfa/src/$(DEPDIR)/gd2gce.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@erfa/src/$(DEPDIR)/gmst06.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@erfa/src/$(DEPDIR)/gst06.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@erfa/src/$(DEPDIR)/gst06a.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@erfa/src/$(DEPDIR)/hfk5z.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@erfa/src/$(DEPDIR)/ir.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@erfa/src/$(DEPDIR)/jd2cal.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@erfa/src/$(DEPDIR)/nut00a.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@erfa/src/$(DEPDIR)/nut06a.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@erfa/src/$(DEPDIR)/obl06.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@erfa/src/$(DEPDIR)/p06e.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@erfa/src/$(DEPDIR)/pap.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@erfa/src/$(DEPDIR)/pas.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@erfa/src/$(DEPDIR)/pdp.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@erfa/src/$(DEPDIR)/pfw06.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@erfa/src/$(DEPDIR)/plan94.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@erfa/src/$(DEPDIR)/pm.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@erfa/src/$(DEPDIR)/pmat06.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@erfa/src/$(DEPDIR)/pmp.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@erfa/src/$(DEPDIR)/pn.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@erfa/src/$(DEPDIR)/pnm06a.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@erfa/src/$(DEPDIR)/pv2s.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@erfa/src/$(DEPDIR)/pxp.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@erfa/src/$(DEPDIR)/refco.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@erfa/src/$(DEPDIR)/rm2v.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@erfa/src/$(DEPDIR)/rv2m.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@erfa/src/$(DEPDIR)/rx.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@erfa/src/$(DEPDIR)/rxp.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@erfa/src/$(DEPDIR)/rxpv.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@erfa/src/$(DEPDIR)/rxr.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@erfa/src/$(DEPDIR)/ry.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@erfa/src/$(DEPDIR)/rz.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@erfa/src/$(DEPDIR)/s06.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@erfa/src/$(DEPDIR)/s2c.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@erfa/src/$(DEPDIR)/sepp.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@erfa/src/$(DEPDIR)/seps.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@erfa/src/$(DEPDIR)/sxp.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@erfa/src/$(DEPDIR)/tf2a.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@erfa/src/$(DEPDIR)/tf2d.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@erfa/src/$(DEPDIR)/tr.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@erfa/src/$(DEPDIR)/trxp.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@erfa/src/$(DEPDIR)/zp.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@gui/$(DEPDIR)/BasicGlCamera.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@gui/$(DEPDIR)/BasicGlCamera.moc.Po@am__quote@
@@ -2995,111 +2810,10 @@
 @AMDEP_TRUE@@am__include@ @am__quote@pal/$(DEPDIR)/palRefro.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@pal/$(DEPDIR)/palRefz.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@slalib/$(DEPDIR)/aoppa.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@slalib/$(DEPDIR)/aoppat.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@slalib/$(DEPDIR)/aopqk.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@slalib/$(DEPDIR)/dat.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@slalib/$(DEPDIR)/dcc2s.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@slalib/$(DEPDIR)/dcs2c.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@slalib/$(DEPDIR)/deuler.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@slalib/$(DEPDIR)/dmxm.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@slalib/$(DEPDIR)/dmxv.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@slalib/$(DEPDIR)/drange.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@slalib/$(DEPDIR)/dranrm.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@slalib/$(DEPDIR)/dtt.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@slalib/$(DEPDIR)/dvdv.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@slalib/$(DEPDIR)/dvn.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@slalib/$(DEPDIR)/epj.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@slalib/$(DEPDIR)/eqeqx.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@slalib/$(DEPDIR)/evp.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@slalib/$(DEPDIR)/geoc.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@slalib/$(DEPDIR)/gmst.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@slalib/$(DEPDIR)/mappa.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@slalib/$(DEPDIR)/mapqkz.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@slalib/$(DEPDIR)/nut.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@slalib/$(DEPDIR)/nutc.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@slalib/$(DEPDIR)/prec.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@slalib/$(DEPDIR)/prenut.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@slalib/$(DEPDIR)/refco.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@slalib/$(DEPDIR)/refro.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@slalib/$(DEPDIR)/refz.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/a2af.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/a2tf.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/af2a.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/anp.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/anpm.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/bpn2xy.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/c2s.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/cal2jd.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/cp.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/cr.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/d2tf.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/dat.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/ee06a.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/eform.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/eors.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/epb.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/epb2jd.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/epj.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/epj2jd.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/epv00.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/era00.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/fad03.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/fae03.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/faf03.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/faju03.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/fal03.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/falp03.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/fama03.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/fame03.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/faom03.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/fapa03.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/fasa03.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/faur03.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/fave03.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/fk5hip.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/fk5hz.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/fw2m.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/gd2gc.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/gd2gce.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/gmst06.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/gst06.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/gst06a.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/hfk5z.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/ir.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/jd2cal.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/nut00a.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/nut06a.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/obl06.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/p06e.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/pap.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/pas.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/pdp.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/pfw06.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/plan94.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/pm.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/pmat06.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/pmp.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/pn.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/pnm06a.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/pv2s.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/pxp.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/rm2v.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/rv2m.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/rx.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/rxp.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/rxpv.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/rxr.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/ry.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/rz.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/s06.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/s2c.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/sepp.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/seps.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/sxp.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/tf2a.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/tf2d.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/tr.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/trxp.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/zp.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/Configuration.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/Connection.Plo@am__quote@
@@ -3150,11 +2864,12 @@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/argv.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/biasctrl.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/ccdctrl.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/chatclient.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/chatserv.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/cosyctrl.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/datalogger.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/dclient5.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/dimctrl.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/dns.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/drivectrl.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/dserver2.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/evtserver.Po@am__quote@
@@ -3190,12 +2905,6 @@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/showlog.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/skypeclient.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/slalib-test.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/smartfact.Po@am__quote@
-<<<<<<< .mine
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/spsctrl.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/sqmctrl.Po@am__quote@
-=======
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/sqmctrl.Po@am__quote@
->>>>>>> .r18350
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/temperature.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/test.Po@am__quote@
@@ -3528,6 +3237,6 @@
 	-rm -rf .libs _libs
 	-rm -rf dim/src/.libs dim/src/_libs
+	-rm -rf erfa/src/.libs erfa/src/_libs
 	-rm -rf pal/.libs pal/_libs
-	-rm -rf slalib/.libs slalib/_libs
 	-rm -rf sofa/src/.libs sofa/src/_libs
 	-rm -rf src/.libs src/_libs
@@ -3876,4 +3585,6 @@
 	-rm -f dim/src/webDid/$(DEPDIR)/$(am__dirstamp)
 	-rm -f dim/src/webDid/$(am__dirstamp)
+	-rm -f erfa/src/$(DEPDIR)/$(am__dirstamp)
+	-rm -f erfa/src/$(am__dirstamp)
 	-rm -f gui/$(DEPDIR)/$(am__dirstamp)
 	-rm -f gui/$(am__dirstamp)
@@ -3882,6 +3593,4 @@
 	-rm -f pal/$(DEPDIR)/$(am__dirstamp)
 	-rm -f pal/$(am__dirstamp)
-	-rm -f slalib/$(DEPDIR)/$(am__dirstamp)
-	-rm -f slalib/$(am__dirstamp)
 	-rm -f sofa/src/$(DEPDIR)/$(am__dirstamp)
 	-rm -f sofa/src/$(am__dirstamp)
@@ -3900,5 +3609,5 @@
 distclean: distclean-am
 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -rf ./$(DEPDIR) dim/src/$(DEPDIR) dim/src/did/$(DEPDIR) dim/src/webDid/$(DEPDIR) gui/$(DEPDIR) gui/RawEventsViewer/$(DEPDIR) pal/$(DEPDIR) slalib/$(DEPDIR) sofa/src/$(DEPDIR) src/$(DEPDIR)
+	-rm -rf ./$(DEPDIR) dim/src/$(DEPDIR) dim/src/did/$(DEPDIR) dim/src/webDid/$(DEPDIR) erfa/src/$(DEPDIR) gui/$(DEPDIR) gui/RawEventsViewer/$(DEPDIR) pal/$(DEPDIR) sofa/src/$(DEPDIR) src/$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
@@ -3949,5 +3658,5 @@
 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
 	-rm -rf $(top_srcdir)/autom4te.cache
-	-rm -rf ./$(DEPDIR) dim/src/$(DEPDIR) dim/src/did/$(DEPDIR) dim/src/webDid/$(DEPDIR) gui/$(DEPDIR) gui/RawEventsViewer/$(DEPDIR) pal/$(DEPDIR) slalib/$(DEPDIR) sofa/src/$(DEPDIR) src/$(DEPDIR)
+	-rm -rf ./$(DEPDIR) dim/src/$(DEPDIR) dim/src/did/$(DEPDIR) dim/src/webDid/$(DEPDIR) erfa/src/$(DEPDIR) gui/$(DEPDIR) gui/RawEventsViewer/$(DEPDIR) pal/$(DEPDIR) sofa/src/$(DEPDIR) src/$(DEPDIR)
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
