Changeset 12354


Ignore:
Timestamp:
11/01/11 04:35:58 (13 years ago)
Author:
tbretz
Message:
Added ratecontrol.
Location:
trunk/FACT++
Files:
2 edited

Legend:

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

    r12344 r12354  
    3838        chatclient chatserv \
    3939        biasctrl \
    40         mcp feedback ratescan \
     40        mcp feedback ratescan ratecontrol \
    4141        fitsdump
    4242
     
    288288        libConfiguration.la
    289289
     290ratecontrol_SOURCES = src/ratecontrol.cc src/LocalControl.h src/PixelMap.cc
     291ratecontrol_LDADD   = libDim.la libDim++.la  libDimExtension.la \
     292        libTime.la libTools.la libStateMachine.la \
     293        libConfiguration.la
     294
    290295
    291296argv_SOURCES = src/argv.cc
  • trunk/FACT++/Makefile.in

    r12344 r12354  
    4949        chatclient$(EXEEXT) chatserv$(EXEEXT) biasctrl$(EXEEXT) \
    5050        mcp$(EXEEXT) feedback$(EXEEXT) ratescan$(EXEEXT) \
    51         fitsdump$(EXEEXT) $(am__EXEEXT_1) $(am__EXEEXT_2) \
    52         $(am__EXEEXT_3) $(am__EXEEXT_4)
     51        ratecontrol$(EXEEXT) fitsdump$(EXEEXT) $(am__EXEEXT_1) \
     52        $(am__EXEEXT_2) $(am__EXEEXT_3) $(am__EXEEXT_4)
    5353@HAS_GUI_TRUE@am__append_1 = fact
    5454@HAS_VIEWER_TRUE@am__append_2 = viewer
     
    315315mcp_DEPENDENCIES = libDim.la libDim++.la libDimExtension.la libTime.la \
    316316        libTools.la libStateMachine.la libConfiguration.la
     317am_ratecontrol_OBJECTS = src/ratecontrol.$(OBJEXT) \
     318        src/PixelMap.$(OBJEXT)
     319ratecontrol_OBJECTS = $(am_ratecontrol_OBJECTS)
     320ratecontrol_DEPENDENCIES = libDim.la libDim++.la libDimExtension.la \
     321        libTime.la libTools.la libStateMachine.la libConfiguration.la
    317322am_ratescan_OBJECTS = src/ratescan.$(OBJEXT) src/PixelMap.$(OBJEXT)
    318323ratescan_OBJECTS = $(am_ratescan_OBJECTS)
     
    415420        $(fscctrl_SOURCES) $(ftm_SOURCES) $(ftmctrl_SOURCES) \
    416421        $(log_SOURCES) $(logtime_SOURCES) $(mcp_SOURCES) \
    417         $(ratescan_SOURCES) $(readfits_SOURCES) sched.c \
    418         $(scheduler_SOURCES) $(test_SOURCES) $(time_SOURCES) \
     422        $(ratecontrol_SOURCES) $(ratescan_SOURCES) $(readfits_SOURCES) \
     423        sched.c $(scheduler_SOURCES) $(test_SOURCES) $(time_SOURCES) \
    419424        $(triggerschedule_SOURCES) $(viewer_SOURCES)
    420425DIST_SOURCES = $(libConfiguration_la_SOURCES) $(libDim___la_SOURCES) \
     
    431436        $(fsc_SOURCES) $(fscctrl_SOURCES) $(ftm_SOURCES) \
    432437        $(ftmctrl_SOURCES) $(log_SOURCES) $(logtime_SOURCES) \
    433         $(mcp_SOURCES) $(ratescan_SOURCES) $(readfits_SOURCES) sched.c \
    434         $(scheduler_SOURCES) $(test_SOURCES) $(time_SOURCES) \
    435         $(triggerschedule_SOURCES) $(am__viewer_SOURCES_DIST)
     438        $(mcp_SOURCES) $(ratecontrol_SOURCES) $(ratescan_SOURCES) \
     439        $(readfits_SOURCES) sched.c $(scheduler_SOURCES) \
     440        $(test_SOURCES) $(time_SOURCES) $(triggerschedule_SOURCES) \
     441        $(am__viewer_SOURCES_DIST)
    436442man1dir = $(mandir)/man1
    437443NROFF = nroff
     
    865871        libConfiguration.la
    866872
     873ratecontrol_SOURCES = src/ratecontrol.cc src/LocalControl.h src/PixelMap.cc
     874ratecontrol_LDADD = libDim.la libDim++.la  libDimExtension.la \
     875        libTime.la libTools.la libStateMachine.la \
     876        libConfiguration.la
     877
    867878argv_SOURCES = src/argv.cc
    868879argv_LDADD = libConfiguration.la
     
    13641375        @rm -f mcp$(EXEEXT)
    13651376        $(AM_V_CXXLD)$(CXXLINK) $(mcp_OBJECTS) $(mcp_LDADD) $(LIBS)
     1377src/ratecontrol.$(OBJEXT): src/$(am__dirstamp) \
     1378        src/$(DEPDIR)/$(am__dirstamp)
     1379ratecontrol$(EXEEXT): $(ratecontrol_OBJECTS) $(ratecontrol_DEPENDENCIES)
     1380        @rm -f ratecontrol$(EXEEXT)
     1381        $(AM_V_CXXLD)$(CXXLINK) $(ratecontrol_OBJECTS) $(ratecontrol_LDADD) $(LIBS)
    13661382src/ratescan.$(OBJEXT): src/$(am__dirstamp) \
    13671383        src/$(DEPDIR)/$(am__dirstamp)
     
    15571573        -rm -f src/logtime.$(OBJEXT)
    15581574        -rm -f src/mcp.$(OBJEXT)
     1575        -rm -f src/ratecontrol.$(OBJEXT)
    15591576        -rm -f src/ratescan.$(OBJEXT)
    15601577        -rm -f src/readfits.$(OBJEXT)
     
    16691686@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/logtime.Po@am__quote@
    16701687@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/mcp.Po@am__quote@
     1688@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/ratecontrol.Po@am__quote@
    16711689@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/ratescan.Po@am__quote@
    16721690@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/readfits.Po@am__quote@
Note: See TracChangeset for help on using the changeset viewer.