Index: trunk/FACT++/Makefile.in =================================================================== --- trunk/FACT++/Makefile.in (revision 18353) +++ trunk/FACT++/Makefile.in (revision 18354) @@ -51,7 +51,18 @@ fadctrl$(EXEEXT) fscctrl$(EXEEXT) gcn$(EXEEXT) \ chatclient$(EXEEXT) chatserv$(EXEEXT) biasctrl$(EXEEXT) \ - drivectrl$(EXEEXT) agilentctrl$(EXEEXT) mcp$(EXEEXT) \ - feedback$(EXEEXT) ratescan$(EXEEXT) ratecontrol$(EXEEXT) \ - tngweather$(EXEEXT) lidctrl$(EXEEXT) gpsctrl$(EXEEXT) \ + spsctrl$(EXEEXT) ccdctrl$(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) \ @@ -62,4 +73,5 @@ $(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 @@ -167,4 +179,50 @@ am_libDimExtension_la_OBJECTS = src/DimSetup.lo libDimExtension_la_OBJECTS = $(am_libDimExtension_la_OBJECTS) +libPal_la_LIBADD = +am_libPal_la_OBJECTS = pal/palDtt.lo pal/palDat.lo pal/palMappa.lo \ + pal/palPrenut.lo pal/palEvp.lo pal/palAoppa.lo \ + pal/palAoppat.lo pal/palRefco.lo pal/palRefro.lo \ + pal/pal1Atmt.lo pal/palDrange.lo pal/palOne2One.lo \ + pal/pal1Atms.lo pal/palMapqkz.lo pal/palAopqk.lo \ + 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 +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 \ @@ -213,4 +271,8 @@ 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) @@ -257,9 +319,4 @@ dns_OBJECTS = $(am_dns_OBJECTS) dns_DEPENDENCIES = libDim.la libDimExtension.la -am_drivectrl_OBJECTS = src/drivectrl.$(OBJEXT) \ - src/HeadersFTM.$(OBJEXT) -drivectrl_OBJECTS = $(am_drivectrl_OBJECTS) -drivectrl_DEPENDENCIES = libDim++.la libDim.la libDimExtension.la \ - libStateMachine.la libTools.la libTime.la libConfiguration.la am_dserver2_OBJECTS = src/dserver2.$(OBJEXT) dserver2_OBJECTS = $(am_dserver2_OBJECTS) @@ -337,7 +394,13 @@ 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) @@ -436,12 +499,27 @@ 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) @@ -548,6 +626,27 @@ 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) \ @@ -567,4 +666,5 @@ sched.c $(scheduler_SOURCES) $(showlog_SOURCES) \ $(skypeclient_SOURCES) $(smartfact_SOURCES) $(sqmctrl_SOURCES) \ +>>>>>>> .r18350 $(temperature_SOURCES) $(test_SOURCES) $(time_SOURCES) \ $(timecheck_SOURCES) $(tngweather_SOURCES) \ @@ -573,6 +673,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) \ @@ -581,6 +690,20 @@ $(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) \ @@ -593,4 +716,5 @@ sched.c $(scheduler_SOURCES) $(showlog_SOURCES) \ $(skypeclient_SOURCES) $(smartfact_SOURCES) $(sqmctrl_SOURCES) \ +>>>>>>> .r18350 $(temperature_SOURCES) $(test_SOURCES) $(time_SOURCES) \ $(timecheck_SOURCES) $(tngweather_SOURCES) \ @@ -860,5 +984,6 @@ DIM_FLAGS = -DMIPSEL -DPROTOCOL=1 -Dunix -Dlinux BOOST_FLAGS = -DBOOST_DISABLE_ASSERTS -AM_CPPFLAGS = -Idim/dim $(DIM_FLAGS) $(BOOST_FLAGS) $(ROOTCPPFLAGS) \ +AM_CFLAGS = -pedantic +AM_CPPFLAGS = -Idim/dim -Ipal -Isofa/src $(DIM_FLAGS) $(BOOST_FLAGS) $(ROOTCPPFLAGS) \ -Wall -Winit-self -Wpointer-arith -Wcast-align -Wextra -Wformat=2 \ $(SVN_REVISION) @@ -872,5 +997,6 @@ lib_LTLIBRARIES = \ libDim++.la libDim.la libDimExtension.la \ - libConfiguration.la libStateMachine.la libTime.la libTools.la + libConfiguration.la libStateMachine.la libTime.la libTools.la \ + libSlalib.la libPal.la # libAstro.la @@ -892,4 +1018,6 @@ @HAS_HELP2MAN_TRUE@ gpsctrl.man \ @HAS_HELP2MAN_TRUE@ lidctrl.man \ +@HAS_HELP2MAN_TRUE@ pfminictrl.man \ +@HAS_HELP2MAN_TRUE@ sqmctrl.man \ @HAS_HELP2MAN_TRUE@ magiclidar.man \ @HAS_HELP2MAN_TRUE@ magicweather.man \ @@ -901,5 +1029,10 @@ @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 \ @@ -1027,6 +1160,100 @@ #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 \ + pal/palPrenut.c pal/palEvp.c pal/palAoppa.c \ + pal/palAoppat.c pal/palRefco.c pal/palRefro.c \ + pal/pal1Atmt.c pal/palDrange.c pal/palOne2One.c \ + pal/pal1Atms.c pal/palMapqkz.c pal/palAopqk.c \ + pal/palRefz.c pal/palAmpqk.c pal/palRdplan.c \ + pal/palDt.c pal/palPvobs.c pal/palNut.c \ + 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 + 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 @@ -1063,4 +1290,14 @@ 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 + agilentctrl_SOURCES = src/agilentctrl.cc src/LocalControl.h src/HeadersAgilent.h agilentctrl_LDADD = libDim++.la libDim.la libDimExtension.la \ @@ -1093,4 +1330,5 @@ libConfiguration.la +<<<<<<< .mine pfminictrl_SOURCES = src/pfminictrl.cc src/LocalControl.h pfminictrl_LDADD = libDim++.la libDim.la libDimExtension.la \ @@ -1100,7 +1338,19 @@ 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 \ @@ -1150,4 +1400,9 @@ 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 @@ -1426,4 +1681,259 @@ libDimExtension.la: $(libDimExtension_la_OBJECTS) $(libDimExtension_la_DEPENDENCIES) $(EXTRA_libDimExtension_la_DEPENDENCIES) $(AM_V_CXXLD)$(CXXLINK) -rpath $(libdir) $(libDimExtension_la_OBJECTS) $(libDimExtension_la_LIBADD) $(LIBS) +pal/$(am__dirstamp): + @$(MKDIR_P) pal + @: > pal/$(am__dirstamp) +pal/$(DEPDIR)/$(am__dirstamp): + @$(MKDIR_P) pal/$(DEPDIR) + @: > pal/$(DEPDIR)/$(am__dirstamp) +pal/palDtt.lo: pal/$(am__dirstamp) pal/$(DEPDIR)/$(am__dirstamp) +pal/palDat.lo: pal/$(am__dirstamp) pal/$(DEPDIR)/$(am__dirstamp) +pal/palMappa.lo: pal/$(am__dirstamp) pal/$(DEPDIR)/$(am__dirstamp) +pal/palPrenut.lo: pal/$(am__dirstamp) pal/$(DEPDIR)/$(am__dirstamp) +pal/palEvp.lo: pal/$(am__dirstamp) pal/$(DEPDIR)/$(am__dirstamp) +pal/palAoppa.lo: pal/$(am__dirstamp) pal/$(DEPDIR)/$(am__dirstamp) +pal/palAoppat.lo: pal/$(am__dirstamp) pal/$(DEPDIR)/$(am__dirstamp) +pal/palRefco.lo: pal/$(am__dirstamp) pal/$(DEPDIR)/$(am__dirstamp) +pal/palRefro.lo: pal/$(am__dirstamp) pal/$(DEPDIR)/$(am__dirstamp) +pal/pal1Atmt.lo: pal/$(am__dirstamp) pal/$(DEPDIR)/$(am__dirstamp) +pal/palDrange.lo: pal/$(am__dirstamp) pal/$(DEPDIR)/$(am__dirstamp) +pal/palOne2One.lo: pal/$(am__dirstamp) pal/$(DEPDIR)/$(am__dirstamp) +pal/pal1Atms.lo: pal/$(am__dirstamp) pal/$(DEPDIR)/$(am__dirstamp) +pal/palMapqkz.lo: pal/$(am__dirstamp) pal/$(DEPDIR)/$(am__dirstamp) +pal/palAopqk.lo: pal/$(am__dirstamp) pal/$(DEPDIR)/$(am__dirstamp) +pal/palRefz.lo: pal/$(am__dirstamp) pal/$(DEPDIR)/$(am__dirstamp) +pal/palAmpqk.lo: pal/$(am__dirstamp) pal/$(DEPDIR)/$(am__dirstamp) +pal/palRdplan.lo: pal/$(am__dirstamp) pal/$(DEPDIR)/$(am__dirstamp) +pal/palDt.lo: pal/$(am__dirstamp) pal/$(DEPDIR)/$(am__dirstamp) +pal/palPvobs.lo: pal/$(am__dirstamp) pal/$(DEPDIR)/$(am__dirstamp) +pal/palNut.lo: pal/$(am__dirstamp) pal/$(DEPDIR)/$(am__dirstamp) +pal/palDmoon.lo: pal/$(am__dirstamp) pal/$(DEPDIR)/$(am__dirstamp) +pal/palPlanet.lo: pal/$(am__dirstamp) pal/$(DEPDIR)/$(am__dirstamp) +pal/palNutc.lo: pal/$(am__dirstamp) pal/$(DEPDIR)/$(am__dirstamp) +pal/palDeuler.lo: pal/$(am__dirstamp) pal/$(DEPDIR)/$(am__dirstamp) +sofa/src/$(am__dirstamp): + @$(MKDIR_P) sofa/src + @: > sofa/src/$(am__dirstamp) +sofa/src/$(DEPDIR)/$(am__dirstamp): + @$(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/$(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/$(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/$(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) @@ -1547,4 +2057,9 @@ @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) @@ -1603,11 +2118,4 @@ @rm -f dns$(EXEEXT) $(AM_V_CCLD)$(LINK) $(dns_OBJECTS) $(dns_LDADD) $(LIBS) -src/drivectrl.$(OBJEXT): src/$(am__dirstamp) \ - src/$(DEPDIR)/$(am__dirstamp) -src/HeadersFTM.$(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) @@ -1651,4 +2159,6 @@ 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) @@ -1700,4 +2210,9 @@ @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) @@ -1705,4 +2220,5 @@ @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) @@ -1824,4 +2340,9 @@ @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) @@ -1829,4 +2350,10 @@ @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) @@ -1834,4 +2361,11 @@ @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) @@ -1982,4 +2516,268 @@ -rm -f gui/viewer-QCameraWidget.$(OBJEXT) -rm -f gui/viewer-QCameraWidget.moc.$(OBJEXT) + -rm -f pal/pal1Atms.$(OBJEXT) + -rm -f pal/pal1Atms.lo + -rm -f pal/pal1Atmt.$(OBJEXT) + -rm -f pal/pal1Atmt.lo + -rm -f pal/palAmpqk.$(OBJEXT) + -rm -f pal/palAmpqk.lo + -rm -f pal/palAoppa.$(OBJEXT) + -rm -f pal/palAoppa.lo + -rm -f pal/palAoppat.$(OBJEXT) + -rm -f pal/palAoppat.lo + -rm -f pal/palAopqk.$(OBJEXT) + -rm -f pal/palAopqk.lo + -rm -f pal/palDat.$(OBJEXT) + -rm -f pal/palDat.lo + -rm -f pal/palDeuler.$(OBJEXT) + -rm -f pal/palDeuler.lo + -rm -f pal/palDmoon.$(OBJEXT) + -rm -f pal/palDmoon.lo + -rm -f pal/palDrange.$(OBJEXT) + -rm -f pal/palDrange.lo + -rm -f pal/palDt.$(OBJEXT) + -rm -f pal/palDt.lo + -rm -f pal/palDtt.$(OBJEXT) + -rm -f pal/palDtt.lo + -rm -f pal/palEvp.$(OBJEXT) + -rm -f pal/palEvp.lo + -rm -f pal/palMappa.$(OBJEXT) + -rm -f pal/palMappa.lo + -rm -f pal/palMapqkz.$(OBJEXT) + -rm -f pal/palMapqkz.lo + -rm -f pal/palNut.$(OBJEXT) + -rm -f pal/palNut.lo + -rm -f pal/palNutc.$(OBJEXT) + -rm -f pal/palNutc.lo + -rm -f pal/palOne2One.$(OBJEXT) + -rm -f pal/palOne2One.lo + -rm -f pal/palPlanet.$(OBJEXT) + -rm -f pal/palPlanet.lo + -rm -f pal/palPrenut.$(OBJEXT) + -rm -f pal/palPrenut.lo + -rm -f pal/palPvobs.$(OBJEXT) + -rm -f pal/palPvobs.lo + -rm -f pal/palRdplan.$(OBJEXT) + -rm -f pal/palRdplan.lo + -rm -f pal/palRefco.$(OBJEXT) + -rm -f pal/palRefco.lo + -rm -f pal/palRefro.$(OBJEXT) + -rm -f pal/palRefro.lo + -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 @@ -2059,4 +2857,5 @@ -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) @@ -2065,5 +2864,4 @@ -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) @@ -2099,6 +2897,12 @@ -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) @@ -2121,4 +2925,5 @@ @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@ @@ -2165,4 +2970,136 @@ @AMDEP_TRUE@@am__include@ @am__quote@gui/RawEventsViewer/$(DEPDIR)/viewer-RawEventsViewer.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@gui/RawEventsViewer/$(DEPDIR)/viewer-RawEventsViewer.moc.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@pal/$(DEPDIR)/pal1Atms.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@pal/$(DEPDIR)/pal1Atmt.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@pal/$(DEPDIR)/palAmpqk.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@pal/$(DEPDIR)/palAoppa.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@pal/$(DEPDIR)/palAoppat.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@pal/$(DEPDIR)/palAopqk.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@pal/$(DEPDIR)/palDat.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@pal/$(DEPDIR)/palDeuler.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@pal/$(DEPDIR)/palDmoon.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@pal/$(DEPDIR)/palDrange.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@pal/$(DEPDIR)/palDt.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@pal/$(DEPDIR)/palDtt.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@pal/$(DEPDIR)/palEvp.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@pal/$(DEPDIR)/palMappa.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@pal/$(DEPDIR)/palMapqkz.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@pal/$(DEPDIR)/palNut.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@pal/$(DEPDIR)/palNutc.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@pal/$(DEPDIR)/palOne2One.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@pal/$(DEPDIR)/palPlanet.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@pal/$(DEPDIR)/palPrenut.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@pal/$(DEPDIR)/palPvobs.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@pal/$(DEPDIR)/palRdplan.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@pal/$(DEPDIR)/palRefco.Plo@am__quote@ +@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@ @@ -2213,4 +3150,5 @@ @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@ @@ -2219,5 +3157,4 @@ @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@ @@ -2253,6 +3190,12 @@ @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@ @@ -2585,4 +3528,7 @@ -rm -rf .libs _libs -rm -rf dim/src/.libs dim/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 @@ -2934,4 +3880,10 @@ -rm -f gui/RawEventsViewer/$(DEPDIR)/$(am__dirstamp) -rm -f gui/RawEventsViewer/$(am__dirstamp) + -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) -rm -f src/$(DEPDIR)/$(am__dirstamp) -rm -f src/$(am__dirstamp) @@ -2948,5 +3900,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) src/$(DEPDIR) + -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 -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ @@ -2997,5 +3949,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) src/$(DEPDIR) + -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 -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic