Index: trunk/FACT++/Makefile.am =================================================================== --- trunk/FACT++/Makefile.am (revision 14493) +++ trunk/FACT++/Makefile.am (revision 14494) @@ -48,5 +48,5 @@ if HAS_SOPRANO -bin_PROGRAMS += tngweather +bin_PROGRAMS += tngweather lidctrl pwrctrl endif @@ -62,4 +62,13 @@ bin_PROGRAMS += moon endif + +if HAS_ROOT +if HAS_SQL +if HAS_NOVA +bin_PROGRAMS += makeplots +endif +endif +endif + if HAS_LIBXP @@ -250,4 +259,7 @@ moon_LDADD = libTime.la libConfiguration.la +makeplots_SOURCES = src/makeplots.cc +makeplots_LDADD = $(ROOTLDFLAGS) $(ROOTLIBS) libTime.la libConfiguration.la + chatserv_SOURCES = src/chatserv.cc src/LocalControl.h @@ -279,4 +291,14 @@ libStateMachine.la libTools.la libTime.la \ libConfiguration.la + +lidctrl_SOURCES = src/lidctrl.cc src/LocalControl.h +lidctrl_LDADD = libDim++.la libDim.la libDimExtension.la \ + libStateMachine.la libTools.la libTime.la \ + libConfiguration.la -lQtWebKit -lQtXml + +pwrctrl_SOURCES = src/pwrctrl.cc src/LocalControl.h +pwrctrl_LDADD = libDim++.la libDim.la libDimExtension.la \ + libStateMachine.la libTools.la libTime.la \ + libConfiguration.la -lQtWebKit -lQtXml timecheck_SOURCES = src/timecheck.cc src/LocalControl.h Index: trunk/FACT++/Makefile.in =================================================================== --- trunk/FACT++/Makefile.in (revision 14493) +++ trunk/FACT++/Makefile.in (revision 14494) @@ -52,14 +52,15 @@ fitscheck$(EXEEXT) $(am__EXEEXT_1) $(am__EXEEXT_2) \ $(am__EXEEXT_3) $(am__EXEEXT_4) $(am__EXEEXT_5) \ - $(am__EXEEXT_6) $(am__EXEEXT_7) + $(am__EXEEXT_6) $(am__EXEEXT_7) $(am__EXEEXT_8) @HAS_GUI_TRUE@am__append_1 = fact -@HAS_SOPRANO_TRUE@am__append_2 = tngweather +@HAS_SOPRANO_TRUE@am__append_2 = tngweather lidctrl pwrctrl @HAS_DBUS_TRUE@am__append_3 = skypeclient @HAS_VIEWER_TRUE@am__append_4 = viewer @HAS_NOVA_TRUE@am__append_5 = moon -@HAS_LIBXP_TRUE@am__append_6 = did +@HAS_NOVA_TRUE@@HAS_ROOT_TRUE@@HAS_SQL_TRUE@am__append_6 = makeplots +@HAS_LIBXP_TRUE@am__append_7 = did # This is a trick to be able to build them but not having them in 'all' -@IS_FALSE@am__append_7 = \ +@IS_FALSE@am__append_8 = \ @IS_FALSE@ test scheduler \ @IS_FALSE@ triggerschedule \ @@ -69,15 +70,15 @@ @IS_FALSE@ readfits -@HAS_FITS_TRUE@am__append_8 = src/FitsFile.h src/FitsFile.cc \ +@HAS_FITS_TRUE@am__append_9 = src/FitsFile.h src/FitsFile.cc \ @HAS_FITS_TRUE@ src/DataWriteFits.cc src/DataWriteFits.h \ @HAS_FITS_TRUE@ src/DataWriteFits2.cc src/DataWriteFits2.h -@HAS_FITS_TRUE@am__append_9 = src/FitsFile.h src/FitsFile.cc src/Fits.h src/Fits.cc -@HAS_GROFF_TRUE@am__append_10 = $(dist_man1_MANS:.man=.html) -@HAS_GROFF_TRUE@am__append_11 = $(dist_man1_MANS:.man=.html) +@HAS_FITS_TRUE@am__append_10 = src/FitsFile.h src/FitsFile.cc src/Fits.h src/Fits.cc +@HAS_GROFF_TRUE@am__append_11 = $(dist_man1_MANS:.man=.html) @HAS_GROFF_TRUE@am__append_12 = $(dist_man1_MANS:.man=.html) -@HAS_GROFF_TRUE@@HAS_PS2PDF_TRUE@am__append_13 = $(dist_man1_MANS:.man=.pdf) +@HAS_GROFF_TRUE@am__append_13 = $(dist_man1_MANS:.man=.html) @HAS_GROFF_TRUE@@HAS_PS2PDF_TRUE@am__append_14 = $(dist_man1_MANS:.man=.pdf) @HAS_GROFF_TRUE@@HAS_PS2PDF_TRUE@am__append_15 = $(dist_man1_MANS:.man=.pdf) +@HAS_GROFF_TRUE@@HAS_PS2PDF_TRUE@am__append_16 = $(dist_man1_MANS:.man=.pdf) subdir = . DIST_COMMON = README $(am__configure_deps) $(dist_man1_MANS) \ @@ -183,10 +184,12 @@ libTools_la_OBJECTS = $(am_libTools_la_OBJECTS) @HAS_GUI_TRUE@am__EXEEXT_1 = fact$(EXEEXT) -@HAS_SOPRANO_TRUE@am__EXEEXT_2 = tngweather$(EXEEXT) +@HAS_SOPRANO_TRUE@am__EXEEXT_2 = tngweather$(EXEEXT) lidctrl$(EXEEXT) \ +@HAS_SOPRANO_TRUE@ pwrctrl$(EXEEXT) @HAS_DBUS_TRUE@am__EXEEXT_3 = skypeclient$(EXEEXT) @HAS_VIEWER_TRUE@am__EXEEXT_4 = viewer$(EXEEXT) @HAS_NOVA_TRUE@am__EXEEXT_5 = moon$(EXEEXT) -@HAS_LIBXP_TRUE@am__EXEEXT_6 = did$(EXEEXT) -@IS_FALSE@am__EXEEXT_7 = test$(EXEEXT) scheduler$(EXEEXT) \ +@HAS_NOVA_TRUE@@HAS_ROOT_TRUE@@HAS_SQL_TRUE@am__EXEEXT_6 = makeplots$(EXEEXT) +@HAS_LIBXP_TRUE@am__EXEEXT_7 = did$(EXEEXT) +@IS_FALSE@am__EXEEXT_8 = test$(EXEEXT) scheduler$(EXEEXT) \ @IS_FALSE@ triggerschedule$(EXEEXT) dclient5$(EXEEXT) \ @IS_FALSE@ dserver2$(EXEEXT) fitsloader$(EXEEXT) \ @@ -332,4 +335,8 @@ ftmctrl_DEPENDENCIES = libDim++.la libDim.la libDimExtension.la \ libStateMachine.la libTime.la libTools.la libConfiguration.la +am_lidctrl_OBJECTS = src/lidctrl.$(OBJEXT) +lidctrl_OBJECTS = $(am_lidctrl_OBJECTS) +lidctrl_DEPENDENCIES = libDim++.la libDim.la libDimExtension.la \ + libStateMachine.la libTools.la libTime.la libConfiguration.la am_log_OBJECTS = src/log.$(OBJEXT) log_OBJECTS = $(am_log_OBJECTS) @@ -344,4 +351,8 @@ magicweather_DEPENDENCIES = libDim++.la libDim.la libDimExtension.la \ libStateMachine.la libTools.la libTime.la libConfiguration.la +am_makeplots_OBJECTS = src/makeplots.$(OBJEXT) +makeplots_OBJECTS = $(am_makeplots_OBJECTS) +makeplots_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + libTime.la libConfiguration.la am_mcp_OBJECTS = src/mcp.$(OBJEXT) mcp_OBJECTS = $(am_mcp_OBJECTS) @@ -351,4 +362,8 @@ moon_OBJECTS = $(am_moon_OBJECTS) moon_DEPENDENCIES = libTime.la libConfiguration.la +am_pwrctrl_OBJECTS = src/pwrctrl.$(OBJEXT) +pwrctrl_OBJECTS = $(am_pwrctrl_OBJECTS) +pwrctrl_DEPENDENCIES = libDim++.la libDim.la libDimExtension.la \ + libStateMachine.la libTools.la libTime.la libConfiguration.la am_ratecontrol_OBJECTS = src/ratecontrol.$(OBJEXT) \ src/PixelMap.$(OBJEXT) @@ -480,10 +495,11 @@ $(fitsdump_SOURCES) fitsgrep.c $(fitsloader_SOURCES) \ $(fsc_SOURCES) $(fscctrl_SOURCES) $(ftm_SOURCES) \ - $(ftmctrl_SOURCES) $(log_SOURCES) $(logtime_SOURCES) \ - $(magicweather_SOURCES) $(mcp_SOURCES) $(moon_SOURCES) \ - $(ratecontrol_SOURCES) $(ratescan_SOURCES) $(readfits_SOURCES) \ - sched.c $(scheduler_SOURCES) $(skypeclient_SOURCES) \ - $(smartfact_SOURCES) $(test_SOURCES) $(time_SOURCES) \ - $(timecheck_SOURCES) $(tngweather_SOURCES) \ + $(ftmctrl_SOURCES) $(lidctrl_SOURCES) $(log_SOURCES) \ + $(logtime_SOURCES) $(magicweather_SOURCES) \ + $(makeplots_SOURCES) $(mcp_SOURCES) $(moon_SOURCES) \ + $(pwrctrl_SOURCES) $(ratecontrol_SOURCES) $(ratescan_SOURCES) \ + $(readfits_SOURCES) sched.c $(scheduler_SOURCES) \ + $(skypeclient_SOURCES) $(smartfact_SOURCES) $(test_SOURCES) \ + $(time_SOURCES) $(timecheck_SOURCES) $(tngweather_SOURCES) \ $(triggerschedule_SOURCES) $(viewer_SOURCES) DIST_SOURCES = $(libConfiguration_la_SOURCES) $(libDim___la_SOURCES) \ @@ -499,7 +515,8 @@ $(fitscheck_SOURCES) $(fitsdump_SOURCES) fitsgrep.c \ $(fitsloader_SOURCES) $(fsc_SOURCES) $(fscctrl_SOURCES) \ - $(ftm_SOURCES) $(ftmctrl_SOURCES) $(log_SOURCES) \ - $(logtime_SOURCES) $(magicweather_SOURCES) $(mcp_SOURCES) \ - $(moon_SOURCES) $(ratecontrol_SOURCES) $(ratescan_SOURCES) \ + $(ftm_SOURCES) $(ftmctrl_SOURCES) $(lidctrl_SOURCES) \ + $(log_SOURCES) $(logtime_SOURCES) $(magicweather_SOURCES) \ + $(makeplots_SOURCES) $(mcp_SOURCES) $(moon_SOURCES) \ + $(pwrctrl_SOURCES) $(ratecontrol_SOURCES) $(ratescan_SOURCES) \ $(readfits_SOURCES) sched.c $(scheduler_SOURCES) \ $(skypeclient_SOURCES) $(smartfact_SOURCES) $(test_SOURCES) \ @@ -773,5 +790,5 @@ #------------------------------------------------------------------------- -CLEANFILES = $(BUILT_SOURCES) $(am__append_12) $(am__append_15) +CLEANFILES = $(BUILT_SOURCES) $(am__append_13) $(am__append_16) dist_noinst_SCRIPTS = autogen.sh EXTRA_DIST = Doxyfile dim/DIM_Performance.pdf dim/LICENSE.GPL \ @@ -781,5 +798,5 @@ dim/README_v17.txt dim/README_v18.txt dim/README_v19.txt \ $(fact_DIALOGS) $(fact_RESOURCES) $(viewer_DIALOGS) \ - $(viewer_RESOURCES) $(am__append_11) $(am__append_14) + $(viewer_RESOURCES) $(am__append_12) $(am__append_15) dns_LDADD = libDim.la libDimExtension.la dns_SOURCES = src/dns.c @@ -898,4 +915,6 @@ moon_SOURCES = src/moon.cc moon_LDADD = libTime.la libConfiguration.la +makeplots_SOURCES = src/makeplots.cc +makeplots_LDADD = $(ROOTLDFLAGS) $(ROOTLIBS) libTime.la libConfiguration.la chatserv_SOURCES = src/chatserv.cc src/LocalControl.h chatserv_LDADD = libStateMachine.la libTools.la libConfiguration.la libTime.la \ @@ -926,4 +945,14 @@ libConfiguration.la +lidctrl_SOURCES = src/lidctrl.cc src/LocalControl.h +lidctrl_LDADD = libDim++.la libDim.la libDimExtension.la \ + libStateMachine.la libTools.la libTime.la \ + libConfiguration.la -lQtWebKit -lQtXml + +pwrctrl_SOURCES = src/pwrctrl.cc src/LocalControl.h +pwrctrl_LDADD = libDim++.la libDim.la libDimExtension.la \ + libStateMachine.la libTools.la libTime.la \ + libConfiguration.la -lQtWebKit -lQtXml + timecheck_SOURCES = src/timecheck.cc src/LocalControl.h timecheck_LDADD = libDim++.la libDim.la libDimExtension.la \ @@ -940,5 +969,5 @@ src/DataProcessorImp.h src/DataCalib.cc src/DataCalib.h \ src/DataWriteRaw.cc src/DataWriteRaw.h src/DrsCalib.h \ - $(am__append_8) + $(am__append_9) fadctrl_LDADD = libDim++.la libDim.la libDimExtension.la \ libStateMachine.la libTools.la libTime.la \ @@ -1002,5 +1031,5 @@ test_LDADD = libStateMachine.la libTools.la libTime.la libDim++.la libDim.la libConfiguration.la datalogger_SOURCES = src/datalogger.cc src/LocalControl.h \ - src/DimState.cc src/DimState.h $(am__append_9) + src/DimState.cc src/DimState.h $(am__append_10) datalogger_LDADD = libDim++.la libDim.la libDimExtension.la \ libStateMachine.la libTools.la libTime.la \ @@ -1081,5 +1110,5 @@ #------------------------------------------------------------------------- -MAN_TARGETS = $(dist_man1_MANS) $(am__append_10) $(am__append_13) +MAN_TARGETS = $(dist_man1_MANS) $(am__append_11) $(am__append_14) all: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) all-am @@ -1491,4 +1520,9 @@ @rm -f ftmctrl$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(ftmctrl_OBJECTS) $(ftmctrl_LDADD) $(LIBS) +src/lidctrl.$(OBJEXT): src/$(am__dirstamp) \ + src/$(DEPDIR)/$(am__dirstamp) +lidctrl$(EXEEXT): $(lidctrl_OBJECTS) $(lidctrl_DEPENDENCIES) $(EXTRA_lidctrl_DEPENDENCIES) + @rm -f lidctrl$(EXEEXT) + $(AM_V_CXXLD)$(CXXLINK) $(lidctrl_OBJECTS) $(lidctrl_LDADD) $(LIBS) src/log.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp) log$(EXEEXT): $(log_OBJECTS) $(log_DEPENDENCIES) $(EXTRA_log_DEPENDENCIES) @@ -1505,4 +1539,9 @@ @rm -f magicweather$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(magicweather_OBJECTS) $(magicweather_LDADD) $(LIBS) +src/makeplots.$(OBJEXT): src/$(am__dirstamp) \ + src/$(DEPDIR)/$(am__dirstamp) +makeplots$(EXEEXT): $(makeplots_OBJECTS) $(makeplots_DEPENDENCIES) $(EXTRA_makeplots_DEPENDENCIES) + @rm -f makeplots$(EXEEXT) + $(AM_V_CXXLD)$(CXXLINK) $(makeplots_OBJECTS) $(makeplots_LDADD) $(LIBS) src/mcp.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp) mcp$(EXEEXT): $(mcp_OBJECTS) $(mcp_DEPENDENCIES) $(EXTRA_mcp_DEPENDENCIES) @@ -1513,4 +1552,9 @@ @rm -f moon$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(moon_OBJECTS) $(moon_LDADD) $(LIBS) +src/pwrctrl.$(OBJEXT): src/$(am__dirstamp) \ + src/$(DEPDIR)/$(am__dirstamp) +pwrctrl$(EXEEXT): $(pwrctrl_OBJECTS) $(pwrctrl_DEPENDENCIES) $(EXTRA_pwrctrl_DEPENDENCIES) + @rm -f pwrctrl$(EXEEXT) + $(AM_V_CXXLD)$(CXXLINK) $(pwrctrl_OBJECTS) $(pwrctrl_LDADD) $(LIBS) src/ratecontrol.$(OBJEXT): src/$(am__dirstamp) \ src/$(DEPDIR)/$(am__dirstamp) @@ -1759,9 +1803,12 @@ -rm -f src/ftm.$(OBJEXT) -rm -f src/ftmctrl.$(OBJEXT) + -rm -f src/lidctrl.$(OBJEXT) -rm -f src/log.$(OBJEXT) -rm -f src/logtime.$(OBJEXT) -rm -f src/magicweather.$(OBJEXT) + -rm -f src/makeplots.$(OBJEXT) -rm -f src/mcp.$(OBJEXT) -rm -f src/moon.$(OBJEXT) + -rm -f src/pwrctrl.$(OBJEXT) -rm -f src/ratecontrol.$(OBJEXT) -rm -f src/ratescan.$(OBJEXT) @@ -1893,9 +1940,12 @@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/ftm.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/ftmctrl.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/lidctrl.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/log.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/logtime.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/magicweather.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/makeplots.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@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/pwrctrl.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/ratecontrol.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/ratescan.Po@am__quote@