Index: /trunk/FACT++/Makefile.in =================================================================== --- /trunk/FACT++/Makefile.in (revision 10659) +++ /trunk/FACT++/Makefile.in (revision 10660) @@ -58,5 +58,5 @@ @IS_FALSE@ chatclient chatserv \ @IS_FALSE@ fitsgrep test \ -@IS_FALSE@ sched astro +@IS_FALSE@ sched astro fadctrl @HAS_HELP2MAN_TRUE@am__append_3 = $(dist_man1_MANS) @@ -116,5 +116,5 @@ libConfiguration_la_LIBADD = am__dirstamp = $(am__leading_dot)dirstamp -am_libConfiguration_la_OBJECTS = src/Configuration.lo +am_libConfiguration_la_OBJECTS = src/Configuration.lo src/FACT.lo libConfiguration_la_OBJECTS = $(am_libConfiguration_la_OBJECTS) AM_V_lt = $(am__v_lt_$(V)) @@ -123,5 +123,5 @@ libDim___la_LIBADD = am_libDim___la_OBJECTS = dim/src/diccpp.lo dim/src/dimcpp.lo \ - dim/src/tokenstring.lo dim/src/discpp.lo + dim/src/tokenstring.lo dim/src/discpp.lo src/Dim.lo libDim___la_OBJECTS = $(am_libDim___la_OBJECTS) libDim_la_LIBADD = @@ -153,5 +153,5 @@ @IS_FALSE@am__EXEEXT_3 = test$(EXEEXT) chatclient$(EXEEXT) \ @IS_FALSE@ chatserv$(EXEEXT) fitsgrep$(EXEEXT) test$(EXEEXT) \ -@IS_FALSE@ sched$(EXEEXT) astro$(EXEEXT) +@IS_FALSE@ sched$(EXEEXT) astro$(EXEEXT) fadctrl$(EXEEXT) PROGRAMS = $(bin_PROGRAMS) am_argv_OBJECTS = src/argv.$(OBJEXT) @@ -161,6 +161,5 @@ astro_OBJECTS = astro.$(OBJEXT) astro_LDADD = $(LDADD) -am_chatclient_OBJECTS = src/chatclient.$(OBJEXT) \ - src/ChatClient.$(OBJEXT) +am_chatclient_OBJECTS = chatclient_OBJECTS = $(am_chatclient_OBJECTS) chatclient_DEPENDENCIES = libTools.la libStateMachine.la libTime.la \ @@ -193,21 +192,18 @@ libDim.la libDim++.la am__fact_SOURCES_DIST = gui/design.h gui/design.cc \ - gui/HtmlDelegate.moc.cc gui/CheckBoxDelegate.moc.cc \ - gui/DockWindow.moc.cc gui/MainWindow.moc.cc \ - gui/HtmlDelegate.cc gui/CheckBoxDelegate.cc gui/DockWindow.cc \ - gui/MainWindow.cc gui/fact.cc gui/FactGui.cc src/HeadersFTM.cc + gui/DockWindow.moc.cc gui/MainWindow.moc.cc gui/DockWindow.cc \ + gui/MainWindow.cc gui/CheckBoxDelegate.cc gui/HtmlDelegate.cc \ + gui/fact.cc gui/FactGui.cc src/HeadersFTM.cc am__objects_1 = @HAS_GUI_TRUE@am__objects_2 = gui/design.$(OBJEXT) -@HAS_GUI_TRUE@am__objects_3 = gui/HtmlDelegate.moc.$(OBJEXT) \ -@HAS_GUI_TRUE@ gui/CheckBoxDelegate.moc.$(OBJEXT) \ -@HAS_GUI_TRUE@ gui/DockWindow.moc.$(OBJEXT) \ +@HAS_GUI_TRUE@am__objects_3 = gui/DockWindow.moc.$(OBJEXT) \ @HAS_GUI_TRUE@ gui/MainWindow.moc.$(OBJEXT) am__objects_4 = $(am__objects_1) $(am__objects_2) $(am__objects_3) -@HAS_GUI_TRUE@am__objects_5 = gui/HtmlDelegate.$(OBJEXT) \ -@HAS_GUI_TRUE@ gui/CheckBoxDelegate.$(OBJEXT) \ -@HAS_GUI_TRUE@ gui/DockWindow.$(OBJEXT) \ +@HAS_GUI_TRUE@am__objects_5 = gui/DockWindow.$(OBJEXT) \ @HAS_GUI_TRUE@ gui/MainWindow.$(OBJEXT) -am_fact_OBJECTS = $(am__objects_4) $(am__objects_5) gui/fact.$(OBJEXT) \ - gui/FactGui.$(OBJEXT) src/HeadersFTM.$(OBJEXT) +am_fact_OBJECTS = $(am__objects_4) $(am__objects_5) \ + gui/CheckBoxDelegate.$(OBJEXT) gui/HtmlDelegate.$(OBJEXT) \ + gui/fact.$(OBJEXT) gui/FactGui.$(OBJEXT) \ + src/HeadersFTM.$(OBJEXT) fact_OBJECTS = $(am_fact_OBJECTS) am__DEPENDENCIES_1 = @@ -215,4 +211,9 @@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) libDim.la \ libDim++.la libTools.la libTime.la libTools.la \ + libStateMachine.la libConfiguration.la +am_fadctrl_OBJECTS = src/fadctrl.$(OBJEXT) src/LocalControl.$(OBJEXT) \ + src/HeadersFTM.$(OBJEXT) +fadctrl_OBJECTS = $(am_fadctrl_OBJECTS) +fadctrl_DEPENDENCIES = libDim.la libDim++.la libTime.la libTools.la \ libStateMachine.la libConfiguration.la fitsgrep_SOURCES = fitsgrep.c @@ -246,5 +247,5 @@ am_sendcommand_OBJECTS = src/sendcommand.$(OBJEXT) sendcommand_OBJECTS = $(am_sendcommand_OBJECTS) -sendcommand_DEPENDENCIES = libDim.la libDim++.la +sendcommand_DEPENDENCIES = libDim.la libDim++.la libConfiguration.la am_test_OBJECTS = src/test.$(OBJEXT) test_OBJECTS = $(am_test_OBJECTS) @@ -306,9 +307,9 @@ astro.c $(chatclient_SOURCES) $(chatserv_SOURCES) \ $(dataLogger_SOURCES) $(dclient5_SOURCES) $(did_SOURCES) \ - $(dns_SOURCES) $(dserver2_SOURCES) $(fact_SOURCES) fitsgrep.c \ - $(ftm_SOURCES) $(ftmctrl_SOURCES) $(log_SOURCES) \ - $(logtime_SOURCES) sched.c $(scheduler_SOURCES) \ - $(sendcommand_SOURCES) $(test_SOURCES) $(test3_SOURCES) \ - $(time_SOURCES) + $(dns_SOURCES) $(dserver2_SOURCES) $(fact_SOURCES) \ + $(fadctrl_SOURCES) fitsgrep.c $(ftm_SOURCES) \ + $(ftmctrl_SOURCES) $(log_SOURCES) $(logtime_SOURCES) sched.c \ + $(scheduler_SOURCES) $(sendcommand_SOURCES) $(test_SOURCES) \ + $(test3_SOURCES) $(time_SOURCES) DIST_SOURCES = $(libConfiguration_la_SOURCES) $(libDim___la_SOURCES) \ $(libDim_la_SOURCES) $(libStateMachine_la_SOURCES) \ @@ -317,8 +318,8 @@ $(dataLogger_SOURCES) $(dclient5_SOURCES) $(did_SOURCES) \ $(dns_SOURCES) $(dserver2_SOURCES) $(am__fact_SOURCES_DIST) \ - fitsgrep.c $(ftm_SOURCES) $(ftmctrl_SOURCES) $(log_SOURCES) \ - $(logtime_SOURCES) sched.c $(scheduler_SOURCES) \ - $(sendcommand_SOURCES) $(test_SOURCES) $(test3_SOURCES) \ - $(time_SOURCES) + $(fadctrl_SOURCES) fitsgrep.c $(ftm_SOURCES) \ + $(ftmctrl_SOURCES) $(log_SOURCES) $(logtime_SOURCES) sched.c \ + $(scheduler_SOURCES) $(sendcommand_SOURCES) $(test_SOURCES) \ + $(test3_SOURCES) $(time_SOURCES) man1dir = $(mandir)/man1 NROFF = nroff @@ -589,8 +590,12 @@ #------------------------------------------------------------------------- @HAS_GUI_TRUE@QT4_EXECUTABLES = fact -lib_LTLIBRARIES = libDim.la libDim++.la libTime.la libTools.la \ - libConfiguration.la libStateMachine.la - -# libAstro.la +lib_LTLIBRARIES = \ + libDim.la libDim++.la libTime.la libTools.la \ + libConfiguration.la libStateMachine.la + +# libAstro.la +@HAS_HELP2MAN_TRUE@dist_man1_MANS = \ +@HAS_HELP2MAN_TRUE@ test3.man ftmctrl.man dataLogger.man + #------------------------------------------------------------------------- @@ -650,5 +655,6 @@ dim/dim/dllist.hxx \ dim/dim/sllist.hxx \ - dim/dim/tokenstring.hxx + dim/dim/tokenstring.hxx \ + src/Dim.h libDim___la_SOURCES = \ @@ -656,5 +662,6 @@ dim/src/dimcpp.cxx \ dim/src/tokenstring.cxx \ - dim/src/discpp.cxx + dim/src/discpp.cxx \ + src/Dim.cc @@ -691,5 +698,8 @@ src/Connection.h src/Connection.cc -libConfiguration_la_SOURCES = src/Configuration.h src/Configuration.cc +libConfiguration_la_SOURCES = \ + src/Configuration.h src/Configuration.cc \ + src/FACT.h src/FACT.cc + libTime_la_SOURCES = src/Time.h src/Time.cc #libAstro_la_SOURCES = src/Astro.h src/Astro.cc @@ -713,9 +723,13 @@ libConfiguration.la +fadctrl_SOURCES = src/fadctrl.cc src/LocalControl.cc src/LocalControl.h src/HeadersFTM.cc +fadctrl_LDADD = libDim.la libDim++.la libTime.la libTools.la libStateMachine.la \ + libConfiguration.la + argv_SOURCES = src/argv.cc argv_LDADD = libConfiguration.la test3_SOURCES = src/test3.cc src/RemoteControl.cc src/RemoteControl.h test3_LDADD = libTools.la libStateMachine.la libTime.la libDim.la libDim++.la libConfiguration.la -chatclient_SOURCES = src/chatclient.cc src/ChatClient.cc src/ChatClient.h +chatclient_SOURCES = src/ChatClient.h chatclient_LDADD = libTools.la libStateMachine.la libTime.la libDim.la libDim++.la libConfiguration.la time_SOURCES = src/time.cc @@ -732,6 +746,6 @@ scheduler_SOURCES = src/scheduler.cc src/LocalControl.cc src/LocalControl.h scheduler_LDADD = libStateMachine.la libTools.la libTime.la libDim.la libDim++.la libConfiguration.la -sendcommand_SOURCES = src/sendcommand.cc -sendcommand_LDADD = libDim.la libDim++.la +sendcommand_SOURCES = src/sendcommand.cc +sendcommand_LDADD = libDim.la libDim++.la libConfiguration.la #fitsgrep_SOURCES = src/fitsgrep.cc @@ -746,6 +760,4 @@ @HAS_GUI_TRUE@QT_SOURCES = \ -@HAS_GUI_TRUE@ gui/HtmlDelegate.cc \ -@HAS_GUI_TRUE@ gui/CheckBoxDelegate.cc \ @HAS_GUI_TRUE@ gui/DockWindow.cc \ @HAS_GUI_TRUE@ gui/MainWindow.cc @@ -757,4 +769,5 @@ fact_SOURCES = $(BUILT_SOURCES) $(QT_SOURCES) \ + gui/CheckBoxDelegate.cc gui/HtmlDelegate.cc \ gui/fact.cc gui/FactGui.cc src/HeadersFTM.cc @@ -765,5 +778,4 @@ #------------------------------------------------------------------------- MAN_TARGETS = $(am__append_3) $(am__append_4) $(am__append_7) -@HAS_HELP2MAN_TRUE@dist_man1_MANS = test3.man all: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) all-am @@ -844,4 +856,5 @@ src/Configuration.lo: src/$(am__dirstamp) \ src/$(DEPDIR)/$(am__dirstamp) +src/FACT.lo: src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp) libConfiguration.la: $(libConfiguration_la_OBJECTS) $(libConfiguration_la_DEPENDENCIES) $(AM_V_CXXLD)$(CXXLINK) -rpath $(libdir) $(libConfiguration_la_OBJECTS) $(libConfiguration_la_LIBADD) $(LIBS) @@ -860,4 +873,5 @@ dim/src/discpp.lo: dim/src/$(am__dirstamp) \ dim/src/$(DEPDIR)/$(am__dirstamp) +src/Dim.lo: src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp) libDim++.la: $(libDim___la_OBJECTS) $(libDim___la_DEPENDENCIES) $(AM_V_CXXLD)$(CXXLINK) -rpath $(libdir) $(libDim___la_OBJECTS) $(libDim___la_LIBADD) $(LIBS) @@ -997,11 +1011,7 @@ @rm -f astro$(EXEEXT) $(AM_V_CCLD)$(LINK) $(astro_OBJECTS) $(astro_LDADD) $(LIBS) -src/chatclient.$(OBJEXT): src/$(am__dirstamp) \ - src/$(DEPDIR)/$(am__dirstamp) -src/ChatClient.$(OBJEXT): src/$(am__dirstamp) \ - src/$(DEPDIR)/$(am__dirstamp) chatclient$(EXEEXT): $(chatclient_OBJECTS) $(chatclient_DEPENDENCIES) @rm -f chatclient$(EXEEXT) - $(AM_V_CXXLD)$(CXXLINK) $(chatclient_OBJECTS) $(chatclient_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(chatclient_OBJECTS) $(chatclient_LDADD) $(LIBS) src/chatserv.$(OBJEXT): src/$(am__dirstamp) \ src/$(DEPDIR)/$(am__dirstamp) @@ -1053,15 +1063,7 @@ gui/design.$(OBJEXT): gui/$(am__dirstamp) \ gui/$(DEPDIR)/$(am__dirstamp) -gui/HtmlDelegate.moc.$(OBJEXT): gui/$(am__dirstamp) \ - gui/$(DEPDIR)/$(am__dirstamp) -gui/CheckBoxDelegate.moc.$(OBJEXT): gui/$(am__dirstamp) \ - gui/$(DEPDIR)/$(am__dirstamp) gui/DockWindow.moc.$(OBJEXT): gui/$(am__dirstamp) \ gui/$(DEPDIR)/$(am__dirstamp) gui/MainWindow.moc.$(OBJEXT): gui/$(am__dirstamp) \ - gui/$(DEPDIR)/$(am__dirstamp) -gui/HtmlDelegate.$(OBJEXT): gui/$(am__dirstamp) \ - gui/$(DEPDIR)/$(am__dirstamp) -gui/CheckBoxDelegate.$(OBJEXT): gui/$(am__dirstamp) \ gui/$(DEPDIR)/$(am__dirstamp) gui/DockWindow.$(OBJEXT): gui/$(am__dirstamp) \ @@ -1069,4 +1071,8 @@ gui/MainWindow.$(OBJEXT): gui/$(am__dirstamp) \ gui/$(DEPDIR)/$(am__dirstamp) +gui/CheckBoxDelegate.$(OBJEXT): gui/$(am__dirstamp) \ + gui/$(DEPDIR)/$(am__dirstamp) +gui/HtmlDelegate.$(OBJEXT): gui/$(am__dirstamp) \ + gui/$(DEPDIR)/$(am__dirstamp) gui/fact.$(OBJEXT): gui/$(am__dirstamp) gui/$(DEPDIR)/$(am__dirstamp) gui/FactGui.$(OBJEXT): gui/$(am__dirstamp) \ @@ -1077,4 +1083,9 @@ @rm -f fact$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(fact_OBJECTS) $(fact_LDADD) $(LIBS) +src/fadctrl.$(OBJEXT): src/$(am__dirstamp) \ + src/$(DEPDIR)/$(am__dirstamp) +fadctrl$(EXEEXT): $(fadctrl_OBJECTS) $(fadctrl_DEPENDENCIES) + @rm -f fadctrl$(EXEEXT) + $(AM_V_CXXLD)$(CXXLINK) $(fadctrl_OBJECTS) $(fadctrl_LDADD) $(LIBS) fitsgrep$(EXEEXT): $(fitsgrep_OBJECTS) $(fitsgrep_DEPENDENCIES) @rm -f fitsgrep$(EXEEXT) @@ -1168,15 +1179,12 @@ -rm -f dim/src/utilities.lo -rm -f gui/CheckBoxDelegate.$(OBJEXT) - -rm -f gui/CheckBoxDelegate.moc.$(OBJEXT) -rm -f gui/DockWindow.$(OBJEXT) -rm -f gui/DockWindow.moc.$(OBJEXT) -rm -f gui/FactGui.$(OBJEXT) -rm -f gui/HtmlDelegate.$(OBJEXT) - -rm -f gui/HtmlDelegate.moc.$(OBJEXT) -rm -f gui/MainWindow.$(OBJEXT) -rm -f gui/MainWindow.moc.$(OBJEXT) -rm -f gui/design.$(OBJEXT) -rm -f gui/fact.$(OBJEXT) - -rm -f src/ChatClient.$(OBJEXT) -rm -f src/Configuration.$(OBJEXT) -rm -f src/Configuration.lo @@ -1189,4 +1197,6 @@ -rm -f src/Description.$(OBJEXT) -rm -f src/Description.lo + -rm -f src/Dim.$(OBJEXT) + -rm -f src/Dim.lo -rm -f src/DimDescriptionService.$(OBJEXT) -rm -f src/DimDescriptionService.lo @@ -1203,4 +1213,6 @@ -rm -f src/EventImp.$(OBJEXT) -rm -f src/EventImp.lo + -rm -f src/FACT.$(OBJEXT) + -rm -f src/FACT.lo -rm -f src/Fits.$(OBJEXT) -rm -f src/HeadersFTM.$(OBJEXT) @@ -1234,9 +1246,9 @@ -rm -f src/WindowLog.lo -rm -f src/argv.$(OBJEXT) - -rm -f src/chatclient.$(OBJEXT) -rm -f src/chatserv.$(OBJEXT) -rm -f src/dataLogger.$(OBJEXT) -rm -f src/dclient5.$(OBJEXT) -rm -f src/dserver2.$(OBJEXT) + -rm -f src/fadctrl.$(OBJEXT) -rm -f src/ftm.$(OBJEXT) -rm -f src/ftmctrl.$(OBJEXT) @@ -1279,15 +1291,12 @@ @AMDEP_TRUE@@am__include@ @am__quote@dim/src/did/$(DEPDIR)/did-dui_util.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@gui/$(DEPDIR)/CheckBoxDelegate.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@gui/$(DEPDIR)/CheckBoxDelegate.moc.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@gui/$(DEPDIR)/DockWindow.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@gui/$(DEPDIR)/DockWindow.moc.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@gui/$(DEPDIR)/FactGui.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@gui/$(DEPDIR)/HtmlDelegate.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@gui/$(DEPDIR)/HtmlDelegate.moc.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@gui/$(DEPDIR)/MainWindow.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@gui/$(DEPDIR)/MainWindow.moc.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@gui/$(DEPDIR)/design.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@gui/$(DEPDIR)/fact.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/ChatClient.Po@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@ @@ -1295,4 +1304,5 @@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/Converter.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/Description.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/Dim.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/DimDescriptionService.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/DimErrorRedirecter.Plo@am__quote@ @@ -1302,4 +1312,5 @@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/Event.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/EventImp.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/FACT.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/Fits.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/HeadersFTM.Po@am__quote@ @@ -1320,9 +1331,9 @@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/WindowLog.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/argv.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/chatclient.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/chatserv.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/dataLogger.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/dclient5.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/dserver2.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/fadctrl.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/ftm.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/ftmctrl.Po@am__quote@