Changeset 14536


Ignore:
Timestamp:
10/27/12 18:57:35 (12 years ago)
Author:
tbretz
Message:
Added agilentctrl.
Location:
trunk/FACT++
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/FACT++/Makefile.am

    r14529 r14536  
    3636        fscctrl fsc \
    3737        chatclient chatserv \
    38         biasctrl drivectrl \
     38        biasctrl drivectrl agilentctrl \
    3939        mcp feedback ratescan ratecontrol \
    4040        magicweather \
     
    287287        libConfiguration.la
    288288
     289agilentctrl_SOURCES = src/agilentctrl.cc src/LocalControl.h src/HeadersAgilent.h
     290agilentctrl_LDADD   = libDim++.la libDim.la libDimExtension.la \
     291        libStateMachine.la libTools.la libTime.la \
     292        libConfiguration.la
     293
    289294magicweather_SOURCES = src/magicweather.cc src/LocalControl.h
    290295magicweather_LDADD   = libDim++.la libDim.la libDimExtension.la \
  • trunk/FACT++/Makefile.in

    r14529 r14536  
    5151        fadctrl$(EXEEXT) fad$(EXEEXT) fscctrl$(EXEEXT) fsc$(EXEEXT) \
    5252        chatclient$(EXEEXT) chatserv$(EXEEXT) biasctrl$(EXEEXT) \
    53         drivectrl$(EXEEXT) mcp$(EXEEXT) feedback$(EXEEXT) \
    54         ratescan$(EXEEXT) ratecontrol$(EXEEXT) magicweather$(EXEEXT) \
    55         smartfact$(EXEEXT) timecheck$(EXEEXT) fitsdump$(EXEEXT) \
    56         fitscheck$(EXEEXT) $(am__EXEEXT_1) $(am__EXEEXT_2) \
    57         $(am__EXEEXT_3) $(am__EXEEXT_4) $(am__EXEEXT_5) \
    58         $(am__EXEEXT_6) $(am__EXEEXT_7) $(am__EXEEXT_8)
     53        drivectrl$(EXEEXT) agilentctrl$(EXEEXT) mcp$(EXEEXT) \
     54        feedback$(EXEEXT) ratescan$(EXEEXT) ratecontrol$(EXEEXT) \
     55        magicweather$(EXEEXT) smartfact$(EXEEXT) timecheck$(EXEEXT) \
     56        fitsdump$(EXEEXT) fitscheck$(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)
    5960@HAS_GUI_TRUE@am__append_1 = fact
    6061@HAS_SOPRANO_TRUE@am__append_2 = tngweather lidctrl pwrctrl
     
    194195@IS_FALSE@      readfits$(EXEEXT)
    195196PROGRAMS = $(bin_PROGRAMS)
     197am_agilentctrl_OBJECTS = src/agilentctrl.$(OBJEXT)
     198agilentctrl_OBJECTS = $(am_agilentctrl_OBJECTS)
     199agilentctrl_DEPENDENCIES = libDim++.la libDim.la libDimExtension.la \
     200        libStateMachine.la libTools.la libTime.la libConfiguration.la
    196201am_argv_OBJECTS = src/argv.$(OBJEXT)
    197202argv_OBJECTS = $(am_argv_OBJECTS)
     
    484489        $(libDim_la_SOURCES) $(libDimExtension_la_SOURCES) \
    485490        $(libStateMachine_la_SOURCES) $(libTime_la_SOURCES) \
    486         $(libTools_la_SOURCES) $(argv_SOURCES) astro.c \
    487         $(biasctrl_SOURCES) $(chatclient_SOURCES) $(chatserv_SOURCES) \
    488         $(datalogger_SOURCES) $(dclient5_SOURCES) $(did_SOURCES) \
    489         $(dimctrl_SOURCES) $(dns_SOURCES) $(drivectrl_SOURCES) \
    490         $(dserver2_SOURCES) $(fact_SOURCES) $(fad_SOURCES) \
    491         $(fadctrl_SOURCES) $(feedback_SOURCES) $(fitscheck_SOURCES) \
    492         $(fitsdump_SOURCES) fitsgrep.c $(fitsloader_SOURCES) \
    493         $(fsc_SOURCES) $(fscctrl_SOURCES) $(ftm_SOURCES) \
    494         $(ftmctrl_SOURCES) $(lidctrl_SOURCES) $(log_SOURCES) \
    495         $(logtime_SOURCES) $(magicweather_SOURCES) \
     491        $(libTools_la_SOURCES) $(agilentctrl_SOURCES) $(argv_SOURCES) \
     492        astro.c $(biasctrl_SOURCES) $(chatclient_SOURCES) \
     493        $(chatserv_SOURCES) $(datalogger_SOURCES) $(dclient5_SOURCES) \
     494        $(did_SOURCES) $(dimctrl_SOURCES) $(dns_SOURCES) \
     495        $(drivectrl_SOURCES) $(dserver2_SOURCES) $(fact_SOURCES) \
     496        $(fad_SOURCES) $(fadctrl_SOURCES) $(feedback_SOURCES) \
     497        $(fitscheck_SOURCES) $(fitsdump_SOURCES) fitsgrep.c \
     498        $(fitsloader_SOURCES) $(fsc_SOURCES) $(fscctrl_SOURCES) \
     499        $(ftm_SOURCES) $(ftmctrl_SOURCES) $(lidctrl_SOURCES) \
     500        $(log_SOURCES) $(logtime_SOURCES) $(magicweather_SOURCES) \
    496501        $(makeplots_SOURCES) $(mcp_SOURCES) $(moon_SOURCES) \
    497502        $(pwrctrl_SOURCES) $(ratecontrol_SOURCES) $(ratescan_SOURCES) \
     
    503508        $(libDim_la_SOURCES) $(libDimExtension_la_SOURCES) \
    504509        $(libStateMachine_la_SOURCES) $(libTime_la_SOURCES) \
    505         $(libTools_la_SOURCES) $(argv_SOURCES) astro.c \
    506         $(biasctrl_SOURCES) $(chatclient_SOURCES) $(chatserv_SOURCES) \
    507         $(am__datalogger_SOURCES_DIST) $(dclient5_SOURCES) \
    508         $(did_SOURCES) $(dimctrl_SOURCES) $(dns_SOURCES) \
    509         $(drivectrl_SOURCES) $(dserver2_SOURCES) \
     510        $(libTools_la_SOURCES) $(agilentctrl_SOURCES) $(argv_SOURCES) \
     511        astro.c $(biasctrl_SOURCES) $(chatclient_SOURCES) \
     512        $(chatserv_SOURCES) $(am__datalogger_SOURCES_DIST) \
     513        $(dclient5_SOURCES) $(did_SOURCES) $(dimctrl_SOURCES) \
     514        $(dns_SOURCES) $(drivectrl_SOURCES) $(dserver2_SOURCES) \
    510515        $(am__fact_SOURCES_DIST) $(fad_SOURCES) \
    511516        $(am__fadctrl_SOURCES_DIST) $(feedback_SOURCES) \
     
    949954        libConfiguration.la
    950955
     956agilentctrl_SOURCES = src/agilentctrl.cc src/LocalControl.h src/HeadersAgilent.h
     957agilentctrl_LDADD = libDim++.la libDim.la libDimExtension.la \
     958        libStateMachine.la libTools.la libTime.la \
     959        libConfiguration.la
     960
    951961magicweather_SOURCES = src/magicweather.cc src/LocalControl.h
    952962magicweather_LDADD = libDim++.la libDim.la libDimExtension.la \
     
    13601370          done; \
    13611371        done; rm -f c$${pid}_.???; exit $$bad
     1372src/agilentctrl.$(OBJEXT): src/$(am__dirstamp) \
     1373        src/$(DEPDIR)/$(am__dirstamp)
     1374agilentctrl$(EXEEXT): $(agilentctrl_OBJECTS) $(agilentctrl_DEPENDENCIES) $(EXTRA_agilentctrl_DEPENDENCIES)
     1375        @rm -f agilentctrl$(EXEEXT)
     1376        $(AM_V_CXXLD)$(CXXLINK) $(agilentctrl_OBJECTS) $(agilentctrl_LDADD) $(LIBS)
    13621377src/argv.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
    13631378argv$(EXEEXT): $(argv_OBJECTS) $(argv_DEPENDENCIES) $(EXTRA_argv_DEPENDENCIES)
     
    18031818        -rm -f src/WindowLog.$(OBJEXT)
    18041819        -rm -f src/WindowLog.lo
     1820        -rm -f src/agilentctrl.$(OBJEXT)
    18051821        -rm -f src/argv.$(OBJEXT)
    18061822        -rm -f src/biasctrl.$(OBJEXT)
     
    19411957@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/Time.Plo@am__quote@
    19421958@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/WindowLog.Plo@am__quote@
     1959@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/agilentctrl.Po@am__quote@
    19431960@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/argv.Po@am__quote@
    19441961@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/biasctrl.Po@am__quote@
Note: See TracChangeset for help on using the changeset viewer.