Index: /trunk/FACT++/Makefile.am =================================================================== --- /trunk/FACT++/Makefile.am (revision 15088) +++ /trunk/FACT++/Makefile.am (revision 15089) @@ -31,4 +31,5 @@ log logtime time argv \ dimctrl \ + dimserver \ datalogger \ ftmctrl \ @@ -97,4 +98,5 @@ dist_man1_MANS = \ dimctrl.man \ + dimserver.man \ datalogger.man \ ftmctrl.man \ @@ -401,4 +403,7 @@ libDim++.la libDim.la libDimExtension.la libConfiguration.la +dimserver_SOURCES = $(dimctrl_SOURCES) +dimserver_LDADD = $(dimctrl_LDADD) + chatclient_SOURCES = src/chatclient.cc src/ChatClient.h Index: /trunk/FACT++/Makefile.in =================================================================== --- /trunk/FACT++/Makefile.in (revision 15088) +++ /trunk/FACT++/Makefile.in (revision 15089) @@ -48,14 +48,14 @@ bin_PROGRAMS = dns$(EXEEXT) log$(EXEEXT) logtime$(EXEEXT) \ time$(EXEEXT) argv$(EXEEXT) dimctrl$(EXEEXT) \ - datalogger$(EXEEXT) ftmctrl$(EXEEXT) fadctrl$(EXEEXT) \ - fscctrl$(EXEEXT) chatclient$(EXEEXT) chatserv$(EXEEXT) \ - biasctrl$(EXEEXT) drivectrl$(EXEEXT) agilentctrl$(EXEEXT) \ - mcp$(EXEEXT) feedback$(EXEEXT) ratescan$(EXEEXT) \ - ratecontrol$(EXEEXT) magicweather$(EXEEXT) magiclidar$(EXEEXT) \ - smartfact$(EXEEXT) timecheck$(EXEEXT) fitsdump$(EXEEXT) \ - fitscheck$(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) $(am__EXEEXT_9) + dimserver$(EXEEXT) datalogger$(EXEEXT) ftmctrl$(EXEEXT) \ + fadctrl$(EXEEXT) fscctrl$(EXEEXT) chatclient$(EXEEXT) \ + chatserv$(EXEEXT) biasctrl$(EXEEXT) drivectrl$(EXEEXT) \ + agilentctrl$(EXEEXT) mcp$(EXEEXT) feedback$(EXEEXT) \ + ratescan$(EXEEXT) ratecontrol$(EXEEXT) magicweather$(EXEEXT) \ + magiclidar$(EXEEXT) smartfact$(EXEEXT) timecheck$(EXEEXT) \ + fitsdump$(EXEEXT) fitscheck$(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) $(am__EXEEXT_9) @HAS_GUI_TRUE@am__append_1 = fact @HAS_SOPRANO_TRUE@am__append_2 = tngweather lidctrl pwrctrl @@ -247,4 +247,11 @@ dimctrl_DEPENDENCIES = libStateMachine.la libTools.la libTime.la \ libDim++.la libDim.la libDimExtension.la libConfiguration.la +am__objects_2 = src/dimctrl.$(OBJEXT) \ + src/StateMachineDimControl.$(OBJEXT) \ + src/RemoteControl.$(OBJEXT) src/InterpreterV8.$(OBJEXT) \ + src/DimState.$(OBJEXT) +am_dimserver_OBJECTS = $(am__objects_2) +dimserver_OBJECTS = $(am_dimserver_OBJECTS) +dimserver_DEPENDENCIES = $(dimctrl_LDADD) am_dns_OBJECTS = src/dns.$(OBJEXT) dns_OBJECTS = $(am_dns_OBJECTS) @@ -265,17 +272,17 @@ gui/HtmlDelegate.cc gui/fact.cc gui/FactGui.cc \ src/HeadersFTM.cc src/PixelMap.cc -am__objects_2 = -@HAS_GUI_TRUE@am__objects_3 = gui/design.$(OBJEXT) -@HAS_GUI_TRUE@am__objects_4 = gui/DockWindow.moc.$(OBJEXT) \ +am__objects_3 = +@HAS_GUI_TRUE@am__objects_4 = gui/design.$(OBJEXT) +@HAS_GUI_TRUE@am__objects_5 = gui/DockWindow.moc.$(OBJEXT) \ @HAS_GUI_TRUE@ gui/MainWindow.moc.$(OBJEXT) \ @HAS_GUI_TRUE@ gui/QCameraWidget.moc.$(OBJEXT) \ @HAS_GUI_TRUE@ gui/BasicGlCamera.moc.$(OBJEXT) -@HAS_GUI_TRUE@am__objects_5 = $(am__objects_2) $(am__objects_3) \ -@HAS_GUI_TRUE@ $(am__objects_4) -@HAS_GUI_TRUE@am__objects_6 = gui/DockWindow.$(OBJEXT) \ +@HAS_GUI_TRUE@am__objects_6 = $(am__objects_3) $(am__objects_4) \ +@HAS_GUI_TRUE@ $(am__objects_5) +@HAS_GUI_TRUE@am__objects_7 = gui/DockWindow.$(OBJEXT) \ @HAS_GUI_TRUE@ gui/MainWindow.$(OBJEXT) \ @HAS_GUI_TRUE@ gui/QCameraWidget.$(OBJEXT) \ @HAS_GUI_TRUE@ gui/BasicGlCamera.$(OBJEXT) -am_fact_OBJECTS = $(am__objects_5) $(am__objects_6) \ +am_fact_OBJECTS = $(am__objects_6) $(am__objects_7) \ gui/CheckBoxDelegate.$(OBJEXT) gui/HtmlDelegate.$(OBJEXT) \ gui/fact.$(OBJEXT) gui/FactGui.$(OBJEXT) \ @@ -298,5 +305,5 @@ src/FitsFile.cc src/DataWriteFits.cc src/DataWriteFits.h \ src/DataWriteFits2.cc src/DataWriteFits2.h -@HAS_FITS_TRUE@am__objects_7 = src/FitsFile.$(OBJEXT) \ +@HAS_FITS_TRUE@am__objects_8 = src/FitsFile.$(OBJEXT) \ @HAS_FITS_TRUE@ src/DataWriteFits.$(OBJEXT) \ @HAS_FITS_TRUE@ src/DataWriteFits2.$(OBJEXT) @@ -304,5 +311,5 @@ src/EventBuilder.$(OBJEXT) src/DataProcessorImp.$(OBJEXT) \ src/DataCalib.$(OBJEXT) src/DataWriteRaw.$(OBJEXT) \ - $(am__objects_7) + $(am__objects_8) fadctrl_OBJECTS = $(am_fadctrl_OBJECTS) fadctrl_DEPENDENCIES = libDim++.la libDim.la libDimExtension.la \ @@ -434,14 +441,14 @@ src/DataProcessorImp.cc src/DataProcessorImp.h src/FitsFile.cc \ src/FitsFile.h src/Fits.cc src/Fits.h src/PixelMap.cc -@HAS_VIEWER_TRUE@am__objects_8 = gui/RawEventsViewer/viewer-RawEventsViewer.moc.$(OBJEXT) \ +@HAS_VIEWER_TRUE@am__objects_9 = gui/RawEventsViewer/viewer-RawEventsViewer.moc.$(OBJEXT) \ @HAS_VIEWER_TRUE@ gui/viewer-BasicGlCamera.moc.$(OBJEXT) \ @HAS_VIEWER_TRUE@ gui/viewer-QCameraWidget.moc.$(OBJEXT) \ @HAS_VIEWER_TRUE@ gui/viewer-Q3DCameraWidget.moc.$(OBJEXT) -@HAS_VIEWER_TRUE@am__objects_9 = $(am__objects_2) $(am__objects_8) -@HAS_VIEWER_TRUE@am__objects_10 = gui/RawEventsViewer/viewer-RawEventsViewer.$(OBJEXT) \ +@HAS_VIEWER_TRUE@am__objects_10 = $(am__objects_3) $(am__objects_9) +@HAS_VIEWER_TRUE@am__objects_11 = gui/RawEventsViewer/viewer-RawEventsViewer.$(OBJEXT) \ @HAS_VIEWER_TRUE@ gui/viewer-BasicGlCamera.$(OBJEXT) \ @HAS_VIEWER_TRUE@ gui/viewer-QCameraWidget.$(OBJEXT) \ @HAS_VIEWER_TRUE@ gui/viewer-Q3DCameraWidget.$(OBJEXT) -am_viewer_OBJECTS = $(am__objects_9) $(am__objects_10) \ +am_viewer_OBJECTS = $(am__objects_10) $(am__objects_11) \ src/viewer-DataProcessorImp.$(OBJEXT) \ src/viewer-FitsFile.$(OBJEXT) src/viewer-Fits.$(OBJEXT) \ @@ -511,17 +518,18 @@ astro.c $(biasctrl_SOURCES) $(chatclient_SOURCES) \ $(chatserv_SOURCES) $(datalogger_SOURCES) $(dclient5_SOURCES) \ - $(did_SOURCES) $(dimctrl_SOURCES) $(dns_SOURCES) \ - $(drivectrl_SOURCES) $(dserver2_SOURCES) $(fact_SOURCES) \ - $(fad_SOURCES) $(fadctrl_SOURCES) $(feedback_SOURCES) \ - $(fitscheck_SOURCES) $(fitsdump_SOURCES) fitsgrep.c \ - $(fitsloader_SOURCES) $(fsc_SOURCES) $(fscctrl_SOURCES) \ - $(ftm_SOURCES) $(ftmctrl_SOURCES) $(lidctrl_SOURCES) \ - $(log_SOURCES) $(logtime_SOURCES) $(magiclidar_SOURCES) \ - $(magicweather_SOURCES) $(makedata_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) \ + $(did_SOURCES) $(dimctrl_SOURCES) $(dimserver_SOURCES) \ + $(dns_SOURCES) $(drivectrl_SOURCES) $(dserver2_SOURCES) \ + $(fact_SOURCES) $(fad_SOURCES) $(fadctrl_SOURCES) \ + $(feedback_SOURCES) $(fitscheck_SOURCES) $(fitsdump_SOURCES) \ + fitsgrep.c $(fitsloader_SOURCES) $(fsc_SOURCES) \ + $(fscctrl_SOURCES) $(ftm_SOURCES) $(ftmctrl_SOURCES) \ + $(lidctrl_SOURCES) $(log_SOURCES) $(logtime_SOURCES) \ + $(magiclidar_SOURCES) $(magicweather_SOURCES) \ + $(makedata_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) $(webDid_SOURCES) \ $(zfits_SOURCES) @@ -533,6 +541,6 @@ $(chatserv_SOURCES) $(am__datalogger_SOURCES_DIST) \ $(dclient5_SOURCES) $(did_SOURCES) $(dimctrl_SOURCES) \ - $(dns_SOURCES) $(drivectrl_SOURCES) $(dserver2_SOURCES) \ - $(am__fact_SOURCES_DIST) $(fad_SOURCES) \ + $(dimserver_SOURCES) $(dns_SOURCES) $(drivectrl_SOURCES) \ + $(dserver2_SOURCES) $(am__fact_SOURCES_DIST) $(fad_SOURCES) \ $(am__fadctrl_SOURCES_DIST) $(feedback_SOURCES) \ $(fitscheck_SOURCES) $(fitsdump_SOURCES) fitsgrep.c \ @@ -825,11 +833,12 @@ # libAstro.la -@HAS_HELP2MAN_TRUE@dist_man1_MANS = dimctrl.man datalogger.man \ -@HAS_HELP2MAN_TRUE@ ftmctrl.man fadctrl.man fscctrl.man \ -@HAS_HELP2MAN_TRUE@ biasctrl.man drivectrl.man mcp.man \ -@HAS_HELP2MAN_TRUE@ feedback.man ratescan.man ratecontrol.man \ -@HAS_HELP2MAN_TRUE@ fitsdump.man fitscheck.man magicweather.man \ -@HAS_HELP2MAN_TRUE@ magiclidar.man smartfact.man timecheck.man \ -@HAS_HELP2MAN_TRUE@ zfits.man $(am__append_10) +@HAS_HELP2MAN_TRUE@dist_man1_MANS = dimctrl.man dimserver.man \ +@HAS_HELP2MAN_TRUE@ datalogger.man ftmctrl.man fadctrl.man \ +@HAS_HELP2MAN_TRUE@ fscctrl.man biasctrl.man drivectrl.man \ +@HAS_HELP2MAN_TRUE@ mcp.man feedback.man ratescan.man \ +@HAS_HELP2MAN_TRUE@ ratecontrol.man fitsdump.man fitscheck.man \ +@HAS_HELP2MAN_TRUE@ magicweather.man magiclidar.man \ +@HAS_HELP2MAN_TRUE@ smartfact.man timecheck.man zfits.man \ +@HAS_HELP2MAN_TRUE@ $(am__append_10) #------------------------------------------------------------------------- @@ -1080,4 +1089,6 @@ libDim++.la libDim.la libDimExtension.la libConfiguration.la +dimserver_SOURCES = $(dimctrl_SOURCES) +dimserver_LDADD = $(dimctrl_LDADD) chatclient_SOURCES = src/chatclient.cc src/ChatClient.h chatclient_LDADD = libStateMachine.la libTools.la libTime.la \ @@ -1480,4 +1491,7 @@ @rm -f dimctrl$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(dimctrl_OBJECTS) $(dimctrl_LDADD) $(LIBS) +dimserver$(EXEEXT): $(dimserver_OBJECTS) $(dimserver_DEPENDENCIES) $(EXTRA_dimserver_DEPENDENCIES) + @rm -f dimserver$(EXEEXT) + $(AM_V_CXXLD)$(CXXLINK) $(dimserver_OBJECTS) $(dimserver_LDADD) $(LIBS) src/dns.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp) dns$(EXEEXT): $(dns_OBJECTS) $(dns_DEPENDENCIES) $(EXTRA_dns_DEPENDENCIES)