Changeset 15089


Ignore:
Timestamp:
03/18/13 14:38:05 (12 years ago)
Author:
tbretz
Message:
Added dimserver as a standalone program (although being identical to dimctrl)
Location:
trunk/FACT++
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/FACT++/Makefile.am

    r14977 r15089  
    3131        log logtime time argv \
    3232        dimctrl \
     33        dimserver \
    3334        datalogger \
    3435        ftmctrl \
    … …  
    9798dist_man1_MANS = \
    9899        dimctrl.man \
     100        dimserver.man \
    99101        datalogger.man \
    100102        ftmctrl.man \
    … …  
    401403        libDim++.la libDim.la libDimExtension.la libConfiguration.la
    402404
     405dimserver_SOURCES = $(dimctrl_SOURCES)
     406dimserver_LDADD = $(dimctrl_LDADD)
     407
    403408
    404409chatclient_SOURCES = src/chatclient.cc src/ChatClient.h

  • trunk/FACT++/Makefile.in

    r14977 r15089  
    4848bin_PROGRAMS = dns$(EXEEXT) log$(EXEEXT) logtime$(EXEEXT) \
    4949        time$(EXEEXT) argv$(EXEEXT) dimctrl$(EXEEXT) \
    50         datalogger$(EXEEXT) ftmctrl$(EXEEXT) fadctrl$(EXEEXT) \
    51         fscctrl$(EXEEXT) chatclient$(EXEEXT) chatserv$(EXEEXT) \
    52         biasctrl$(EXEEXT) drivectrl$(EXEEXT) agilentctrl$(EXEEXT) \
    53         mcp$(EXEEXT) feedback$(EXEEXT) ratescan$(EXEEXT) \
    54         ratecontrol$(EXEEXT) magicweather$(EXEEXT) magiclidar$(EXEEXT) \
    55         smartfact$(EXEEXT) timecheck$(EXEEXT) fitsdump$(EXEEXT) \
    56         fitscheck$(EXEEXT) zfits$(EXEEXT) $(am__EXEEXT_1) \
    57         $(am__EXEEXT_2) $(am__EXEEXT_3) $(am__EXEEXT_4) \
    58         $(am__EXEEXT_5) $(am__EXEEXT_6) $(am__EXEEXT_7) \
    59         $(am__EXEEXT_8) $(am__EXEEXT_9)
     50        dimserver$(EXEEXT) datalogger$(EXEEXT) ftmctrl$(EXEEXT) \
     51        fadctrl$(EXEEXT) fscctrl$(EXEEXT) chatclient$(EXEEXT) \
     52        chatserv$(EXEEXT) biasctrl$(EXEEXT) drivectrl$(EXEEXT) \
     53        agilentctrl$(EXEEXT) mcp$(EXEEXT) feedback$(EXEEXT) \
     54        ratescan$(EXEEXT) ratecontrol$(EXEEXT) magicweather$(EXEEXT) \
     55        magiclidar$(EXEEXT) smartfact$(EXEEXT) timecheck$(EXEEXT) \
     56        fitsdump$(EXEEXT) fitscheck$(EXEEXT) zfits$(EXEEXT) \
     57        $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_3) \
     58        $(am__EXEEXT_4) $(am__EXEEXT_5) $(am__EXEEXT_6) \
     59        $(am__EXEEXT_7) $(am__EXEEXT_8) $(am__EXEEXT_9)
    6060@HAS_GUI_TRUE@am__append_1 = fact
    6161@HAS_SOPRANO_TRUE@am__append_2 = tngweather lidctrl pwrctrl
    … …  
    247247dimctrl_DEPENDENCIES = libStateMachine.la libTools.la libTime.la \
    248248        libDim++.la libDim.la libDimExtension.la libConfiguration.la
     249am__objects_2 = src/dimctrl.$(OBJEXT) \
     250        src/StateMachineDimControl.$(OBJEXT) \
     251        src/RemoteControl.$(OBJEXT) src/InterpreterV8.$(OBJEXT) \
     252        src/DimState.$(OBJEXT)
     253am_dimserver_OBJECTS = $(am__objects_2)
     254dimserver_OBJECTS = $(am_dimserver_OBJECTS)
     255dimserver_DEPENDENCIES = $(dimctrl_LDADD)
    249256am_dns_OBJECTS = src/dns.$(OBJEXT)
    250257dns_OBJECTS = $(am_dns_OBJECTS)
    … …  
    265272        gui/HtmlDelegate.cc gui/fact.cc gui/FactGui.cc \
    266273        src/HeadersFTM.cc src/PixelMap.cc
    267 am__objects_2 =
    268 @HAS_GUI_TRUE@am__objects_3 = gui/design.$(OBJEXT)
    269 @HAS_GUI_TRUE@am__objects_4 = gui/DockWindow.moc.$(OBJEXT) \
     274am__objects_3 =
     275@HAS_GUI_TRUE@am__objects_4 = gui/design.$(OBJEXT)
     276@HAS_GUI_TRUE@am__objects_5 = gui/DockWindow.moc.$(OBJEXT) \
    270277@HAS_GUI_TRUE@  gui/MainWindow.moc.$(OBJEXT) \
    271278@HAS_GUI_TRUE@  gui/QCameraWidget.moc.$(OBJEXT) \
    272279@HAS_GUI_TRUE@  gui/BasicGlCamera.moc.$(OBJEXT)
    273 @HAS_GUI_TRUE@am__objects_5 = $(am__objects_2) $(am__objects_3) \
    274 @HAS_GUI_TRUE@  $(am__objects_4)
    275 @HAS_GUI_TRUE@am__objects_6 = gui/DockWindow.$(OBJEXT) \
     280@HAS_GUI_TRUE@am__objects_6 = $(am__objects_3) $(am__objects_4) \
     281@HAS_GUI_TRUE@  $(am__objects_5)
     282@HAS_GUI_TRUE@am__objects_7 = gui/DockWindow.$(OBJEXT) \
    276283@HAS_GUI_TRUE@  gui/MainWindow.$(OBJEXT) \
    277284@HAS_GUI_TRUE@  gui/QCameraWidget.$(OBJEXT) \
    278285@HAS_GUI_TRUE@  gui/BasicGlCamera.$(OBJEXT)
    279 am_fact_OBJECTS = $(am__objects_5) $(am__objects_6) \
     286am_fact_OBJECTS = $(am__objects_6) $(am__objects_7) \
    280287        gui/CheckBoxDelegate.$(OBJEXT) gui/HtmlDelegate.$(OBJEXT) \
    281288        gui/fact.$(OBJEXT) gui/FactGui.$(OBJEXT) \
    … …  
    298305        src/FitsFile.cc src/DataWriteFits.cc src/DataWriteFits.h \
    299306        src/DataWriteFits2.cc src/DataWriteFits2.h
    300 @HAS_FITS_TRUE@am__objects_7 = src/FitsFile.$(OBJEXT) \
     307@HAS_FITS_TRUE@am__objects_8 = src/FitsFile.$(OBJEXT) \
    301308@HAS_FITS_TRUE@ src/DataWriteFits.$(OBJEXT) \
    302309@HAS_FITS_TRUE@ src/DataWriteFits2.$(OBJEXT)
    … …  
    304311        src/EventBuilder.$(OBJEXT) src/DataProcessorImp.$(OBJEXT) \
    305312        src/DataCalib.$(OBJEXT) src/DataWriteRaw.$(OBJEXT) \
    306         $(am__objects_7)
     313        $(am__objects_8)
    307314fadctrl_OBJECTS = $(am_fadctrl_OBJECTS)
    308315fadctrl_DEPENDENCIES = libDim++.la libDim.la libDimExtension.la \
    … …  
    434441        src/DataProcessorImp.cc src/DataProcessorImp.h src/FitsFile.cc \
    435442        src/FitsFile.h src/Fits.cc src/Fits.h src/PixelMap.cc
    436 @HAS_VIEWER_TRUE@am__objects_8 = gui/RawEventsViewer/viewer-RawEventsViewer.moc.$(OBJEXT) \
     443@HAS_VIEWER_TRUE@am__objects_9 = gui/RawEventsViewer/viewer-RawEventsViewer.moc.$(OBJEXT) \
    437444@HAS_VIEWER_TRUE@       gui/viewer-BasicGlCamera.moc.$(OBJEXT) \
    438445@HAS_VIEWER_TRUE@       gui/viewer-QCameraWidget.moc.$(OBJEXT) \
    439446@HAS_VIEWER_TRUE@       gui/viewer-Q3DCameraWidget.moc.$(OBJEXT)
    440 @HAS_VIEWER_TRUE@am__objects_9 = $(am__objects_2) $(am__objects_8)
    441 @HAS_VIEWER_TRUE@am__objects_10 = gui/RawEventsViewer/viewer-RawEventsViewer.$(OBJEXT) \
     447@HAS_VIEWER_TRUE@am__objects_10 = $(am__objects_3) $(am__objects_9)
     448@HAS_VIEWER_TRUE@am__objects_11 = gui/RawEventsViewer/viewer-RawEventsViewer.$(OBJEXT) \
    442449@HAS_VIEWER_TRUE@       gui/viewer-BasicGlCamera.$(OBJEXT) \
    443450@HAS_VIEWER_TRUE@       gui/viewer-QCameraWidget.$(OBJEXT) \
    444451@HAS_VIEWER_TRUE@       gui/viewer-Q3DCameraWidget.$(OBJEXT)
    445 am_viewer_OBJECTS = $(am__objects_9) $(am__objects_10) \
     452am_viewer_OBJECTS = $(am__objects_10) $(am__objects_11) \
    446453        src/viewer-DataProcessorImp.$(OBJEXT) \
    447454        src/viewer-FitsFile.$(OBJEXT) src/viewer-Fits.$(OBJEXT) \
    … …  
    511518        astro.c $(biasctrl_SOURCES) $(chatclient_SOURCES) \
    512519        $(chatserv_SOURCES) $(datalogger_SOURCES) $(dclient5_SOURCES) \
    513         $(did_SOURCES) $(dimctrl_SOURCES) $(dns_SOURCES) \
    514         $(drivectrl_SOURCES) $(dserver2_SOURCES) $(fact_SOURCES) \
    515         $(fad_SOURCES) $(fadctrl_SOURCES) $(feedback_SOURCES) \
    516         $(fitscheck_SOURCES) $(fitsdump_SOURCES) fitsgrep.c \
    517         $(fitsloader_SOURCES) $(fsc_SOURCES) $(fscctrl_SOURCES) \
    518         $(ftm_SOURCES) $(ftmctrl_SOURCES) $(lidctrl_SOURCES) \
    519         $(log_SOURCES) $(logtime_SOURCES) $(magiclidar_SOURCES) \
    520         $(magicweather_SOURCES) $(makedata_SOURCES) \
    521         $(makeplots_SOURCES) $(mcp_SOURCES) $(moon_SOURCES) \
    522         $(pwrctrl_SOURCES) $(ratecontrol_SOURCES) $(ratescan_SOURCES) \
    523         $(readfits_SOURCES) sched.c $(scheduler_SOURCES) \
    524         $(skypeclient_SOURCES) $(smartfact_SOURCES) $(test_SOURCES) \
    525         $(time_SOURCES) $(timecheck_SOURCES) $(tngweather_SOURCES) \
     520        $(did_SOURCES) $(dimctrl_SOURCES) $(dimserver_SOURCES) \
     521        $(dns_SOURCES) $(drivectrl_SOURCES) $(dserver2_SOURCES) \
     522        $(fact_SOURCES) $(fad_SOURCES) $(fadctrl_SOURCES) \
     523        $(feedback_SOURCES) $(fitscheck_SOURCES) $(fitsdump_SOURCES) \
     524        fitsgrep.c $(fitsloader_SOURCES) $(fsc_SOURCES) \
     525        $(fscctrl_SOURCES) $(ftm_SOURCES) $(ftmctrl_SOURCES) \
     526        $(lidctrl_SOURCES) $(log_SOURCES) $(logtime_SOURCES) \
     527        $(magiclidar_SOURCES) $(magicweather_SOURCES) \
     528        $(makedata_SOURCES) $(makeplots_SOURCES) $(mcp_SOURCES) \
     529        $(moon_SOURCES) $(pwrctrl_SOURCES) $(ratecontrol_SOURCES) \
     530        $(ratescan_SOURCES) $(readfits_SOURCES) sched.c \
     531        $(scheduler_SOURCES) $(skypeclient_SOURCES) \
     532        $(smartfact_SOURCES) $(test_SOURCES) $(time_SOURCES) \
     533        $(timecheck_SOURCES) $(tngweather_SOURCES) \
    526534        $(triggerschedule_SOURCES) $(viewer_SOURCES) $(webDid_SOURCES) \
    527535        $(zfits_SOURCES)
    … …  
    533541        $(chatserv_SOURCES) $(am__datalogger_SOURCES_DIST) \
    534542        $(dclient5_SOURCES) $(did_SOURCES) $(dimctrl_SOURCES) \
    535         $(dns_SOURCES) $(drivectrl_SOURCES) $(dserver2_SOURCES) \
    536         $(am__fact_SOURCES_DIST) $(fad_SOURCES) \
     543        $(dimserver_SOURCES) $(dns_SOURCES) $(drivectrl_SOURCES) \
     544        $(dserver2_SOURCES) $(am__fact_SOURCES_DIST) $(fad_SOURCES) \
    537545        $(am__fadctrl_SOURCES_DIST) $(feedback_SOURCES) \
    538546        $(fitscheck_SOURCES) $(fitsdump_SOURCES) fitsgrep.c \
    … …  
    825833
    826834#       libAstro.la
    827 @HAS_HELP2MAN_TRUE@dist_man1_MANS = dimctrl.man datalogger.man \
    828 @HAS_HELP2MAN_TRUE@     ftmctrl.man fadctrl.man fscctrl.man \
    829 @HAS_HELP2MAN_TRUE@     biasctrl.man drivectrl.man mcp.man \
    830 @HAS_HELP2MAN_TRUE@     feedback.man ratescan.man ratecontrol.man \
    831 @HAS_HELP2MAN_TRUE@     fitsdump.man fitscheck.man magicweather.man \
    832 @HAS_HELP2MAN_TRUE@     magiclidar.man smartfact.man timecheck.man \
    833 @HAS_HELP2MAN_TRUE@     zfits.man $(am__append_10)
     835@HAS_HELP2MAN_TRUE@dist_man1_MANS = dimctrl.man dimserver.man \
     836@HAS_HELP2MAN_TRUE@     datalogger.man ftmctrl.man fadctrl.man \
     837@HAS_HELP2MAN_TRUE@     fscctrl.man biasctrl.man drivectrl.man \
     838@HAS_HELP2MAN_TRUE@     mcp.man feedback.man ratescan.man \
     839@HAS_HELP2MAN_TRUE@     ratecontrol.man fitsdump.man fitscheck.man \
     840@HAS_HELP2MAN_TRUE@     magicweather.man magiclidar.man \
     841@HAS_HELP2MAN_TRUE@     smartfact.man timecheck.man zfits.man \
     842@HAS_HELP2MAN_TRUE@     $(am__append_10)
    834843
    835844#-------------------------------------------------------------------------
    … …  
    10801089        libDim++.la libDim.la libDimExtension.la libConfiguration.la
    10811090
     1091dimserver_SOURCES = $(dimctrl_SOURCES)
     1092dimserver_LDADD = $(dimctrl_LDADD)
    10821093chatclient_SOURCES = src/chatclient.cc src/ChatClient.h
    10831094chatclient_LDADD = libStateMachine.la libTools.la libTime.la \
    … …  
    14801491        @rm -f dimctrl$(EXEEXT)
    14811492        $(AM_V_CXXLD)$(CXXLINK) $(dimctrl_OBJECTS) $(dimctrl_LDADD) $(LIBS)
     1493dimserver$(EXEEXT): $(dimserver_OBJECTS) $(dimserver_DEPENDENCIES) $(EXTRA_dimserver_DEPENDENCIES)
     1494        @rm -f dimserver$(EXEEXT)
     1495        $(AM_V_CXXLD)$(CXXLINK) $(dimserver_OBJECTS) $(dimserver_LDADD) $(LIBS)
    14821496src/dns.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
    14831497dns$(EXEEXT): $(dns_OBJECTS) $(dns_DEPENDENCIES) $(EXTRA_dns_DEPENDENCIES)
Note: See TracChangeset for help on using the changeset viewer.