Index: /trunk/FACT++/Makefile.in =================================================================== --- /trunk/FACT++/Makefile.in (revision 18495) +++ /trunk/FACT++/Makefile.in (revision 18496) @@ -42,8 +42,8 @@ $(libDim_la_HEADERS) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/aminclude.am \ - $(top_srcdir)/configure .aux_dir/compile .aux_dir/config.guess \ - .aux_dir/config.sub .aux_dir/depcomp .aux_dir/install-sh \ - .aux_dir/ltmain.sh .aux_dir/missing AUTHORS COPYING ChangeLog \ - INSTALL NEWS + $(top_srcdir)/configure .aux_dir/ar-lib .aux_dir/compile \ + .aux_dir/config.guess .aux_dir/config.sub .aux_dir/depcomp \ + .aux_dir/install-sh .aux_dir/ltmain.sh .aux_dir/missing \ + AUTHORS COPYING ChangeLog INSTALL NEWS bin_PROGRAMS = dns$(EXEEXT) log$(EXEEXT) logtime$(EXEEXT) \ time$(EXEEXT) argv$(EXEEXT) dimctrl$(EXEEXT) \ @@ -59,13 +59,13 @@ timecheck$(EXEEXT) showlog$(EXEEXT) fitsdump$(EXEEXT) \ fitscheck$(EXEEXT) fitsselect$(EXEEXT) zfits$(EXEEXT) \ - $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_3) \ - $(am__EXEEXT_4) $(am__EXEEXT_5) $(am__EXEEXT_6) \ - $(am__EXEEXT_7) $(am__EXEEXT_8) + rootifysql$(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) @HAS_GUI_TRUE@am__append_1 = fact @HAS_DBUS_TRUE@am__append_2 = skypeclient @HAS_VIEWER_TRUE@am__append_3 = viewer @HAS_NOVA_TRUE@am__append_4 = moon -@HAS_NOVA_TRUE@@HAS_SQL_TRUE@am__append_5 = makedata -@HAS_NOVA_TRUE@@HAS_ROOT_TRUE@@HAS_SQL_TRUE@am__append_6 = makeplots +@HAS_NOVA_TRUE@@HAS_SQL_TRUE@am__append_5 = makedata makeschedule +@HAS_NOVA_TRUE@@HAS_ROOT_TRUE@@HAS_SQL_TRUE@am__append_6 = makeplots rootifysql @HAS_LIBXP_TRUE@am__append_7 = did webDid @@ -202,7 +202,5 @@ erfa/src/d2tf.lo erfa/src/epb.lo erfa/src/rv2m.lo \ erfa/src/pap.lo erfa/src/fad03.lo erfa/src/pmp.lo \ - erfa/src/tr.lo erfa/src/falp03.lo sofa/src/anpm.lo \ - sofa/src/rxr.lo sofa/src/s2c.lo sofa/src/c2s.lo sofa/src/cr.lo \ - sofa/src/cp.lo + erfa/src/tr.lo erfa/src/falp03.lo libPal_la_OBJECTS = $(am_libPal_la_OBJECTS) libStateMachine_la_LIBADD = @@ -228,6 +226,8 @@ @HAS_VIEWER_TRUE@am__EXEEXT_3 = viewer$(EXEEXT) @HAS_NOVA_TRUE@am__EXEEXT_4 = moon$(EXEEXT) -@HAS_NOVA_TRUE@@HAS_SQL_TRUE@am__EXEEXT_5 = makedata$(EXEEXT) -@HAS_NOVA_TRUE@@HAS_ROOT_TRUE@@HAS_SQL_TRUE@am__EXEEXT_6 = makeplots$(EXEEXT) +@HAS_NOVA_TRUE@@HAS_SQL_TRUE@am__EXEEXT_5 = makedata$(EXEEXT) \ +@HAS_NOVA_TRUE@@HAS_SQL_TRUE@ makeschedule$(EXEEXT) +@HAS_NOVA_TRUE@@HAS_ROOT_TRUE@@HAS_SQL_TRUE@am__EXEEXT_6 = makeplots$(EXEEXT) \ +@HAS_NOVA_TRUE@@HAS_ROOT_TRUE@@HAS_SQL_TRUE@ rootifysql$(EXEEXT) @HAS_LIBXP_TRUE@am__EXEEXT_7 = did$(EXEEXT) webDid$(EXEEXT) @IS_FALSE@am__EXEEXT_8 = ftm$(EXEEXT) fsc$(EXEEXT) fad$(EXEEXT) \ @@ -436,4 +436,7 @@ makeplots_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ libTime.la libConfiguration.la +am_makeschedule_OBJECTS = src/makeschedule.$(OBJEXT) +makeschedule_OBJECTS = $(am_makeschedule_OBJECTS) +makeschedule_DEPENDENCIES = libTime.la libConfiguration.la libTools.la am_mcp_OBJECTS = src/mcp.$(OBJEXT) mcp_OBJECTS = $(am_mcp_OBJECTS) @@ -464,4 +467,8 @@ readfits_DEPENDENCIES = libStateMachine.la libTools.la libTime.la \ libDim++.la libDim.la libConfiguration.la +am_rootifysql_OBJECTS = src/rootifysql.$(OBJEXT) +rootifysql_OBJECTS = $(am_rootifysql_OBJECTS) +rootifysql_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + libTime.la libConfiguration.la sched_SOURCES = sched.c sched_OBJECTS = sched.$(OBJEXT) @@ -606,11 +613,11 @@ $(log_SOURCES) $(logtime_SOURCES) $(magiclidar_SOURCES) \ $(magicweather_SOURCES) $(makedata_SOURCES) \ - $(makeplots_SOURCES) $(mcp_SOURCES) $(moon_SOURCES) \ - $(pfminictrl_SOURCES) $(pwrctrl_SOURCES) \ + $(makeplots_SOURCES) $(makeschedule_SOURCES) $(mcp_SOURCES) \ + $(moon_SOURCES) $(pfminictrl_SOURCES) $(pwrctrl_SOURCES) \ $(ratecontrol_SOURCES) $(ratescan_SOURCES) $(readfits_SOURCES) \ - sched.c $(scheduler_SOURCES) $(showlog_SOURCES) \ - $(skypeclient_SOURCES) $(smartfact_SOURCES) $(sqmctrl_SOURCES) \ - $(temperature_SOURCES) $(test_SOURCES) $(time_SOURCES) \ - $(timecheck_SOURCES) $(tngweather_SOURCES) \ + $(rootifysql_SOURCES) sched.c $(scheduler_SOURCES) \ + $(showlog_SOURCES) $(skypeclient_SOURCES) $(smartfact_SOURCES) \ + $(sqmctrl_SOURCES) $(temperature_SOURCES) $(test_SOURCES) \ + $(time_SOURCES) $(timecheck_SOURCES) $(tngweather_SOURCES) \ $(triggerschedule_SOURCES) $(viewer_SOURCES) $(webDid_SOURCES) \ $(zfits_SOURCES) @@ -633,11 +640,12 @@ $(lidctrl_SOURCES) $(log_SOURCES) $(logtime_SOURCES) \ $(magiclidar_SOURCES) $(magicweather_SOURCES) \ - $(makedata_SOURCES) $(makeplots_SOURCES) $(mcp_SOURCES) \ - $(moon_SOURCES) $(pfminictrl_SOURCES) $(pwrctrl_SOURCES) \ + $(makedata_SOURCES) $(makeplots_SOURCES) \ + $(makeschedule_SOURCES) $(mcp_SOURCES) $(moon_SOURCES) \ + $(pfminictrl_SOURCES) $(pwrctrl_SOURCES) \ $(ratecontrol_SOURCES) $(ratescan_SOURCES) $(readfits_SOURCES) \ - sched.c $(scheduler_SOURCES) $(showlog_SOURCES) \ - $(skypeclient_SOURCES) $(smartfact_SOURCES) $(sqmctrl_SOURCES) \ - $(temperature_SOURCES) $(test_SOURCES) $(time_SOURCES) \ - $(timecheck_SOURCES) $(tngweather_SOURCES) \ + $(rootifysql_SOURCES) sched.c $(scheduler_SOURCES) \ + $(showlog_SOURCES) $(skypeclient_SOURCES) $(smartfact_SOURCES) \ + $(sqmctrl_SOURCES) $(temperature_SOURCES) $(test_SOURCES) \ + $(time_SOURCES) $(timecheck_SOURCES) $(tngweather_SOURCES) \ $(triggerschedule_SOURCES) $(am__viewer_SOURCES_DIST) \ $(webDid_SOURCES) $(zfits_SOURCES) @@ -686,4 +694,5 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CURL = @CURL@ CXX = @CXX@ CXXCPP = @CXXCPP@ @@ -906,5 +915,5 @@ BOOST_FLAGS = -DBOOST_DISABLE_ASSERTS AM_CFLAGS = -pedantic -AM_CPPFLAGS = -Idim/dim -Ipal -Isofa/src -Ierfa/src \ +AM_CPPFLAGS = -Idim/dim -Ipal -Ierfa/src \ $(DIM_FLAGS) $(BOOST_FLAGS) $(ROOTCPPFLAGS) \ -Wall -Winit-self -Wpointer-arith -Wcast-align -Wextra -Wformat=2 \ @@ -1089,5 +1098,5 @@ erfa/src/pmat06.c erfa/src/epv00.c erfa/src/plan94.c \ erfa/src/anpm.c erfa/src/obl06.c erfa/src/dat.c \ - erfa/src/af2a.c erfa/src/rxr.c erfa/src/gmst06.c \ + erfa/src/af2a.c erfa/src/rxr.c erfa/src/gmst06.c \ erfa/src/sepp.c erfa/src/rz.c erfa/src/zp.c \ erfa/src/rxpv.c erfa/src/pn.c erfa/src/cr.c \ @@ -1111,8 +1120,5 @@ erfa/src/d2tf.c erfa/src/epb.c erfa/src/rv2m.c \ erfa/src/pap.c erfa/src/fad03.c erfa/src/pmp.c \ - erfa/src/tr.c erfa/src/falp03.c \ - \ - sofa/src/anpm.c sofa/src/rxr.c sofa/src/s2c.c \ - sofa/src/c2s.c sofa/src/cr.c sofa/src/cp.c + erfa/src/tr.c erfa/src/falp03.c dserver2_SOURCES = src/dserver2.cc @@ -1130,8 +1136,12 @@ moon_SOURCES = src/moon.cc moon_LDADD = libTime.la libConfiguration.la +rootifysql_SOURCES = src/rootifysql.cc +rootifysql_LDADD = $(ROOTLDFLAGS) $(ROOTLIBS) libTime.la libConfiguration.la makeplots_SOURCES = src/makeplots.cc makeplots_LDADD = $(ROOTLDFLAGS) $(ROOTLIBS) libTime.la libConfiguration.la makedata_SOURCES = src/makedata.cc makedata_LDADD = libTime.la libConfiguration.la +makeschedule_SOURCES = src/makeschedule.cc +makeschedule_LDADD = libTime.la libConfiguration.la libTools.la chatserv_SOURCES = src/chatserv.cc src/LocalControl.h chatserv_LDADD = libStateMachine.la libTools.la libConfiguration.la libTime.la \ @@ -1717,22 +1727,4 @@ erfa/src/falp03.lo: erfa/src/$(am__dirstamp) \ erfa/src/$(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/anpm.lo: sofa/src/$(am__dirstamp) \ - sofa/src/$(DEPDIR)/$(am__dirstamp) -sofa/src/rxr.lo: sofa/src/$(am__dirstamp) \ - sofa/src/$(DEPDIR)/$(am__dirstamp) -sofa/src/s2c.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/cr.lo: sofa/src/$(am__dirstamp) \ - sofa/src/$(DEPDIR)/$(am__dirstamp) -sofa/src/cp.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) @@ -2087,4 +2079,9 @@ @rm -f makeplots$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(makeplots_OBJECTS) $(makeplots_LDADD) $(LIBS) +src/makeschedule.$(OBJEXT): src/$(am__dirstamp) \ + src/$(DEPDIR)/$(am__dirstamp) +makeschedule$(EXEEXT): $(makeschedule_OBJECTS) $(makeschedule_DEPENDENCIES) $(EXTRA_makeschedule_DEPENDENCIES) + @rm -f makeschedule$(EXEEXT) + $(AM_V_CXXLD)$(CXXLINK) $(makeschedule_OBJECTS) $(makeschedule_LDADD) $(LIBS) src/mcp.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp) mcp$(EXEEXT): $(mcp_OBJECTS) $(mcp_DEPENDENCIES) $(EXTRA_mcp_DEPENDENCIES) @@ -2122,4 +2119,9 @@ @rm -f readfits$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(readfits_OBJECTS) $(readfits_LDADD) $(LIBS) +src/rootifysql.$(OBJEXT): src/$(am__dirstamp) \ + src/$(DEPDIR)/$(am__dirstamp) +rootifysql$(EXEEXT): $(rootifysql_OBJECTS) $(rootifysql_DEPENDENCIES) $(EXTRA_rootifysql_DEPENDENCIES) + @rm -f rootifysql$(EXEEXT) + $(AM_V_CXXLD)$(CXXLINK) $(rootifysql_OBJECTS) $(rootifysql_LDADD) $(LIBS) sched$(EXEEXT): $(sched_OBJECTS) $(sched_DEPENDENCIES) $(EXTRA_sched_DEPENDENCIES) @rm -f sched$(EXEEXT) @@ -2508,16 +2510,4 @@ -rm -f pal/palRefz.$(OBJEXT) -rm -f pal/palRefz.lo - -rm -f sofa/src/anpm.$(OBJEXT) - -rm -f sofa/src/anpm.lo - -rm -f sofa/src/c2s.$(OBJEXT) - -rm -f sofa/src/c2s.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/rxr.$(OBJEXT) - -rm -f sofa/src/rxr.lo - -rm -f sofa/src/s2c.$(OBJEXT) - -rm -f sofa/src/s2c.lo -rm -f src/Configuration.$(OBJEXT) -rm -f src/Configuration.lo @@ -2628,4 +2618,5 @@ -rm -f src/makedata.$(OBJEXT) -rm -f src/makeplots.$(OBJEXT) + -rm -f src/makeschedule.$(OBJEXT) -rm -f src/mcp.$(OBJEXT) -rm -f src/moon.$(OBJEXT) @@ -2635,4 +2626,5 @@ -rm -f src/ratescan.$(OBJEXT) -rm -f src/readfits.$(OBJEXT) + -rm -f src/rootifysql.$(OBJEXT) -rm -f src/scheduler.$(OBJEXT) -rm -f src/showlog.$(OBJEXT) @@ -2809,10 +2801,4 @@ @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@sofa/src/$(DEPDIR)/anpm.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)/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)/rxr.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@sofa/src/$(DEPDIR)/s2c.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@ @@ -2894,4 +2880,5 @@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/makedata.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/makeplots.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/makeschedule.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/mcp.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/moon.Po@am__quote@ @@ -2901,4 +2888,5 @@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/ratescan.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/readfits.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/rootifysql.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/scheduler.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/showlog.Po@am__quote@ @@ -3238,5 +3226,4 @@ -rm -rf erfa/src/.libs erfa/src/_libs -rm -rf pal/.libs pal/_libs - -rm -rf sofa/src/.libs sofa/src/_libs -rm -rf src/.libs src/_libs @@ -3592,6 +3579,4 @@ -rm -f pal/$(DEPDIR)/$(am__dirstamp) -rm -f pal/$(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) @@ -3608,5 +3593,5 @@ distclean: distclean-am -rm -f $(am__CONFIG_DISTCLEAN_FILES) - -rm -rf ./$(DEPDIR) dim/src/$(DEPDIR) dim/src/did/$(DEPDIR) dim/src/webDid/$(DEPDIR) erfa/src/$(DEPDIR) gui/$(DEPDIR) gui/RawEventsViewer/$(DEPDIR) pal/$(DEPDIR) sofa/src/$(DEPDIR) src/$(DEPDIR) + -rm -rf ./$(DEPDIR) dim/src/$(DEPDIR) dim/src/did/$(DEPDIR) dim/src/webDid/$(DEPDIR) erfa/src/$(DEPDIR) gui/$(DEPDIR) gui/RawEventsViewer/$(DEPDIR) pal/$(DEPDIR) src/$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ @@ -3657,5 +3642,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) erfa/src/$(DEPDIR) gui/$(DEPDIR) gui/RawEventsViewer/$(DEPDIR) pal/$(DEPDIR) sofa/src/$(DEPDIR) src/$(DEPDIR) + -rm -rf ./$(DEPDIR) dim/src/$(DEPDIR) dim/src/did/$(DEPDIR) dim/src/webDid/$(DEPDIR) erfa/src/$(DEPDIR) gui/$(DEPDIR) gui/RawEventsViewer/$(DEPDIR) pal/$(DEPDIR) src/$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -3773,13 +3758,9 @@ doc: $(MAN_TARGETS) $(JAVA_SCRIPT_DOC) doxygen-run - @cd doxygen-doc/html - @ln -s index.html main.html - @mkdir -p pdf - @mkdir -p man - @cd pdf - @ln -sf ../../../*.pdf . - @cd ../man - @ln -sf ../../../*.html . - @cd ../../.. + @ln -sfv doxygen-doc/html/index.html doxygen-doc/html/main.html + @mkdir -vp doxygen-doc/html/pdf + @mkdir -vp doxygen-doc/html/man + @ln -sfv `pwd`/*.pdf doxygen-doc/html/pdf/ + @ln -sfv `pwd`/*.html doxygen-doc/html/man/ diff: