Changeset 18354 for trunk/FACT++


Ignore:
Timestamp:
11/07/15 17:30:37 (9 years ago)
Author:
tbretz
Message:
Updated with latest changed from Makefile.am
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/FACT++/Makefile.in

    r18190 r18354  
    5151        fadctrl$(EXEEXT) fscctrl$(EXEEXT) gcn$(EXEEXT) \
    5252        chatclient$(EXEEXT) chatserv$(EXEEXT) biasctrl$(EXEEXT) \
    53         drivectrl$(EXEEXT) agilentctrl$(EXEEXT) mcp$(EXEEXT) \
    54         feedback$(EXEEXT) ratescan$(EXEEXT) ratecontrol$(EXEEXT) \
    55         tngweather$(EXEEXT) lidctrl$(EXEEXT) gpsctrl$(EXEEXT) \
     53        spsctrl$(EXEEXT) ccdctrl$(EXEEXT) agilentctrl$(EXEEXT) \
     54        mcp$(EXEEXT) feedback$(EXEEXT) ratescan$(EXEEXT) \
     55        ratecontrol$(EXEEXT) tngweather$(EXEEXT) lidctrl$(EXEEXT) \
     56        gpsctrl$(EXEEXT) pfminictrl$(EXEEXT) sqmctrl$(EXEEXT) \
     57<<<<<<< .mine
     58        pwrctrl$(EXEEXT) magicweather$(EXEEXT) magiclidar$(EXEEXT) \
     59        smartfact$(EXEEXT) evtserver$(EXEEXT) getevent$(EXEEXT) \
     60        temperature$(EXEEXT) timecheck$(EXEEXT) showlog$(EXEEXT) \
     61        fitsdump$(EXEEXT) fitsselect$(EXEEXT) fitscheck$(EXEEXT) \
     62        zfits$(EXEEXT) slalib-test$(EXEEXT) $(am__EXEEXT_1) \
     63        $(am__EXEEXT_2) $(am__EXEEXT_3) $(am__EXEEXT_4) \
     64        $(am__EXEEXT_5) $(am__EXEEXT_6) $(am__EXEEXT_7) \
     65        $(am__EXEEXT_8)
     66=======
    5667        pfminictrl$(EXEEXT) sqmctrl$(EXEEXT) pwrctrl$(EXEEXT) \
    5768        magicweather$(EXEEXT) magiclidar$(EXEEXT) smartfact$(EXEEXT) \
     
    6273        $(am__EXEEXT_4) $(am__EXEEXT_5) $(am__EXEEXT_6) \
    6374        $(am__EXEEXT_7) $(am__EXEEXT_8)
     75>>>>>>> .r18350
    6476@HAS_GUI_TRUE@am__append_1 = fact
    6577@HAS_DBUS_TRUE@am__append_2 = skypeclient
     
    167179am_libDimExtension_la_OBJECTS = src/DimSetup.lo
    168180libDimExtension_la_OBJECTS = $(am_libDimExtension_la_OBJECTS)
     181libPal_la_LIBADD =
     182am_libPal_la_OBJECTS = pal/palDtt.lo pal/palDat.lo pal/palMappa.lo \
     183        pal/palPrenut.lo pal/palEvp.lo pal/palAoppa.lo \
     184        pal/palAoppat.lo pal/palRefco.lo pal/palRefro.lo \
     185        pal/pal1Atmt.lo pal/palDrange.lo pal/palOne2One.lo \
     186        pal/pal1Atms.lo pal/palMapqkz.lo pal/palAopqk.lo \
     187        pal/palRefz.lo pal/palAmpqk.lo pal/palRdplan.lo pal/palDt.lo \
     188        pal/palPvobs.lo pal/palNut.lo pal/palDmoon.lo pal/palPlanet.lo \
     189        pal/palNutc.lo pal/palDeuler.lo sofa/src/dat.lo \
     190        sofa/src/cal2jd.lo sofa/src/jd2cal.lo sofa/src/epj.lo \
     191        sofa/src/pn.lo sofa/src/rxpv.lo sofa/src/rz.lo sofa/src/zp.lo \
     192        sofa/src/pnm06a.lo sofa/src/ir.lo sofa/src/pmat06.lo \
     193        sofa/src/pm.lo sofa/src/sxp.lo sofa/src/epv00.lo \
     194        sofa/src/rxr.lo sofa/src/rx.lo sofa/src/p06e.lo \
     195        sofa/src/epj2jd.lo sofa/src/obl06.lo sofa/src/cr.lo \
     196        sofa/src/fw2m.lo sofa/src/nut06a.lo sofa/src/rxp.lo \
     197        sofa/src/pfw06.lo sofa/src/nut00a.lo sofa/src/cp.lo \
     198        sofa/src/faur03.lo sofa/src/fapa03.lo sofa/src/fave03.lo \
     199        sofa/src/fal03.lo sofa/src/fasa03.lo sofa/src/fame03.lo \
     200        sofa/src/faf03.lo sofa/src/faom03.lo sofa/src/faju03.lo \
     201        sofa/src/fae03.lo sofa/src/fama03.lo sofa/src/a2af.lo \
     202        sofa/src/c2s.lo sofa/src/epb.lo sofa/src/ee06a.lo \
     203        sofa/src/anp.lo sofa/src/pap.lo sofa/src/af2a.lo \
     204        sofa/src/s2c.lo sofa/src/tf2d.lo sofa/src/rv2m.lo \
     205        sofa/src/rm2v.lo sofa/src/pdp.lo sofa/src/anpm.lo \
     206        sofa/src/d2tf.lo sofa/src/sepp.lo sofa/src/fk5hz.lo \
     207        sofa/src/trxp.lo sofa/src/pxp.lo sofa/src/tf2a.lo \
     208        sofa/src/gmst06.lo sofa/src/hfk5z.lo sofa/src/epb2jd.lo \
     209        sofa/src/seps.lo sofa/src/a2tf.lo sofa/src/pmp.lo \
     210        sofa/src/pv2s.lo sofa/src/pas.lo sofa/src/tr.lo \
     211        sofa/src/fk5hip.lo sofa/src/era00.lo sofa/src/gst06a.lo \
     212        sofa/src/gst06.lo sofa/src/bpn2xy.lo sofa/src/eors.lo \
     213        sofa/src/s06.lo sofa/src/falp03.lo sofa/src/fad03.lo \
     214        sofa/src/gd2gc.lo sofa/src/plan94.lo sofa/src/gd2gce.lo \
     215        sofa/src/eform.lo sofa/src/ry.lo
     216libPal_la_OBJECTS = $(am_libPal_la_OBJECTS)
     217libSlalib_la_LIBADD =
     218am_libSlalib_la_OBJECTS = slalib/aopqk.lo slalib/mappa.lo \
     219        slalib/aoppa.lo slalib/dtt.lo slalib/mapqkz.lo slalib/refco.lo \
     220        slalib/refro.lo slalib/epj.lo slalib/geoc.lo slalib/dranrm.lo \
     221        slalib/refz.lo slalib/dvn.lo slalib/dcc2s.lo slalib/aoppat.lo \
     222        slalib/dcs2c.lo slalib/evp.lo slalib/eqeqx.lo slalib/dat.lo \
     223        slalib/prenut.lo slalib/gmst.lo slalib/prec.lo slalib/dmxm.lo \
     224        slalib/nutc.lo slalib/nut.lo slalib/drange.lo slalib/dvdv.lo \
     225        slalib/dmxv.lo slalib/deuler.lo
     226libSlalib_la_OBJECTS = $(am_libSlalib_la_OBJECTS)
    169227libStateMachine_la_LIBADD =
    170228am_libStateMachine_la_OBJECTS = src/WindowLog.lo src/Readline.lo \
     
    213271biasctrl_DEPENDENCIES = libDim++.la libDim.la libDimExtension.la \
    214272        libStateMachine.la libTools.la libTime.la libConfiguration.la
     273am_ccdctrl_OBJECTS = src/ccdctrl.$(OBJEXT)
     274ccdctrl_OBJECTS = $(am_ccdctrl_OBJECTS)
     275ccdctrl_DEPENDENCIES = libDim++.la libDim.la libDimExtension.la \
     276        libStateMachine.la libTools.la libTime.la libConfiguration.la
    215277am_chatclient_OBJECTS = src/chatclient.$(OBJEXT)
    216278chatclient_OBJECTS = $(am_chatclient_OBJECTS)
     
    257319dns_OBJECTS = $(am_dns_OBJECTS)
    258320dns_DEPENDENCIES = libDim.la libDimExtension.la
    259 am_drivectrl_OBJECTS = src/drivectrl.$(OBJEXT) \
    260         src/HeadersFTM.$(OBJEXT)
    261 drivectrl_OBJECTS = $(am_drivectrl_OBJECTS)
    262 drivectrl_DEPENDENCIES = libDim++.la libDim.la libDimExtension.la \
    263         libStateMachine.la libTools.la libTime.la libConfiguration.la
    264321am_dserver2_OBJECTS = src/dserver2.$(OBJEXT)
    265322dserver2_OBJECTS = $(am_dserver2_OBJECTS)
     
    337394fitsloader_DEPENDENCIES = libStateMachine.la libTools.la libTime.la \
    338395        libDim++.la libDim.la libConfiguration.la
     396<<<<<<< .mine
     397fitsselect_SOURCES = fitsselect.c
     398fitsselect_OBJECTS = fitsselect.$(OBJEXT)
     399fitsselect_LDADD = $(LDADD)
     400=======
    339401am_fitsselect_OBJECTS = src/fitsselect.$(OBJEXT)
    340402fitsselect_OBJECTS = $(am_fitsselect_OBJECTS)
    341403fitsselect_DEPENDENCIES = libConfiguration.la
     404>>>>>>> .r18350
    342405am_fsc_OBJECTS = src/fsc.$(OBJEXT)
    343406fsc_OBJECTS = $(am_fsc_OBJECTS)
     
    436499skypeclient_DEPENDENCIES = libStateMachine.la libTools.la libTime.la \
    437500        libDim++.la libDim.la libDimExtension.la libConfiguration.la
     501am_slalib_test_OBJECTS = src/slalib-test.$(OBJEXT)
     502slalib_test_OBJECTS = $(am_slalib_test_OBJECTS)
     503slalib_test_DEPENDENCIES = libSlalib.la libTime.la
    438504am_smartfact_OBJECTS = src/smartfact.$(OBJEXT) src/PixelMap.$(OBJEXT)
    439505smartfact_OBJECTS = $(am_smartfact_OBJECTS)
    440506smartfact_DEPENDENCIES = libDim++.la libDim.la libDimExtension.la \
    441507        libStateMachine.la libTools.la libTime.la libConfiguration.la
     508<<<<<<< .mine
     509am_spsctrl_OBJECTS = src/spsctrl.$(OBJEXT)
     510spsctrl_OBJECTS = $(am_spsctrl_OBJECTS)
     511spsctrl_DEPENDENCIES = libPal.la libDim++.la libDim.la \
     512        libDimExtension.la libStateMachine.la libTools.la libTime.la \
     513        libConfiguration.la
    442514am_sqmctrl_OBJECTS = src/sqmctrl.$(OBJEXT)
    443515sqmctrl_OBJECTS = $(am_sqmctrl_OBJECTS)
    444516sqmctrl_DEPENDENCIES = libDim++.la libDim.la libDimExtension.la \
    445517        libStateMachine.la libTools.la libTime.la libConfiguration.la
     518=======
     519am_sqmctrl_OBJECTS = src/sqmctrl.$(OBJEXT)
     520sqmctrl_OBJECTS = $(am_sqmctrl_OBJECTS)
     521sqmctrl_DEPENDENCIES = libDim++.la libDim.la libDimExtension.la \
     522        libStateMachine.la libTools.la libTime.la libConfiguration.la
     523>>>>>>> .r18350
    446524am_temperature_OBJECTS = src/temperature.$(OBJEXT)
    447525temperature_OBJECTS = $(am_temperature_OBJECTS)
     
    548626SOURCES = $(libConfiguration_la_SOURCES) $(libDim___la_SOURCES) \
    549627        $(libDim_la_SOURCES) $(libDimExtension_la_SOURCES) \
     628        $(libPal_la_SOURCES) $(libSlalib_la_SOURCES) \
    550629        $(libStateMachine_la_SOURCES) $(libTime_la_SOURCES) \
    551630        $(libTools_la_SOURCES) $(agilentctrl_SOURCES) $(argv_SOURCES) \
     631<<<<<<< .mine
     632        astro.c $(biasctrl_SOURCES) $(ccdctrl_SOURCES) \
     633        $(chatclient_SOURCES) $(chatserv_SOURCES) \
     634        $(datalogger_SOURCES) $(dclient5_SOURCES) $(did_SOURCES) \
     635        $(dimctrl_SOURCES) $(dimserver_SOURCES) $(dns_SOURCES) \
     636        $(dserver2_SOURCES) $(evtserver_SOURCES) $(fact_SOURCES) \
     637        $(fad_SOURCES) $(fadctrl_SOURCES) $(feedback_SOURCES) \
     638        $(fitscheck_SOURCES) $(fitsdump_SOURCES) fitsgrep.c \
     639        $(fitsloader_SOURCES) fitsselect.c $(fsc_SOURCES) \
     640        $(fscctrl_SOURCES) $(ftm_SOURCES) $(ftmctrl_SOURCES) \
     641        $(gcn_SOURCES) $(getevent_SOURCES) $(gpsctrl_SOURCES) \
     642        $(lidctrl_SOURCES) $(log_SOURCES) $(logtime_SOURCES) \
     643        $(magiclidar_SOURCES) $(magicweather_SOURCES) \
     644        $(makedata_SOURCES) $(makeplots_SOURCES) $(mcp_SOURCES) \
     645        $(moon_SOURCES) $(pfminictrl_SOURCES) $(pwrctrl_SOURCES) \
     646        $(ratecontrol_SOURCES) $(ratescan_SOURCES) $(readfits_SOURCES) \
     647        sched.c $(scheduler_SOURCES) $(showlog_SOURCES) \
     648        $(skypeclient_SOURCES) $(slalib_test_SOURCES) \
     649        $(smartfact_SOURCES) $(spsctrl_SOURCES) $(sqmctrl_SOURCES) \
     650=======
    552651        astro.c $(biasctrl_SOURCES) $(chatclient_SOURCES) \
    553652        $(chatserv_SOURCES) $(datalogger_SOURCES) $(dclient5_SOURCES) \
     
    567666        sched.c $(scheduler_SOURCES) $(showlog_SOURCES) \
    568667        $(skypeclient_SOURCES) $(smartfact_SOURCES) $(sqmctrl_SOURCES) \
     668>>>>>>> .r18350
    569669        $(temperature_SOURCES) $(test_SOURCES) $(time_SOURCES) \
    570670        $(timecheck_SOURCES) $(tngweather_SOURCES) \
     
    573673DIST_SOURCES = $(libConfiguration_la_SOURCES) $(libDim___la_SOURCES) \
    574674        $(libDim_la_SOURCES) $(libDimExtension_la_SOURCES) \
     675        $(libPal_la_SOURCES) $(libSlalib_la_SOURCES) \
    575676        $(libStateMachine_la_SOURCES) $(libTime_la_SOURCES) \
    576677        $(libTools_la_SOURCES) $(agilentctrl_SOURCES) $(argv_SOURCES) \
     678<<<<<<< .mine
     679        astro.c $(biasctrl_SOURCES) $(ccdctrl_SOURCES) \
     680        $(chatclient_SOURCES) $(chatserv_SOURCES) \
     681        $(am__datalogger_SOURCES_DIST) $(dclient5_SOURCES) \
     682        $(did_SOURCES) $(dimctrl_SOURCES) $(dimserver_SOURCES) \
     683        $(dns_SOURCES) $(dserver2_SOURCES) $(evtserver_SOURCES) \
     684        $(am__fact_SOURCES_DIST) $(fad_SOURCES) \
     685=======
    577686        astro.c $(biasctrl_SOURCES) $(chatclient_SOURCES) \
    578687        $(chatserv_SOURCES) $(am__datalogger_SOURCES_DIST) \
     
    581690        $(dserver2_SOURCES) $(evtserver_SOURCES) \
    582691        $(am__fact_SOURCES_DIST) $(fad_SOURCES) \
     692>>>>>>> .r18350
    583693        $(am__fadctrl_SOURCES_DIST) $(feedback_SOURCES) \
    584694        $(fitscheck_SOURCES) $(fitsdump_SOURCES) fitsgrep.c \
     695<<<<<<< .mine
     696        $(fitsloader_SOURCES) fitsselect.c $(fsc_SOURCES) \
     697        $(fscctrl_SOURCES) $(ftm_SOURCES) $(ftmctrl_SOURCES) \
     698        $(gcn_SOURCES) $(getevent_SOURCES) $(gpsctrl_SOURCES) \
     699        $(lidctrl_SOURCES) $(log_SOURCES) $(logtime_SOURCES) \
     700        $(magiclidar_SOURCES) $(magicweather_SOURCES) \
     701        $(makedata_SOURCES) $(makeplots_SOURCES) $(mcp_SOURCES) \
     702        $(moon_SOURCES) $(pfminictrl_SOURCES) $(pwrctrl_SOURCES) \
     703        $(ratecontrol_SOURCES) $(ratescan_SOURCES) $(readfits_SOURCES) \
     704        sched.c $(scheduler_SOURCES) $(showlog_SOURCES) \
     705        $(skypeclient_SOURCES) $(slalib_test_SOURCES) \
     706        $(smartfact_SOURCES) $(spsctrl_SOURCES) $(sqmctrl_SOURCES) \
     707=======
    585708        $(fitsloader_SOURCES) $(fitsselect_SOURCES) $(fsc_SOURCES) \
    586709        $(fscctrl_SOURCES) $(ftm_SOURCES) $(ftmctrl_SOURCES) \
     
    593716        sched.c $(scheduler_SOURCES) $(showlog_SOURCES) \
    594717        $(skypeclient_SOURCES) $(smartfact_SOURCES) $(sqmctrl_SOURCES) \
     718>>>>>>> .r18350
    595719        $(temperature_SOURCES) $(test_SOURCES) $(time_SOURCES) \
    596720        $(timecheck_SOURCES) $(tngweather_SOURCES) \
     
    860984DIM_FLAGS = -DMIPSEL -DPROTOCOL=1 -Dunix -Dlinux
    861985BOOST_FLAGS = -DBOOST_DISABLE_ASSERTS
    862 AM_CPPFLAGS = -Idim/dim $(DIM_FLAGS) $(BOOST_FLAGS) $(ROOTCPPFLAGS) \
     986AM_CFLAGS = -pedantic
     987AM_CPPFLAGS = -Idim/dim -Ipal -Isofa/src $(DIM_FLAGS) $(BOOST_FLAGS) $(ROOTCPPFLAGS) \
    863988   -Wall -Winit-self -Wpointer-arith -Wcast-align -Wextra -Wformat=2 \
    864989   $(SVN_REVISION)
     
    872997lib_LTLIBRARIES = \
    873998        libDim++.la libDim.la libDimExtension.la \
    874         libConfiguration.la libStateMachine.la libTime.la libTools.la
     999        libConfiguration.la libStateMachine.la libTime.la libTools.la \
     1000        libSlalib.la libPal.la
    8751001
    8761002#       libAstro.la
     
    8921018@HAS_HELP2MAN_TRUE@     gpsctrl.man \
    8931019@HAS_HELP2MAN_TRUE@     lidctrl.man \
     1020@HAS_HELP2MAN_TRUE@     pfminictrl.man \
     1021@HAS_HELP2MAN_TRUE@     sqmctrl.man \
    8941022@HAS_HELP2MAN_TRUE@     magiclidar.man \
    8951023@HAS_HELP2MAN_TRUE@     magicweather.man \
     
    9011029@HAS_HELP2MAN_TRUE@     showlog.man \
    9021030@HAS_HELP2MAN_TRUE@     smartfact.man \
     1031<<<<<<< .mine
     1032@HAS_HELP2MAN_TRUE@     evtserver.man \
     1033@HAS_HELP2MAN_TRUE@     getevent.man \
     1034=======
    9031035@HAS_HELP2MAN_TRUE@     sqmctrl.man \
     1036>>>>>>> .r18350
    9041037@HAS_HELP2MAN_TRUE@     temperature.man \
    9051038@HAS_HELP2MAN_TRUE@     timecheck.man \
     
    10271160#libAstro_la_SOURCES = src/Astro.h src/Astro.cc
    10281161libTools_la_SOURCES = src/tools.h src/tools.cc
     1162libSlalib_la_SOURCES = slalib/slalib.h slalib/slamac.h \
     1163        slalib/aopqk.c  slalib/mappa.c  slalib/aoppa.c  slalib/dtt.c    \
     1164        slalib/mapqkz.c slalib/refco.c  slalib/refro.c  slalib/epj.c    \
     1165        slalib/geoc.c   slalib/dranrm.c slalib/refz.c   slalib/dvn.c    \
     1166        slalib/dcc2s.c  slalib/aoppat.c slalib/dcs2c.c  slalib/evp.c    \
     1167        slalib/eqeqx.c  slalib/dat.c    slalib/prenut.c slalib/gmst.c   \
     1168        slalib/prec.c   slalib/dmxm.c   slalib/nutc.c   slalib/nut.c    \
     1169        slalib/drange.c slalib/dvdv.c   slalib/dmxv.c   slalib/deuler.c
     1170
     1171#       slalib/addet.c  slalib/afin.c   slalib/airmas.c slalib/altaz.c  \
     1172#       slalib/amp.c    slalib/ampqk.c  slalib/aop.c    slalib/aoppa.c  \
     1173#       slalib/aoppat.c slalib/aopqk.c  slalib/atmdsp.c slalib/av2m.c   \
     1174#       slalib/bear.c   slalib/caf2r.c  slalib/caldj.c  slalib/calyd.c  \
     1175#       slalib/cc2s.c   slalib/cc62s.c  slalib/cd2tf.c  slalib/cldj.c   \
     1176#       slalib/clyd.c   slalib/combn.c  slalib/cr2af.c  slalib/cr2tf.c  \
     1177#       slalib/cs2c6.c  slalib/cs2c.c   slalib/ctf2d.c  slalib/ctf2r.c  \
     1178#       slalib/daf2r.c  slalib/dafin.c  slalib/dat.c    slalib/dav2m.c  \
     1179#       slalib/dbear.c  slalib/dbjin.c  slalib/dc62s.c  slalib/dcc2s.c  \
     1180#       slalib/dcmpf.c  slalib/dcs2c.c  slalib/dd2tf.c  slalib/de2h.c   \
     1181#       slalib/deuler.c slalib/dfltin.c slalib/dh2e.c   slalib/dimxv.c  \
     1182#       slalib/djcal.c  slalib/djcl.c   slalib/dm2av.c  slalib/dmat.c   \
     1183#       slalib/dmoon.c  slalib/dmxm.c   slalib/dmxv.c   slalib/dpav.c   \
     1184#       slalib/dr2af.c  slalib/dr2tf.c  slalib/drange.c slalib/dranrm.c \
     1185#       slalib/ds2c6.c  slalib/ds2tp.c  slalib/dsep.c   slalib/dt.c     \
     1186#       slalib/dtf2d.c  slalib/dtf2r.c  slalib/dtp2s.c  slalib/dtp2v.c  \
     1187#       slalib/dtps2c.c slalib/dtpv2c.c slalib/dtt.c    slalib/dv2tp.c  \
     1188#       slalib/dvdv.c   slalib/dvn.c    slalib/dvxv.c   slalib/e2h.c    \
     1189#       slalib/earth.c  slalib/ecleq.c  slalib/ecmat.c  slalib/ecor.c   \
     1190#       slalib/eg50.c   slalib/el2ue.c  slalib/epb2d.c  slalib/epb.c    \
     1191#       slalib/epco.c   slalib/epj2d.c  slalib/epj.c    slalib/eqecl.c  \
     1192#       slalib/eqeqx.c  slalib/eqgal.c  slalib/etrms.c  slalib/euler.c  \
     1193#       slalib/evp.c    slalib/fitxy.c  slalib/fk425.c  slalib/fk45z.c  \
     1194#       slalib/fk524.c  slalib/fk52h.c  slalib/fk54z.c  slalib/fk5hz.c  \
     1195#       slalib/flotin.c slalib/galeq.c  slalib/galsup.c slalib/ge50.c   \
     1196#       slalib/geoc.c   slalib/gmsta.c  slalib/gmst.c   slalib/h2e.c    \
     1197#       slalib/h2fk5.c  slalib/hfk5z.c  slalib/imxv.c   slalib/intin.c  \
     1198#       slalib/invf.c   slalib/kbj.c    slalib/m2av.c   slalib/map.c    \
     1199#       slalib/mappa.c  slalib/mapqk.c  slalib/mapqkz.c slalib/moon.c   \
     1200#       slalib/mxm.c    slalib/mxv.c    slalib/nut.c    slalib/nutc.c   \
     1201#       slalib/oap.c    slalib/oapqk.c  slalib/obs.c    slalib/pa.c     \
     1202#       slalib/pav.c    slalib/pcd.c    slalib/pda2h.c  slalib/pdq2h.c  \
     1203#       slalib/permut.c slalib/pertel.c slalib/pertue.c slalib/planel.c \
     1204#       slalib/planet.c slalib/plante.c slalib/pm.c     slalib/polmo.c  \
     1205#       slalib/prebn.c  slalib/prec.c   slalib/preces.c slalib/precl.c  \
     1206#       slalib/prenut.c slalib/pv2el.c  slalib/pv2ue.c  slalib/pvobs.c  \
     1207#       slalib/pxy.c    slalib/range.c  slalib/ranorm.c slalib/rcc.c    \
     1208#       slalib/rdplan.c slalib/refco.c  slalib/refcoq.c slalib/refro.c  \
     1209#       slalib/refv.c   slalib/refz.c   slalib/rverot.c slalib/rvgalc.c \
     1210#       slalib/rvlg.c   slalib/rvlsrd.c slalib/rvlsrk.c slalib/s2tp.c   \
     1211#       slalib/sep.c    slalib/smat.c   slalib/subet.c  slalib/supgal.c \
     1212#       slalib/svd.c    slalib/svdcov.c slalib/svdsol.c slalib/tp2s.c   \
     1213#       slalib/tp2v.c   slalib/tps2c.c  slalib/tpv2c.c  slalib/ue2el.c  \
     1214#       slalib/ue2pv.c  slalib/unpcd.c  slalib/v2tp.c   slalib/vdv.c    \
     1215#       slalib/vn.c     slalib/vxv.c    slalib/xy2xy.c  slalib/zd.c
     1216libPal_la_SOURCES = pal/pal.h \
     1217        pal/palDtt.c            pal/palDat.c            pal/palMappa.c          \
     1218        pal/palPrenut.c         pal/palEvp.c            pal/palAoppa.c          \
     1219        pal/palAoppat.c         pal/palRefco.c          pal/palRefro.c          \
     1220        pal/pal1Atmt.c          pal/palDrange.c         pal/palOne2One.c        \
     1221        pal/pal1Atms.c          pal/palMapqkz.c         pal/palAopqk.c          \
     1222        pal/palRefz.c           pal/palAmpqk.c          pal/palRdplan.c         \
     1223        pal/palDt.c             pal/palPvobs.c          pal/palNut.c            \
     1224        pal/palDmoon.c          pal/palPlanet.c         pal/palNutc.c           \
     1225        pal/palDeuler.c \
     1226        sofa/src/dat.c          sofa/src/cal2jd.c       sofa/src/jd2cal.c       \
     1227        sofa/src/epj.c          sofa/src/pn.c           sofa/src/rxpv.c         \
     1228        sofa/src/rz.c           sofa/src/zp.c           sofa/src/pnm06a.c       \
     1229        sofa/src/ir.c           sofa/src/pmat06.c       sofa/src/pm.c           \
     1230        sofa/src/sxp.c          sofa/src/epv00.c        sofa/src/rxr.c          \
     1231        sofa/src/rx.c           sofa/src/p06e.c         sofa/src/epj2jd.c       \
     1232        sofa/src/obl06.c        sofa/src/cr.c           sofa/src/fw2m.c         \
     1233        sofa/src/nut06a.c       sofa/src/rxp.c          sofa/src/pfw06.c        \
     1234        sofa/src/nut00a.c       sofa/src/cp.c           sofa/src/faur03.c       \
     1235        sofa/src/fapa03.c       sofa/src/fave03.c       sofa/src/fal03.c        \
     1236        sofa/src/fasa03.c       sofa/src/fame03.c       sofa/src/faf03.c        \
     1237        sofa/src/faom03.c       sofa/src/faju03.c       sofa/src/fae03.c        \
     1238        sofa/src/fama03.c       sofa/src/a2af.c         sofa/src/c2s.c          \
     1239        sofa/src/epb.c          sofa/src/ee06a.c        sofa/src/anp.c          \
     1240        sofa/src/pap.c          sofa/src/af2a.c         sofa/src/s2c.c          \
     1241        sofa/src/tf2d.c         sofa/src/rv2m.c         sofa/src/rm2v.c         \
     1242        sofa/src/pdp.c          sofa/src/anpm.c         sofa/src/d2tf.c         \
     1243        sofa/src/sepp.c         sofa/src/fk5hz.c        sofa/src/trxp.c         \
     1244        sofa/src/pxp.c          sofa/src/tf2a.c         sofa/src/gmst06.c       \
     1245        sofa/src/hfk5z.c        sofa/src/epb2jd.c       sofa/src/seps.c         \
     1246        sofa/src/a2tf.c         sofa/src/pmp.c          sofa/src/pv2s.c         \
     1247        sofa/src/pas.c          sofa/src/tr.c           sofa/src/fk5hip.c       \
     1248        sofa/src/era00.c        sofa/src/gst06a.c       sofa/src/gst06.c        \
     1249        sofa/src/bpn2xy.c       sofa/src/eors.c         sofa/src/s06.c          \
     1250        sofa/src/falp03.c       sofa/src/fad03.c        sofa/src/gd2gc.c        \
     1251        sofa/src/plan94.c       sofa/src/gd2gce.c       sofa/src/eform.c        \
     1252        sofa/src/ry.c
     1253
    10291254dserver2_SOURCES = src/dserver2.cc
    10301255dserver2_LDADD = libTime.la libTools.la
     1256slalib_test_SOURCES = src/slalib-test.cc
     1257slalib_test_LDADD = libSlalib.la libTime.la
    10311258ftm_SOURCES = src/ftm.cc src/HeadersFTM.cc
    10321259ftm_LDADD = libTime.la libTools.la libDim++.la libDim.la libConfiguration.la libDimExtension.la
     
    10631290        libConfiguration.la
    10641291
     1292spsctrl_SOURCES = src/spsctrl.cc src/LocalControl.h src/HeadersDrive.h
     1293spsctrl_LDADD = libPal.la libDim++.la libDim.la libDimExtension.la \
     1294        libStateMachine.la libTools.la libTime.la \
     1295        libConfiguration.la
     1296
     1297ccdctrl_SOURCES = src/ccdctrl.cc src/LocalControl.h # src/HeadersSPS.h
     1298ccdctrl_LDADD = libDim++.la libDim.la libDimExtension.la \
     1299        libStateMachine.la libTools.la libTime.la \
     1300        libConfiguration.la
     1301
    10651302agilentctrl_SOURCES = src/agilentctrl.cc src/LocalControl.h src/HeadersAgilent.h
    10661303agilentctrl_LDADD = libDim++.la libDim.la libDimExtension.la \
     
    10931330        libConfiguration.la
    10941331
     1332<<<<<<< .mine
    10951333pfminictrl_SOURCES = src/pfminictrl.cc src/LocalControl.h
    10961334pfminictrl_LDADD = libDim++.la libDim.la libDimExtension.la \
     
    11001338sqmctrl_SOURCES = src/sqmctrl.cc src/LocalControl.h
    11011339sqmctrl_LDADD = libDim++.la libDim.la libDimExtension.la \
     1340        libStateMachine.la libTools.la libTime.la \
     1341        libConfiguration.la
     1342
     1343=======
     1344pfminictrl_SOURCES = src/pfminictrl.cc src/LocalControl.h
     1345pfminictrl_LDADD = libDim++.la libDim.la libDimExtension.la \
     1346        libStateMachine.la libTools.la libTime.la \
     1347        libConfiguration.la
     1348
     1349sqmctrl_SOURCES = src/sqmctrl.cc src/LocalControl.h
     1350sqmctrl_LDADD = libDim++.la libDim.la libDimExtension.la \
    11021351       libStateMachine.la libTools.la libTime.la \
    11031352       libConfiguration.la
    11041353
     1354>>>>>>> .r18350
    11051355temperature_SOURCES = src/temperature.cc src/LocalControl.h
    11061356temperature_LDADD = libDim++.la libDim.la libDimExtension.la \
     
    11501400       libStateMachine.la libTools.la libTime.la \
    11511401       libConfiguration.la -lQtXml
     1402
     1403nsa_SOURCES = src/nsa.cc src/LocalControl.h
     1404nsa_LDADD = libDim++.la libDim.la  libDimExtension.la \
     1405       libStateMachine.la libTools.la libTime.la \
     1406       libConfiguration.la
    11521407
    11531408biasctrl_SOURCES = src/biasctrl.cc src/LocalControl.h src/PixelMap.cc
     
    14261681libDimExtension.la: $(libDimExtension_la_OBJECTS) $(libDimExtension_la_DEPENDENCIES) $(EXTRA_libDimExtension_la_DEPENDENCIES)
    14271682        $(AM_V_CXXLD)$(CXXLINK) -rpath $(libdir) $(libDimExtension_la_OBJECTS) $(libDimExtension_la_LIBADD) $(LIBS)
     1683pal/$(am__dirstamp):
     1684        @$(MKDIR_P) pal
     1685        @: > pal/$(am__dirstamp)
     1686pal/$(DEPDIR)/$(am__dirstamp):
     1687        @$(MKDIR_P) pal/$(DEPDIR)
     1688        @: > pal/$(DEPDIR)/$(am__dirstamp)
     1689pal/palDtt.lo: pal/$(am__dirstamp) pal/$(DEPDIR)/$(am__dirstamp)
     1690pal/palDat.lo: pal/$(am__dirstamp) pal/$(DEPDIR)/$(am__dirstamp)
     1691pal/palMappa.lo: pal/$(am__dirstamp) pal/$(DEPDIR)/$(am__dirstamp)
     1692pal/palPrenut.lo: pal/$(am__dirstamp) pal/$(DEPDIR)/$(am__dirstamp)
     1693pal/palEvp.lo: pal/$(am__dirstamp) pal/$(DEPDIR)/$(am__dirstamp)
     1694pal/palAoppa.lo: pal/$(am__dirstamp) pal/$(DEPDIR)/$(am__dirstamp)
     1695pal/palAoppat.lo: pal/$(am__dirstamp) pal/$(DEPDIR)/$(am__dirstamp)
     1696pal/palRefco.lo: pal/$(am__dirstamp) pal/$(DEPDIR)/$(am__dirstamp)
     1697pal/palRefro.lo: pal/$(am__dirstamp) pal/$(DEPDIR)/$(am__dirstamp)
     1698pal/pal1Atmt.lo: pal/$(am__dirstamp) pal/$(DEPDIR)/$(am__dirstamp)
     1699pal/palDrange.lo: pal/$(am__dirstamp) pal/$(DEPDIR)/$(am__dirstamp)
     1700pal/palOne2One.lo: pal/$(am__dirstamp) pal/$(DEPDIR)/$(am__dirstamp)
     1701pal/pal1Atms.lo: pal/$(am__dirstamp) pal/$(DEPDIR)/$(am__dirstamp)
     1702pal/palMapqkz.lo: pal/$(am__dirstamp) pal/$(DEPDIR)/$(am__dirstamp)
     1703pal/palAopqk.lo: pal/$(am__dirstamp) pal/$(DEPDIR)/$(am__dirstamp)
     1704pal/palRefz.lo: pal/$(am__dirstamp) pal/$(DEPDIR)/$(am__dirstamp)
     1705pal/palAmpqk.lo: pal/$(am__dirstamp) pal/$(DEPDIR)/$(am__dirstamp)
     1706pal/palRdplan.lo: pal/$(am__dirstamp) pal/$(DEPDIR)/$(am__dirstamp)
     1707pal/palDt.lo: pal/$(am__dirstamp) pal/$(DEPDIR)/$(am__dirstamp)
     1708pal/palPvobs.lo: pal/$(am__dirstamp) pal/$(DEPDIR)/$(am__dirstamp)
     1709pal/palNut.lo: pal/$(am__dirstamp) pal/$(DEPDIR)/$(am__dirstamp)
     1710pal/palDmoon.lo: pal/$(am__dirstamp) pal/$(DEPDIR)/$(am__dirstamp)
     1711pal/palPlanet.lo: pal/$(am__dirstamp) pal/$(DEPDIR)/$(am__dirstamp)
     1712pal/palNutc.lo: pal/$(am__dirstamp) pal/$(DEPDIR)/$(am__dirstamp)
     1713pal/palDeuler.lo: pal/$(am__dirstamp) pal/$(DEPDIR)/$(am__dirstamp)
     1714sofa/src/$(am__dirstamp):
     1715        @$(MKDIR_P) sofa/src
     1716        @: > sofa/src/$(am__dirstamp)
     1717sofa/src/$(DEPDIR)/$(am__dirstamp):
     1718        @$(MKDIR_P) sofa/src/$(DEPDIR)
     1719        @: > sofa/src/$(DEPDIR)/$(am__dirstamp)
     1720sofa/src/dat.lo: sofa/src/$(am__dirstamp) \
     1721        sofa/src/$(DEPDIR)/$(am__dirstamp)
     1722sofa/src/cal2jd.lo: sofa/src/$(am__dirstamp) \
     1723        sofa/src/$(DEPDIR)/$(am__dirstamp)
     1724sofa/src/jd2cal.lo: sofa/src/$(am__dirstamp) \
     1725        sofa/src/$(DEPDIR)/$(am__dirstamp)
     1726sofa/src/epj.lo: sofa/src/$(am__dirstamp) \
     1727        sofa/src/$(DEPDIR)/$(am__dirstamp)
     1728sofa/src/pn.lo: sofa/src/$(am__dirstamp) \
     1729        sofa/src/$(DEPDIR)/$(am__dirstamp)
     1730sofa/src/rxpv.lo: sofa/src/$(am__dirstamp) \
     1731        sofa/src/$(DEPDIR)/$(am__dirstamp)
     1732sofa/src/rz.lo: sofa/src/$(am__dirstamp) \
     1733        sofa/src/$(DEPDIR)/$(am__dirstamp)
     1734sofa/src/zp.lo: sofa/src/$(am__dirstamp) \
     1735        sofa/src/$(DEPDIR)/$(am__dirstamp)
     1736sofa/src/pnm06a.lo: sofa/src/$(am__dirstamp) \
     1737        sofa/src/$(DEPDIR)/$(am__dirstamp)
     1738sofa/src/ir.lo: sofa/src/$(am__dirstamp) \
     1739        sofa/src/$(DEPDIR)/$(am__dirstamp)
     1740sofa/src/pmat06.lo: sofa/src/$(am__dirstamp) \
     1741        sofa/src/$(DEPDIR)/$(am__dirstamp)
     1742sofa/src/pm.lo: sofa/src/$(am__dirstamp) \
     1743        sofa/src/$(DEPDIR)/$(am__dirstamp)
     1744sofa/src/sxp.lo: sofa/src/$(am__dirstamp) \
     1745        sofa/src/$(DEPDIR)/$(am__dirstamp)
     1746sofa/src/epv00.lo: sofa/src/$(am__dirstamp) \
     1747        sofa/src/$(DEPDIR)/$(am__dirstamp)
     1748sofa/src/rxr.lo: sofa/src/$(am__dirstamp) \
     1749        sofa/src/$(DEPDIR)/$(am__dirstamp)
     1750sofa/src/rx.lo: sofa/src/$(am__dirstamp) \
     1751        sofa/src/$(DEPDIR)/$(am__dirstamp)
     1752sofa/src/p06e.lo: sofa/src/$(am__dirstamp) \
     1753        sofa/src/$(DEPDIR)/$(am__dirstamp)
     1754sofa/src/epj2jd.lo: sofa/src/$(am__dirstamp) \
     1755        sofa/src/$(DEPDIR)/$(am__dirstamp)
     1756sofa/src/obl06.lo: sofa/src/$(am__dirstamp) \
     1757        sofa/src/$(DEPDIR)/$(am__dirstamp)
     1758sofa/src/cr.lo: sofa/src/$(am__dirstamp) \
     1759        sofa/src/$(DEPDIR)/$(am__dirstamp)
     1760sofa/src/fw2m.lo: sofa/src/$(am__dirstamp) \
     1761        sofa/src/$(DEPDIR)/$(am__dirstamp)
     1762sofa/src/nut06a.lo: sofa/src/$(am__dirstamp) \
     1763        sofa/src/$(DEPDIR)/$(am__dirstamp)
     1764sofa/src/rxp.lo: sofa/src/$(am__dirstamp) \
     1765        sofa/src/$(DEPDIR)/$(am__dirstamp)
     1766sofa/src/pfw06.lo: sofa/src/$(am__dirstamp) \
     1767        sofa/src/$(DEPDIR)/$(am__dirstamp)
     1768sofa/src/nut00a.lo: sofa/src/$(am__dirstamp) \
     1769        sofa/src/$(DEPDIR)/$(am__dirstamp)
     1770sofa/src/cp.lo: sofa/src/$(am__dirstamp) \
     1771        sofa/src/$(DEPDIR)/$(am__dirstamp)
     1772sofa/src/faur03.lo: sofa/src/$(am__dirstamp) \
     1773        sofa/src/$(DEPDIR)/$(am__dirstamp)
     1774sofa/src/fapa03.lo: sofa/src/$(am__dirstamp) \
     1775        sofa/src/$(DEPDIR)/$(am__dirstamp)
     1776sofa/src/fave03.lo: sofa/src/$(am__dirstamp) \
     1777        sofa/src/$(DEPDIR)/$(am__dirstamp)
     1778sofa/src/fal03.lo: sofa/src/$(am__dirstamp) \
     1779        sofa/src/$(DEPDIR)/$(am__dirstamp)
     1780sofa/src/fasa03.lo: sofa/src/$(am__dirstamp) \
     1781        sofa/src/$(DEPDIR)/$(am__dirstamp)
     1782sofa/src/fame03.lo: sofa/src/$(am__dirstamp) \
     1783        sofa/src/$(DEPDIR)/$(am__dirstamp)
     1784sofa/src/faf03.lo: sofa/src/$(am__dirstamp) \
     1785        sofa/src/$(DEPDIR)/$(am__dirstamp)
     1786sofa/src/faom03.lo: sofa/src/$(am__dirstamp) \
     1787        sofa/src/$(DEPDIR)/$(am__dirstamp)
     1788sofa/src/faju03.lo: sofa/src/$(am__dirstamp) \
     1789        sofa/src/$(DEPDIR)/$(am__dirstamp)
     1790sofa/src/fae03.lo: sofa/src/$(am__dirstamp) \
     1791        sofa/src/$(DEPDIR)/$(am__dirstamp)
     1792sofa/src/fama03.lo: sofa/src/$(am__dirstamp) \
     1793        sofa/src/$(DEPDIR)/$(am__dirstamp)
     1794sofa/src/a2af.lo: sofa/src/$(am__dirstamp) \
     1795        sofa/src/$(DEPDIR)/$(am__dirstamp)
     1796sofa/src/c2s.lo: sofa/src/$(am__dirstamp) \
     1797        sofa/src/$(DEPDIR)/$(am__dirstamp)
     1798sofa/src/epb.lo: sofa/src/$(am__dirstamp) \
     1799        sofa/src/$(DEPDIR)/$(am__dirstamp)
     1800sofa/src/ee06a.lo: sofa/src/$(am__dirstamp) \
     1801        sofa/src/$(DEPDIR)/$(am__dirstamp)
     1802sofa/src/anp.lo: sofa/src/$(am__dirstamp) \
     1803        sofa/src/$(DEPDIR)/$(am__dirstamp)
     1804sofa/src/pap.lo: sofa/src/$(am__dirstamp) \
     1805        sofa/src/$(DEPDIR)/$(am__dirstamp)
     1806sofa/src/af2a.lo: sofa/src/$(am__dirstamp) \
     1807        sofa/src/$(DEPDIR)/$(am__dirstamp)
     1808sofa/src/s2c.lo: sofa/src/$(am__dirstamp) \
     1809        sofa/src/$(DEPDIR)/$(am__dirstamp)
     1810sofa/src/tf2d.lo: sofa/src/$(am__dirstamp) \
     1811        sofa/src/$(DEPDIR)/$(am__dirstamp)
     1812sofa/src/rv2m.lo: sofa/src/$(am__dirstamp) \
     1813        sofa/src/$(DEPDIR)/$(am__dirstamp)
     1814sofa/src/rm2v.lo: sofa/src/$(am__dirstamp) \
     1815        sofa/src/$(DEPDIR)/$(am__dirstamp)
     1816sofa/src/pdp.lo: sofa/src/$(am__dirstamp) \
     1817        sofa/src/$(DEPDIR)/$(am__dirstamp)
     1818sofa/src/anpm.lo: sofa/src/$(am__dirstamp) \
     1819        sofa/src/$(DEPDIR)/$(am__dirstamp)
     1820sofa/src/d2tf.lo: sofa/src/$(am__dirstamp) \
     1821        sofa/src/$(DEPDIR)/$(am__dirstamp)
     1822sofa/src/sepp.lo: sofa/src/$(am__dirstamp) \
     1823        sofa/src/$(DEPDIR)/$(am__dirstamp)
     1824sofa/src/fk5hz.lo: sofa/src/$(am__dirstamp) \
     1825        sofa/src/$(DEPDIR)/$(am__dirstamp)
     1826sofa/src/trxp.lo: sofa/src/$(am__dirstamp) \
     1827        sofa/src/$(DEPDIR)/$(am__dirstamp)
     1828sofa/src/pxp.lo: sofa/src/$(am__dirstamp) \
     1829        sofa/src/$(DEPDIR)/$(am__dirstamp)
     1830sofa/src/tf2a.lo: sofa/src/$(am__dirstamp) \
     1831        sofa/src/$(DEPDIR)/$(am__dirstamp)
     1832sofa/src/gmst06.lo: sofa/src/$(am__dirstamp) \
     1833        sofa/src/$(DEPDIR)/$(am__dirstamp)
     1834sofa/src/hfk5z.lo: sofa/src/$(am__dirstamp) \
     1835        sofa/src/$(DEPDIR)/$(am__dirstamp)
     1836sofa/src/epb2jd.lo: sofa/src/$(am__dirstamp) \
     1837        sofa/src/$(DEPDIR)/$(am__dirstamp)
     1838sofa/src/seps.lo: sofa/src/$(am__dirstamp) \
     1839        sofa/src/$(DEPDIR)/$(am__dirstamp)
     1840sofa/src/a2tf.lo: sofa/src/$(am__dirstamp) \
     1841        sofa/src/$(DEPDIR)/$(am__dirstamp)
     1842sofa/src/pmp.lo: sofa/src/$(am__dirstamp) \
     1843        sofa/src/$(DEPDIR)/$(am__dirstamp)
     1844sofa/src/pv2s.lo: sofa/src/$(am__dirstamp) \
     1845        sofa/src/$(DEPDIR)/$(am__dirstamp)
     1846sofa/src/pas.lo: sofa/src/$(am__dirstamp) \
     1847        sofa/src/$(DEPDIR)/$(am__dirstamp)
     1848sofa/src/tr.lo: sofa/src/$(am__dirstamp) \
     1849        sofa/src/$(DEPDIR)/$(am__dirstamp)
     1850sofa/src/fk5hip.lo: sofa/src/$(am__dirstamp) \
     1851        sofa/src/$(DEPDIR)/$(am__dirstamp)
     1852sofa/src/era00.lo: sofa/src/$(am__dirstamp) \
     1853        sofa/src/$(DEPDIR)/$(am__dirstamp)
     1854sofa/src/gst06a.lo: sofa/src/$(am__dirstamp) \
     1855        sofa/src/$(DEPDIR)/$(am__dirstamp)
     1856sofa/src/gst06.lo: sofa/src/$(am__dirstamp) \
     1857        sofa/src/$(DEPDIR)/$(am__dirstamp)
     1858sofa/src/bpn2xy.lo: sofa/src/$(am__dirstamp) \
     1859        sofa/src/$(DEPDIR)/$(am__dirstamp)
     1860sofa/src/eors.lo: sofa/src/$(am__dirstamp) \
     1861        sofa/src/$(DEPDIR)/$(am__dirstamp)
     1862sofa/src/s06.lo: sofa/src/$(am__dirstamp) \
     1863        sofa/src/$(DEPDIR)/$(am__dirstamp)
     1864sofa/src/falp03.lo: sofa/src/$(am__dirstamp) \
     1865        sofa/src/$(DEPDIR)/$(am__dirstamp)
     1866sofa/src/fad03.lo: sofa/src/$(am__dirstamp) \
     1867        sofa/src/$(DEPDIR)/$(am__dirstamp)
     1868sofa/src/gd2gc.lo: sofa/src/$(am__dirstamp) \
     1869        sofa/src/$(DEPDIR)/$(am__dirstamp)
     1870sofa/src/plan94.lo: sofa/src/$(am__dirstamp) \
     1871        sofa/src/$(DEPDIR)/$(am__dirstamp)
     1872sofa/src/gd2gce.lo: sofa/src/$(am__dirstamp) \
     1873        sofa/src/$(DEPDIR)/$(am__dirstamp)
     1874sofa/src/eform.lo: sofa/src/$(am__dirstamp) \
     1875        sofa/src/$(DEPDIR)/$(am__dirstamp)
     1876sofa/src/ry.lo: sofa/src/$(am__dirstamp) \
     1877        sofa/src/$(DEPDIR)/$(am__dirstamp)
     1878libPal.la: $(libPal_la_OBJECTS) $(libPal_la_DEPENDENCIES) $(EXTRA_libPal_la_DEPENDENCIES)
     1879        $(AM_V_CCLD)$(LINK) -rpath $(libdir) $(libPal_la_OBJECTS) $(libPal_la_LIBADD) $(LIBS)
     1880slalib/$(am__dirstamp):
     1881        @$(MKDIR_P) slalib
     1882        @: > slalib/$(am__dirstamp)
     1883slalib/$(DEPDIR)/$(am__dirstamp):
     1884        @$(MKDIR_P) slalib/$(DEPDIR)
     1885        @: > slalib/$(DEPDIR)/$(am__dirstamp)
     1886slalib/aopqk.lo: slalib/$(am__dirstamp) \
     1887        slalib/$(DEPDIR)/$(am__dirstamp)
     1888slalib/mappa.lo: slalib/$(am__dirstamp) \
     1889        slalib/$(DEPDIR)/$(am__dirstamp)
     1890slalib/aoppa.lo: slalib/$(am__dirstamp) \
     1891        slalib/$(DEPDIR)/$(am__dirstamp)
     1892slalib/dtt.lo: slalib/$(am__dirstamp) slalib/$(DEPDIR)/$(am__dirstamp)
     1893slalib/mapqkz.lo: slalib/$(am__dirstamp) \
     1894        slalib/$(DEPDIR)/$(am__dirstamp)
     1895slalib/refco.lo: slalib/$(am__dirstamp) \
     1896        slalib/$(DEPDIR)/$(am__dirstamp)
     1897slalib/refro.lo: slalib/$(am__dirstamp) \
     1898        slalib/$(DEPDIR)/$(am__dirstamp)
     1899slalib/epj.lo: slalib/$(am__dirstamp) slalib/$(DEPDIR)/$(am__dirstamp)
     1900slalib/geoc.lo: slalib/$(am__dirstamp) \
     1901        slalib/$(DEPDIR)/$(am__dirstamp)
     1902slalib/dranrm.lo: slalib/$(am__dirstamp) \
     1903        slalib/$(DEPDIR)/$(am__dirstamp)
     1904slalib/refz.lo: slalib/$(am__dirstamp) \
     1905        slalib/$(DEPDIR)/$(am__dirstamp)
     1906slalib/dvn.lo: slalib/$(am__dirstamp) slalib/$(DEPDIR)/$(am__dirstamp)
     1907slalib/dcc2s.lo: slalib/$(am__dirstamp) \
     1908        slalib/$(DEPDIR)/$(am__dirstamp)
     1909slalib/aoppat.lo: slalib/$(am__dirstamp) \
     1910        slalib/$(DEPDIR)/$(am__dirstamp)
     1911slalib/dcs2c.lo: slalib/$(am__dirstamp) \
     1912        slalib/$(DEPDIR)/$(am__dirstamp)
     1913slalib/evp.lo: slalib/$(am__dirstamp) slalib/$(DEPDIR)/$(am__dirstamp)
     1914slalib/eqeqx.lo: slalib/$(am__dirstamp) \
     1915        slalib/$(DEPDIR)/$(am__dirstamp)
     1916slalib/dat.lo: slalib/$(am__dirstamp) slalib/$(DEPDIR)/$(am__dirstamp)
     1917slalib/prenut.lo: slalib/$(am__dirstamp) \
     1918        slalib/$(DEPDIR)/$(am__dirstamp)
     1919slalib/gmst.lo: slalib/$(am__dirstamp) \
     1920        slalib/$(DEPDIR)/$(am__dirstamp)
     1921slalib/prec.lo: slalib/$(am__dirstamp) \
     1922        slalib/$(DEPDIR)/$(am__dirstamp)
     1923slalib/dmxm.lo: slalib/$(am__dirstamp) \
     1924        slalib/$(DEPDIR)/$(am__dirstamp)
     1925slalib/nutc.lo: slalib/$(am__dirstamp) \
     1926        slalib/$(DEPDIR)/$(am__dirstamp)
     1927slalib/nut.lo: slalib/$(am__dirstamp) slalib/$(DEPDIR)/$(am__dirstamp)
     1928slalib/drange.lo: slalib/$(am__dirstamp) \
     1929        slalib/$(DEPDIR)/$(am__dirstamp)
     1930slalib/dvdv.lo: slalib/$(am__dirstamp) \
     1931        slalib/$(DEPDIR)/$(am__dirstamp)
     1932slalib/dmxv.lo: slalib/$(am__dirstamp) \
     1933        slalib/$(DEPDIR)/$(am__dirstamp)
     1934slalib/deuler.lo: slalib/$(am__dirstamp) \
     1935        slalib/$(DEPDIR)/$(am__dirstamp)
     1936libSlalib.la: $(libSlalib_la_OBJECTS) $(libSlalib_la_DEPENDENCIES) $(EXTRA_libSlalib_la_DEPENDENCIES)
     1937        $(AM_V_CCLD)$(LINK) -rpath $(libdir) $(libSlalib_la_OBJECTS) $(libSlalib_la_LIBADD) $(LIBS)
    14281938src/WindowLog.lo: src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
    14291939src/Readline.lo: src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
     
    15472057        @rm -f biasctrl$(EXEEXT)
    15482058        $(AM_V_CXXLD)$(CXXLINK) $(biasctrl_OBJECTS) $(biasctrl_LDADD) $(LIBS)
     2059src/ccdctrl.$(OBJEXT): src/$(am__dirstamp) \
     2060        src/$(DEPDIR)/$(am__dirstamp)
     2061ccdctrl$(EXEEXT): $(ccdctrl_OBJECTS) $(ccdctrl_DEPENDENCIES) $(EXTRA_ccdctrl_DEPENDENCIES)
     2062        @rm -f ccdctrl$(EXEEXT)
     2063        $(AM_V_CXXLD)$(CXXLINK) $(ccdctrl_OBJECTS) $(ccdctrl_LDADD) $(LIBS)
    15492064src/chatclient.$(OBJEXT): src/$(am__dirstamp) \
    15502065        src/$(DEPDIR)/$(am__dirstamp)
     
    16032118        @rm -f dns$(EXEEXT)
    16042119        $(AM_V_CCLD)$(LINK) $(dns_OBJECTS) $(dns_LDADD) $(LIBS)
    1605 src/drivectrl.$(OBJEXT): src/$(am__dirstamp) \
    1606         src/$(DEPDIR)/$(am__dirstamp)
    1607 src/HeadersFTM.$(OBJEXT): src/$(am__dirstamp) \
    1608         src/$(DEPDIR)/$(am__dirstamp)
    1609 drivectrl$(EXEEXT): $(drivectrl_OBJECTS) $(drivectrl_DEPENDENCIES) $(EXTRA_drivectrl_DEPENDENCIES)
    1610         @rm -f drivectrl$(EXEEXT)
    1611         $(AM_V_CXXLD)$(CXXLINK) $(drivectrl_OBJECTS) $(drivectrl_LDADD) $(LIBS)
    16122120src/dserver2.$(OBJEXT): src/$(am__dirstamp) \
    16132121        src/$(DEPDIR)/$(am__dirstamp)
     
    16512159gui/FactGui.$(OBJEXT): gui/$(am__dirstamp) \
    16522160        gui/$(DEPDIR)/$(am__dirstamp)
     2161src/HeadersFTM.$(OBJEXT): src/$(am__dirstamp) \
     2162        src/$(DEPDIR)/$(am__dirstamp)
    16532163fact$(EXEEXT): $(fact_OBJECTS) $(fact_DEPENDENCIES) $(EXTRA_fact_DEPENDENCIES)
    16542164        @rm -f fact$(EXEEXT)
     
    17002210        @rm -f fitsloader$(EXEEXT)
    17012211        $(AM_V_CXXLD)$(CXXLINK) $(fitsloader_OBJECTS) $(fitsloader_LDADD) $(LIBS)
     2212<<<<<<< .mine
     2213fitsselect$(EXEEXT): $(fitsselect_OBJECTS) $(fitsselect_DEPENDENCIES) $(EXTRA_fitsselect_DEPENDENCIES)
     2214        @rm -f fitsselect$(EXEEXT)
     2215        $(AM_V_CCLD)$(LINK) $(fitsselect_OBJECTS) $(fitsselect_LDADD) $(LIBS)
     2216=======
    17022217src/fitsselect.$(OBJEXT): src/$(am__dirstamp) \
    17032218        src/$(DEPDIR)/$(am__dirstamp)
     
    17052220        @rm -f fitsselect$(EXEEXT)
    17062221        $(AM_V_CXXLD)$(CXXLINK) $(fitsselect_OBJECTS) $(fitsselect_LDADD) $(LIBS)
     2222>>>>>>> .r18350
    17072223src/fsc.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
    17082224fsc$(EXEEXT): $(fsc_OBJECTS) $(fsc_DEPENDENCIES) $(EXTRA_fsc_DEPENDENCIES)
     
    18242340        @rm -f skypeclient$(EXEEXT)
    18252341        $(AM_V_CXXLD)$(CXXLINK) $(skypeclient_OBJECTS) $(skypeclient_LDADD) $(LIBS)
     2342src/slalib-test.$(OBJEXT): src/$(am__dirstamp) \
     2343        src/$(DEPDIR)/$(am__dirstamp)
     2344slalib-test$(EXEEXT): $(slalib_test_OBJECTS) $(slalib_test_DEPENDENCIES) $(EXTRA_slalib_test_DEPENDENCIES)
     2345        @rm -f slalib-test$(EXEEXT)
     2346        $(AM_V_CXXLD)$(CXXLINK) $(slalib_test_OBJECTS) $(slalib_test_LDADD) $(LIBS)
    18262347src/smartfact.$(OBJEXT): src/$(am__dirstamp) \
    18272348        src/$(DEPDIR)/$(am__dirstamp)
     
    18292350        @rm -f smartfact$(EXEEXT)
    18302351        $(AM_V_CXXLD)$(CXXLINK) $(smartfact_OBJECTS) $(smartfact_LDADD) $(LIBS)
     2352<<<<<<< .mine
     2353src/spsctrl.$(OBJEXT): src/$(am__dirstamp) \
     2354        src/$(DEPDIR)/$(am__dirstamp)
     2355spsctrl$(EXEEXT): $(spsctrl_OBJECTS) $(spsctrl_DEPENDENCIES) $(EXTRA_spsctrl_DEPENDENCIES)
     2356        @rm -f spsctrl$(EXEEXT)
     2357        $(AM_V_CXXLD)$(CXXLINK) $(spsctrl_OBJECTS) $(spsctrl_LDADD) $(LIBS)
    18312358src/sqmctrl.$(OBJEXT): src/$(am__dirstamp) \
    18322359        src/$(DEPDIR)/$(am__dirstamp)
     
    18342361        @rm -f sqmctrl$(EXEEXT)
    18352362        $(AM_V_CXXLD)$(CXXLINK) $(sqmctrl_OBJECTS) $(sqmctrl_LDADD) $(LIBS)
     2363=======
     2364src/sqmctrl.$(OBJEXT): src/$(am__dirstamp) \
     2365        src/$(DEPDIR)/$(am__dirstamp)
     2366sqmctrl$(EXEEXT): $(sqmctrl_OBJECTS) $(sqmctrl_DEPENDENCIES) $(EXTRA_sqmctrl_DEPENDENCIES)
     2367        @rm -f sqmctrl$(EXEEXT)
     2368        $(AM_V_CXXLD)$(CXXLINK) $(sqmctrl_OBJECTS) $(sqmctrl_LDADD) $(LIBS)
     2369>>>>>>> .r18350
    18362370src/temperature.$(OBJEXT): src/$(am__dirstamp) \
    18372371        src/$(DEPDIR)/$(am__dirstamp)
     
    19822516        -rm -f gui/viewer-QCameraWidget.$(OBJEXT)
    19832517        -rm -f gui/viewer-QCameraWidget.moc.$(OBJEXT)
     2518        -rm -f pal/pal1Atms.$(OBJEXT)
     2519        -rm -f pal/pal1Atms.lo
     2520        -rm -f pal/pal1Atmt.$(OBJEXT)
     2521        -rm -f pal/pal1Atmt.lo
     2522        -rm -f pal/palAmpqk.$(OBJEXT)
     2523        -rm -f pal/palAmpqk.lo
     2524        -rm -f pal/palAoppa.$(OBJEXT)
     2525        -rm -f pal/palAoppa.lo
     2526        -rm -f pal/palAoppat.$(OBJEXT)
     2527        -rm -f pal/palAoppat.lo
     2528        -rm -f pal/palAopqk.$(OBJEXT)
     2529        -rm -f pal/palAopqk.lo
     2530        -rm -f pal/palDat.$(OBJEXT)
     2531        -rm -f pal/palDat.lo
     2532        -rm -f pal/palDeuler.$(OBJEXT)
     2533        -rm -f pal/palDeuler.lo
     2534        -rm -f pal/palDmoon.$(OBJEXT)
     2535        -rm -f pal/palDmoon.lo
     2536        -rm -f pal/palDrange.$(OBJEXT)
     2537        -rm -f pal/palDrange.lo
     2538        -rm -f pal/palDt.$(OBJEXT)
     2539        -rm -f pal/palDt.lo
     2540        -rm -f pal/palDtt.$(OBJEXT)
     2541        -rm -f pal/palDtt.lo
     2542        -rm -f pal/palEvp.$(OBJEXT)
     2543        -rm -f pal/palEvp.lo
     2544        -rm -f pal/palMappa.$(OBJEXT)
     2545        -rm -f pal/palMappa.lo
     2546        -rm -f pal/palMapqkz.$(OBJEXT)
     2547        -rm -f pal/palMapqkz.lo
     2548        -rm -f pal/palNut.$(OBJEXT)
     2549        -rm -f pal/palNut.lo
     2550        -rm -f pal/palNutc.$(OBJEXT)
     2551        -rm -f pal/palNutc.lo
     2552        -rm -f pal/palOne2One.$(OBJEXT)
     2553        -rm -f pal/palOne2One.lo
     2554        -rm -f pal/palPlanet.$(OBJEXT)
     2555        -rm -f pal/palPlanet.lo
     2556        -rm -f pal/palPrenut.$(OBJEXT)
     2557        -rm -f pal/palPrenut.lo
     2558        -rm -f pal/palPvobs.$(OBJEXT)
     2559        -rm -f pal/palPvobs.lo
     2560        -rm -f pal/palRdplan.$(OBJEXT)
     2561        -rm -f pal/palRdplan.lo
     2562        -rm -f pal/palRefco.$(OBJEXT)
     2563        -rm -f pal/palRefco.lo
     2564        -rm -f pal/palRefro.$(OBJEXT)
     2565        -rm -f pal/palRefro.lo
     2566        -rm -f pal/palRefz.$(OBJEXT)
     2567        -rm -f pal/palRefz.lo
     2568        -rm -f slalib/aoppa.$(OBJEXT)
     2569        -rm -f slalib/aoppa.lo
     2570        -rm -f slalib/aoppat.$(OBJEXT)
     2571        -rm -f slalib/aoppat.lo
     2572        -rm -f slalib/aopqk.$(OBJEXT)
     2573        -rm -f slalib/aopqk.lo
     2574        -rm -f slalib/dat.$(OBJEXT)
     2575        -rm -f slalib/dat.lo
     2576        -rm -f slalib/dcc2s.$(OBJEXT)
     2577        -rm -f slalib/dcc2s.lo
     2578        -rm -f slalib/dcs2c.$(OBJEXT)
     2579        -rm -f slalib/dcs2c.lo
     2580        -rm -f slalib/deuler.$(OBJEXT)
     2581        -rm -f slalib/deuler.lo
     2582        -rm -f slalib/dmxm.$(OBJEXT)
     2583        -rm -f slalib/dmxm.lo
     2584        -rm -f slalib/dmxv.$(OBJEXT)
     2585        -rm -f slalib/dmxv.lo
     2586        -rm -f slalib/drange.$(OBJEXT)
     2587        -rm -f slalib/drange.lo
     2588        -rm -f slalib/dranrm.$(OBJEXT)
     2589        -rm -f slalib/dranrm.lo
     2590        -rm -f slalib/dtt.$(OBJEXT)
     2591        -rm -f slalib/dtt.lo
     2592        -rm -f slalib/dvdv.$(OBJEXT)
     2593        -rm -f slalib/dvdv.lo
     2594        -rm -f slalib/dvn.$(OBJEXT)
     2595        -rm -f slalib/dvn.lo
     2596        -rm -f slalib/epj.$(OBJEXT)
     2597        -rm -f slalib/epj.lo
     2598        -rm -f slalib/eqeqx.$(OBJEXT)
     2599        -rm -f slalib/eqeqx.lo
     2600        -rm -f slalib/evp.$(OBJEXT)
     2601        -rm -f slalib/evp.lo
     2602        -rm -f slalib/geoc.$(OBJEXT)
     2603        -rm -f slalib/geoc.lo
     2604        -rm -f slalib/gmst.$(OBJEXT)
     2605        -rm -f slalib/gmst.lo
     2606        -rm -f slalib/mappa.$(OBJEXT)
     2607        -rm -f slalib/mappa.lo
     2608        -rm -f slalib/mapqkz.$(OBJEXT)
     2609        -rm -f slalib/mapqkz.lo
     2610        -rm -f slalib/nut.$(OBJEXT)
     2611        -rm -f slalib/nut.lo
     2612        -rm -f slalib/nutc.$(OBJEXT)
     2613        -rm -f slalib/nutc.lo
     2614        -rm -f slalib/prec.$(OBJEXT)
     2615        -rm -f slalib/prec.lo
     2616        -rm -f slalib/prenut.$(OBJEXT)
     2617        -rm -f slalib/prenut.lo
     2618        -rm -f slalib/refco.$(OBJEXT)
     2619        -rm -f slalib/refco.lo
     2620        -rm -f slalib/refro.$(OBJEXT)
     2621        -rm -f slalib/refro.lo
     2622        -rm -f slalib/refz.$(OBJEXT)
     2623        -rm -f slalib/refz.lo
     2624        -rm -f sofa/src/a2af.$(OBJEXT)
     2625        -rm -f sofa/src/a2af.lo
     2626        -rm -f sofa/src/a2tf.$(OBJEXT)
     2627        -rm -f sofa/src/a2tf.lo
     2628        -rm -f sofa/src/af2a.$(OBJEXT)
     2629        -rm -f sofa/src/af2a.lo
     2630        -rm -f sofa/src/anp.$(OBJEXT)
     2631        -rm -f sofa/src/anp.lo
     2632        -rm -f sofa/src/anpm.$(OBJEXT)
     2633        -rm -f sofa/src/anpm.lo
     2634        -rm -f sofa/src/bpn2xy.$(OBJEXT)
     2635        -rm -f sofa/src/bpn2xy.lo
     2636        -rm -f sofa/src/c2s.$(OBJEXT)
     2637        -rm -f sofa/src/c2s.lo
     2638        -rm -f sofa/src/cal2jd.$(OBJEXT)
     2639        -rm -f sofa/src/cal2jd.lo
     2640        -rm -f sofa/src/cp.$(OBJEXT)
     2641        -rm -f sofa/src/cp.lo
     2642        -rm -f sofa/src/cr.$(OBJEXT)
     2643        -rm -f sofa/src/cr.lo
     2644        -rm -f sofa/src/d2tf.$(OBJEXT)
     2645        -rm -f sofa/src/d2tf.lo
     2646        -rm -f sofa/src/dat.$(OBJEXT)
     2647        -rm -f sofa/src/dat.lo
     2648        -rm -f sofa/src/ee06a.$(OBJEXT)
     2649        -rm -f sofa/src/ee06a.lo
     2650        -rm -f sofa/src/eform.$(OBJEXT)
     2651        -rm -f sofa/src/eform.lo
     2652        -rm -f sofa/src/eors.$(OBJEXT)
     2653        -rm -f sofa/src/eors.lo
     2654        -rm -f sofa/src/epb.$(OBJEXT)
     2655        -rm -f sofa/src/epb.lo
     2656        -rm -f sofa/src/epb2jd.$(OBJEXT)
     2657        -rm -f sofa/src/epb2jd.lo
     2658        -rm -f sofa/src/epj.$(OBJEXT)
     2659        -rm -f sofa/src/epj.lo
     2660        -rm -f sofa/src/epj2jd.$(OBJEXT)
     2661        -rm -f sofa/src/epj2jd.lo
     2662        -rm -f sofa/src/epv00.$(OBJEXT)
     2663        -rm -f sofa/src/epv00.lo
     2664        -rm -f sofa/src/era00.$(OBJEXT)
     2665        -rm -f sofa/src/era00.lo
     2666        -rm -f sofa/src/fad03.$(OBJEXT)
     2667        -rm -f sofa/src/fad03.lo
     2668        -rm -f sofa/src/fae03.$(OBJEXT)
     2669        -rm -f sofa/src/fae03.lo
     2670        -rm -f sofa/src/faf03.$(OBJEXT)
     2671        -rm -f sofa/src/faf03.lo
     2672        -rm -f sofa/src/faju03.$(OBJEXT)
     2673        -rm -f sofa/src/faju03.lo
     2674        -rm -f sofa/src/fal03.$(OBJEXT)
     2675        -rm -f sofa/src/fal03.lo
     2676        -rm -f sofa/src/falp03.$(OBJEXT)
     2677        -rm -f sofa/src/falp03.lo
     2678        -rm -f sofa/src/fama03.$(OBJEXT)
     2679        -rm -f sofa/src/fama03.lo
     2680        -rm -f sofa/src/fame03.$(OBJEXT)
     2681        -rm -f sofa/src/fame03.lo
     2682        -rm -f sofa/src/faom03.$(OBJEXT)
     2683        -rm -f sofa/src/faom03.lo
     2684        -rm -f sofa/src/fapa03.$(OBJEXT)
     2685        -rm -f sofa/src/fapa03.lo
     2686        -rm -f sofa/src/fasa03.$(OBJEXT)
     2687        -rm -f sofa/src/fasa03.lo
     2688        -rm -f sofa/src/faur03.$(OBJEXT)
     2689        -rm -f sofa/src/faur03.lo
     2690        -rm -f sofa/src/fave03.$(OBJEXT)
     2691        -rm -f sofa/src/fave03.lo
     2692        -rm -f sofa/src/fk5hip.$(OBJEXT)
     2693        -rm -f sofa/src/fk5hip.lo
     2694        -rm -f sofa/src/fk5hz.$(OBJEXT)
     2695        -rm -f sofa/src/fk5hz.lo
     2696        -rm -f sofa/src/fw2m.$(OBJEXT)
     2697        -rm -f sofa/src/fw2m.lo
     2698        -rm -f sofa/src/gd2gc.$(OBJEXT)
     2699        -rm -f sofa/src/gd2gc.lo
     2700        -rm -f sofa/src/gd2gce.$(OBJEXT)
     2701        -rm -f sofa/src/gd2gce.lo
     2702        -rm -f sofa/src/gmst06.$(OBJEXT)
     2703        -rm -f sofa/src/gmst06.lo
     2704        -rm -f sofa/src/gst06.$(OBJEXT)
     2705        -rm -f sofa/src/gst06.lo
     2706        -rm -f sofa/src/gst06a.$(OBJEXT)
     2707        -rm -f sofa/src/gst06a.lo
     2708        -rm -f sofa/src/hfk5z.$(OBJEXT)
     2709        -rm -f sofa/src/hfk5z.lo
     2710        -rm -f sofa/src/ir.$(OBJEXT)
     2711        -rm -f sofa/src/ir.lo
     2712        -rm -f sofa/src/jd2cal.$(OBJEXT)
     2713        -rm -f sofa/src/jd2cal.lo
     2714        -rm -f sofa/src/nut00a.$(OBJEXT)
     2715        -rm -f sofa/src/nut00a.lo
     2716        -rm -f sofa/src/nut06a.$(OBJEXT)
     2717        -rm -f sofa/src/nut06a.lo
     2718        -rm -f sofa/src/obl06.$(OBJEXT)
     2719        -rm -f sofa/src/obl06.lo
     2720        -rm -f sofa/src/p06e.$(OBJEXT)
     2721        -rm -f sofa/src/p06e.lo
     2722        -rm -f sofa/src/pap.$(OBJEXT)
     2723        -rm -f sofa/src/pap.lo
     2724        -rm -f sofa/src/pas.$(OBJEXT)
     2725        -rm -f sofa/src/pas.lo
     2726        -rm -f sofa/src/pdp.$(OBJEXT)
     2727        -rm -f sofa/src/pdp.lo
     2728        -rm -f sofa/src/pfw06.$(OBJEXT)
     2729        -rm -f sofa/src/pfw06.lo
     2730        -rm -f sofa/src/plan94.$(OBJEXT)
     2731        -rm -f sofa/src/plan94.lo
     2732        -rm -f sofa/src/pm.$(OBJEXT)
     2733        -rm -f sofa/src/pm.lo
     2734        -rm -f sofa/src/pmat06.$(OBJEXT)
     2735        -rm -f sofa/src/pmat06.lo
     2736        -rm -f sofa/src/pmp.$(OBJEXT)
     2737        -rm -f sofa/src/pmp.lo
     2738        -rm -f sofa/src/pn.$(OBJEXT)
     2739        -rm -f sofa/src/pn.lo
     2740        -rm -f sofa/src/pnm06a.$(OBJEXT)
     2741        -rm -f sofa/src/pnm06a.lo
     2742        -rm -f sofa/src/pv2s.$(OBJEXT)
     2743        -rm -f sofa/src/pv2s.lo
     2744        -rm -f sofa/src/pxp.$(OBJEXT)
     2745        -rm -f sofa/src/pxp.lo
     2746        -rm -f sofa/src/rm2v.$(OBJEXT)
     2747        -rm -f sofa/src/rm2v.lo
     2748        -rm -f sofa/src/rv2m.$(OBJEXT)
     2749        -rm -f sofa/src/rv2m.lo
     2750        -rm -f sofa/src/rx.$(OBJEXT)
     2751        -rm -f sofa/src/rx.lo
     2752        -rm -f sofa/src/rxp.$(OBJEXT)
     2753        -rm -f sofa/src/rxp.lo
     2754        -rm -f sofa/src/rxpv.$(OBJEXT)
     2755        -rm -f sofa/src/rxpv.lo
     2756        -rm -f sofa/src/rxr.$(OBJEXT)
     2757        -rm -f sofa/src/rxr.lo
     2758        -rm -f sofa/src/ry.$(OBJEXT)
     2759        -rm -f sofa/src/ry.lo
     2760        -rm -f sofa/src/rz.$(OBJEXT)
     2761        -rm -f sofa/src/rz.lo
     2762        -rm -f sofa/src/s06.$(OBJEXT)
     2763        -rm -f sofa/src/s06.lo
     2764        -rm -f sofa/src/s2c.$(OBJEXT)
     2765        -rm -f sofa/src/s2c.lo
     2766        -rm -f sofa/src/sepp.$(OBJEXT)
     2767        -rm -f sofa/src/sepp.lo
     2768        -rm -f sofa/src/seps.$(OBJEXT)
     2769        -rm -f sofa/src/seps.lo
     2770        -rm -f sofa/src/sxp.$(OBJEXT)
     2771        -rm -f sofa/src/sxp.lo
     2772        -rm -f sofa/src/tf2a.$(OBJEXT)
     2773        -rm -f sofa/src/tf2a.lo
     2774        -rm -f sofa/src/tf2d.$(OBJEXT)
     2775        -rm -f sofa/src/tf2d.lo
     2776        -rm -f sofa/src/tr.$(OBJEXT)
     2777        -rm -f sofa/src/tr.lo
     2778        -rm -f sofa/src/trxp.$(OBJEXT)
     2779        -rm -f sofa/src/trxp.lo
     2780        -rm -f sofa/src/zp.$(OBJEXT)
     2781        -rm -f sofa/src/zp.lo
    19842782        -rm -f src/Configuration.$(OBJEXT)
    19852783        -rm -f src/Configuration.lo
     
    20592857        -rm -f src/argv.$(OBJEXT)
    20602858        -rm -f src/biasctrl.$(OBJEXT)
     2859        -rm -f src/ccdctrl.$(OBJEXT)
    20612860        -rm -f src/chatclient.$(OBJEXT)
    20622861        -rm -f src/chatserv.$(OBJEXT)
     
    20652864        -rm -f src/dimctrl.$(OBJEXT)
    20662865        -rm -f src/dns.$(OBJEXT)
    2067         -rm -f src/drivectrl.$(OBJEXT)
    20682866        -rm -f src/dserver2.$(OBJEXT)
    20692867        -rm -f src/evtserver.$(OBJEXT)
     
    20992897        -rm -f src/showlog.$(OBJEXT)
    21002898        -rm -f src/skypeclient.$(OBJEXT)
     2899        -rm -f src/slalib-test.$(OBJEXT)
    21012900        -rm -f src/smartfact.$(OBJEXT)
     2901<<<<<<< .mine
     2902        -rm -f src/spsctrl.$(OBJEXT)
    21022903        -rm -f src/sqmctrl.$(OBJEXT)
     2904=======
     2905        -rm -f src/sqmctrl.$(OBJEXT)
     2906>>>>>>> .r18350
    21032907        -rm -f src/temperature.$(OBJEXT)
    21042908        -rm -f src/test.$(OBJEXT)
     
    21212925@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/astro.Po@am__quote@
    21222926@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fitsgrep.Po@am__quote@
     2927@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fitsselect.Po@am__quote@
    21232928@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sched.Po@am__quote@
    21242929@AMDEP_TRUE@@am__include@ @am__quote@dim/src/$(DEPDIR)/conn_handler.Plo@am__quote@
     
    21652970@AMDEP_TRUE@@am__include@ @am__quote@gui/RawEventsViewer/$(DEPDIR)/viewer-RawEventsViewer.Po@am__quote@
    21662971@AMDEP_TRUE@@am__include@ @am__quote@gui/RawEventsViewer/$(DEPDIR)/viewer-RawEventsViewer.moc.Po@am__quote@
     2972@AMDEP_TRUE@@am__include@ @am__quote@pal/$(DEPDIR)/pal1Atms.Plo@am__quote@
     2973@AMDEP_TRUE@@am__include@ @am__quote@pal/$(DEPDIR)/pal1Atmt.Plo@am__quote@
     2974@AMDEP_TRUE@@am__include@ @am__quote@pal/$(DEPDIR)/palAmpqk.Plo@am__quote@
     2975@AMDEP_TRUE@@am__include@ @am__quote@pal/$(DEPDIR)/palAoppa.Plo@am__quote@
     2976@AMDEP_TRUE@@am__include@ @am__quote@pal/$(DEPDIR)/palAoppat.Plo@am__quote@
     2977@AMDEP_TRUE@@am__include@ @am__quote@pal/$(DEPDIR)/palAopqk.Plo@am__quote@
     2978@AMDEP_TRUE@@am__include@ @am__quote@pal/$(DEPDIR)/palDat.Plo@am__quote@
     2979@AMDEP_TRUE@@am__include@ @am__quote@pal/$(DEPDIR)/palDeuler.Plo@am__quote@
     2980@AMDEP_TRUE@@am__include@ @am__quote@pal/$(DEPDIR)/palDmoon.Plo@am__quote@
     2981@AMDEP_TRUE@@am__include@ @am__quote@pal/$(DEPDIR)/palDrange.Plo@am__quote@
     2982@AMDEP_TRUE@@am__include@ @am__quote@pal/$(DEPDIR)/palDt.Plo@am__quote@
     2983@AMDEP_TRUE@@am__include@ @am__quote@pal/$(DEPDIR)/palDtt.Plo@am__quote@
     2984@AMDEP_TRUE@@am__include@ @am__quote@pal/$(DEPDIR)/palEvp.Plo@am__quote@
     2985@AMDEP_TRUE@@am__include@ @am__quote@pal/$(DEPDIR)/palMappa.Plo@am__quote@
     2986@AMDEP_TRUE@@am__include@ @am__quote@pal/$(DEPDIR)/palMapqkz.Plo@am__quote@
     2987@AMDEP_TRUE@@am__include@ @am__quote@pal/$(DEPDIR)/palNut.Plo@am__quote@
     2988@AMDEP_TRUE@@am__include@ @am__quote@pal/$(DEPDIR)/palNutc.Plo@am__quote@
     2989@AMDEP_TRUE@@am__include@ @am__quote@pal/$(DEPDIR)/palOne2One.Plo@am__quote@
     2990@AMDEP_TRUE@@am__include@ @am__quote@pal/$(DEPDIR)/palPlanet.Plo@am__quote@
     2991@AMDEP_TRUE@@am__include@ @am__quote@pal/$(DEPDIR)/palPrenut.Plo@am__quote@
     2992@AMDEP_TRUE@@am__include@ @am__quote@pal/$(DEPDIR)/palPvobs.Plo@am__quote@
     2993@AMDEP_TRUE@@am__include@ @am__quote@pal/$(DEPDIR)/palRdplan.Plo@am__quote@
     2994@AMDEP_TRUE@@am__include@ @am__quote@pal/$(DEPDIR)/palRefco.Plo@am__quote@
     2995@AMDEP_TRUE@@am__include@ @am__quote@pal/$(DEPDIR)/palRefro.Plo@am__quote@
     2996@AMDEP_TRUE@@am__include@ @am__quote@pal/$(DEPDIR)/palRefz.Plo@am__quote@
     2997@AMDEP_TRUE@@am__include@ @am__quote@slalib/$(DEPDIR)/aoppa.Plo@am__quote@
     2998@AMDEP_TRUE@@am__include@ @am__quote@slalib/$(DEPDIR)/aoppat.Plo@am__quote@
     2999@AMDEP_TRUE@@am__include@ @am__quote@slalib/$(DEPDIR)/aopqk.Plo@am__quote@
     3000@AMDEP_TRUE@@am__include@ @am__quote@slalib/$(DEPDIR)/dat.Plo@am__quote@
     3001@AMDEP_TRUE@@am__include@ @am__quote@slalib/$(DEPDIR)/dcc2s.Plo@am__quote@
     3002@AMDEP_TRUE@@am__include@ @am__quote@slalib/$(DEPDIR)/dcs2c.Plo@am__quote@
     3003@AMDEP_TRUE@@am__include@ @am__quote@slalib/$(DEPDIR)/deuler.Plo@am__quote@
     3004@AMDEP_TRUE@@am__include@ @am__quote@slalib/$(DEPDIR)/dmxm.Plo@am__quote@
     3005@AMDEP_TRUE@@am__include@ @am__quote@slalib/$(DEPDIR)/dmxv.Plo@am__quote@
     3006@AMDEP_TRUE@@am__include@ @am__quote@slalib/$(DEPDIR)/drange.Plo@am__quote@
     3007@AMDEP_TRUE@@am__include@ @am__quote@slalib/$(DEPDIR)/dranrm.Plo@am__quote@
     3008@AMDEP_TRUE@@am__include@ @am__quote@slalib/$(DEPDIR)/dtt.Plo@am__quote@
     3009@AMDEP_TRUE@@am__include@ @am__quote@slalib/$(DEPDIR)/dvdv.Plo@am__quote@
     3010@AMDEP_TRUE@@am__include@ @am__quote@slalib/$(DEPDIR)/dvn.Plo@am__quote@
     3011@AMDEP_TRUE@@am__include@ @am__quote@slalib/$(DEPDIR)/epj.Plo@am__quote@
     3012@AMDEP_TRUE@@am__include@ @am__quote@slalib/$(DEPDIR)/eqeqx.Plo@am__quote@
     3013@AMDEP_TRUE@@am__include@ @am__quote@slalib/$(DEPDIR)/evp.Plo@am__quote@
     3014@AMDEP_TRUE@@am__include@ @am__quote@slalib/$(DEPDIR)/geoc.Plo@am__quote@
     3015@AMDEP_TRUE@@am__include@ @am__quote@slalib/$(DEPDIR)/gmst.Plo@am__quote@
     3016@AMDEP_TRUE@@am__include@ @am__quote@slalib/$(DEPDIR)/mappa.Plo@am__quote@
     3017@AMDEP_TRUE@@am__include@ @am__quote@slalib/$(DEPDIR)/mapqkz.Plo@am__quote@
     3018@AMDEP_TRUE@@am__include@ @am__quote@slalib/$(DEPDIR)/nut.Plo@am__quote@
     3019@AMDEP_TRUE@@am__include@ @am__quote@slalib/$(DEPDIR)/nutc.Plo@am__quote@
     3020@AMDEP_TRUE@@am__include@ @am__quote@slalib/$(DEPDIR)/prec.Plo@am__quote@
     3021@AMDEP_TRUE@@am__include@ @am__quote@slalib/$(DEPDIR)/prenut.Plo@am__quote@
     3022@AMDEP_TRUE@@am__include@ @am__quote@slalib/$(DEPDIR)/refco.Plo@am__quote@
     3023@AMDEP_TRUE@@am__include@ @am__quote@slalib/$(DEPDIR)/refro.Plo@am__quote@
     3024@AMDEP_TRUE@@am__include@ @am__quote@slalib/$(DEPDIR)/refz.Plo@am__quote@
     3025@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/a2af.Plo@am__quote@
     3026@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/a2tf.Plo@am__quote@
     3027@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/af2a.Plo@am__quote@
     3028@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/anp.Plo@am__quote@
     3029@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/anpm.Plo@am__quote@
     3030@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/bpn2xy.Plo@am__quote@
     3031@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/c2s.Plo@am__quote@
     3032@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/cal2jd.Plo@am__quote@
     3033@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/cp.Plo@am__quote@
     3034@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/cr.Plo@am__quote@
     3035@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/d2tf.Plo@am__quote@
     3036@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/dat.Plo@am__quote@
     3037@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/ee06a.Plo@am__quote@
     3038@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/eform.Plo@am__quote@
     3039@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/eors.Plo@am__quote@
     3040@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/epb.Plo@am__quote@
     3041@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/epb2jd.Plo@am__quote@
     3042@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/epj.Plo@am__quote@
     3043@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/epj2jd.Plo@am__quote@
     3044@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/epv00.Plo@am__quote@
     3045@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/era00.Plo@am__quote@
     3046@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/fad03.Plo@am__quote@
     3047@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/fae03.Plo@am__quote@
     3048@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/faf03.Plo@am__quote@
     3049@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/faju03.Plo@am__quote@
     3050@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/fal03.Plo@am__quote@
     3051@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/falp03.Plo@am__quote@
     3052@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/fama03.Plo@am__quote@
     3053@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/fame03.Plo@am__quote@
     3054@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/faom03.Plo@am__quote@
     3055@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/fapa03.Plo@am__quote@
     3056@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/fasa03.Plo@am__quote@
     3057@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/faur03.Plo@am__quote@
     3058@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/fave03.Plo@am__quote@
     3059@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/fk5hip.Plo@am__quote@
     3060@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/fk5hz.Plo@am__quote@
     3061@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/fw2m.Plo@am__quote@
     3062@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/gd2gc.Plo@am__quote@
     3063@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/gd2gce.Plo@am__quote@
     3064@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/gmst06.Plo@am__quote@
     3065@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/gst06.Plo@am__quote@
     3066@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/gst06a.Plo@am__quote@
     3067@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/hfk5z.Plo@am__quote@
     3068@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/ir.Plo@am__quote@
     3069@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/jd2cal.Plo@am__quote@
     3070@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/nut00a.Plo@am__quote@
     3071@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/nut06a.Plo@am__quote@
     3072@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/obl06.Plo@am__quote@
     3073@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/p06e.Plo@am__quote@
     3074@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/pap.Plo@am__quote@
     3075@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/pas.Plo@am__quote@
     3076@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/pdp.Plo@am__quote@
     3077@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/pfw06.Plo@am__quote@
     3078@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/plan94.Plo@am__quote@
     3079@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/pm.Plo@am__quote@
     3080@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/pmat06.Plo@am__quote@
     3081@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/pmp.Plo@am__quote@
     3082@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/pn.Plo@am__quote@
     3083@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/pnm06a.Plo@am__quote@
     3084@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/pv2s.Plo@am__quote@
     3085@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/pxp.Plo@am__quote@
     3086@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/rm2v.Plo@am__quote@
     3087@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/rv2m.Plo@am__quote@
     3088@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/rx.Plo@am__quote@
     3089@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/rxp.Plo@am__quote@
     3090@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/rxpv.Plo@am__quote@
     3091@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/rxr.Plo@am__quote@
     3092@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/ry.Plo@am__quote@
     3093@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/rz.Plo@am__quote@
     3094@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/s06.Plo@am__quote@
     3095@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/s2c.Plo@am__quote@
     3096@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/sepp.Plo@am__quote@
     3097@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/seps.Plo@am__quote@
     3098@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/sxp.Plo@am__quote@
     3099@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/tf2a.Plo@am__quote@
     3100@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/tf2d.Plo@am__quote@
     3101@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/tr.Plo@am__quote@
     3102@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/trxp.Plo@am__quote@
     3103@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/zp.Plo@am__quote@
    21673104@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/Configuration.Plo@am__quote@
    21683105@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/Connection.Plo@am__quote@
     
    22133150@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/argv.Po@am__quote@
    22143151@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/biasctrl.Po@am__quote@
     3152@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/ccdctrl.Po@am__quote@
    22153153@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/chatclient.Po@am__quote@
    22163154@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/chatserv.Po@am__quote@
     
    22193157@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/dimctrl.Po@am__quote@
    22203158@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/dns.Po@am__quote@
    2221 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/drivectrl.Po@am__quote@
    22223159@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/dserver2.Po@am__quote@
    22233160@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/evtserver.Po@am__quote@
     
    22533190@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/showlog.Po@am__quote@
    22543191@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/skypeclient.Po@am__quote@
     3192@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/slalib-test.Po@am__quote@
    22553193@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/smartfact.Po@am__quote@
     3194<<<<<<< .mine
     3195@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/spsctrl.Po@am__quote@
    22563196@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/sqmctrl.Po@am__quote@
     3197=======
     3198@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/sqmctrl.Po@am__quote@
     3199>>>>>>> .r18350
    22573200@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/temperature.Po@am__quote@
    22583201@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/test.Po@am__quote@
     
    25853528        -rm -rf .libs _libs
    25863529        -rm -rf dim/src/.libs dim/src/_libs
     3530        -rm -rf pal/.libs pal/_libs
     3531        -rm -rf slalib/.libs slalib/_libs
     3532        -rm -rf sofa/src/.libs sofa/src/_libs
    25873533        -rm -rf src/.libs src/_libs
    25883534
     
    29343880        -rm -f gui/RawEventsViewer/$(DEPDIR)/$(am__dirstamp)
    29353881        -rm -f gui/RawEventsViewer/$(am__dirstamp)
     3882        -rm -f pal/$(DEPDIR)/$(am__dirstamp)
     3883        -rm -f pal/$(am__dirstamp)
     3884        -rm -f slalib/$(DEPDIR)/$(am__dirstamp)
     3885        -rm -f slalib/$(am__dirstamp)
     3886        -rm -f sofa/src/$(DEPDIR)/$(am__dirstamp)
     3887        -rm -f sofa/src/$(am__dirstamp)
    29363888        -rm -f src/$(DEPDIR)/$(am__dirstamp)
    29373889        -rm -f src/$(am__dirstamp)
     
    29483900distclean: distclean-am
    29493901        -rm -f $(am__CONFIG_DISTCLEAN_FILES)
    2950         -rm -rf ./$(DEPDIR) dim/src/$(DEPDIR) dim/src/did/$(DEPDIR) dim/src/webDid/$(DEPDIR) gui/$(DEPDIR) gui/RawEventsViewer/$(DEPDIR) src/$(DEPDIR)
     3902        -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)
    29513903        -rm -f Makefile
    29523904distclean-am: clean-am distclean-compile distclean-generic \
     
    29973949        -rm -f $(am__CONFIG_DISTCLEAN_FILES)
    29983950        -rm -rf $(top_srcdir)/autom4te.cache
    2999         -rm -rf ./$(DEPDIR) dim/src/$(DEPDIR) dim/src/did/$(DEPDIR) dim/src/webDid/$(DEPDIR) gui/$(DEPDIR) gui/RawEventsViewer/$(DEPDIR) src/$(DEPDIR)
     3951        -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)
    30003952        -rm -f Makefile
    30013953maintainer-clean-am: distclean-am maintainer-clean-generic
Note: See TracChangeset for help on using the changeset viewer.