Changeset 14494 for trunk


Ignore:
Timestamp:
10/19/12 13:02:35 (12 years ago)
Author:
tbretz
Message:
Added makeplots, lidctrl and pwrctrl.
Location:
trunk/FACT++
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/FACT++/Makefile.am

    r14437 r14494  
    4848
    4949if HAS_SOPRANO
    50 bin_PROGRAMS += tngweather
     50bin_PROGRAMS += tngweather lidctrl pwrctrl
    5151endif
    5252
    … …  
    6262bin_PROGRAMS += moon
    6363endif
     64
     65if HAS_ROOT
     66if HAS_SQL
     67if HAS_NOVA
     68bin_PROGRAMS += makeplots
     69endif
     70endif
     71endif
     72
    6473
    6574if HAS_LIBXP
    … …  
    250259moon_LDADD = libTime.la libConfiguration.la
    251260
     261makeplots_SOURCES = src/makeplots.cc
     262makeplots_LDADD = $(ROOTLDFLAGS) $(ROOTLIBS) libTime.la libConfiguration.la
     263
    252264
    253265chatserv_SOURCES = src/chatserv.cc src/LocalControl.h
    … …  
    279291        libStateMachine.la libTools.la libTime.la \
    280292        libConfiguration.la
     293
     294lidctrl_SOURCES = src/lidctrl.cc src/LocalControl.h
     295lidctrl_LDADD   = libDim++.la libDim.la libDimExtension.la \
     296        libStateMachine.la libTools.la libTime.la \
     297        libConfiguration.la -lQtWebKit -lQtXml
     298
     299pwrctrl_SOURCES = src/pwrctrl.cc src/LocalControl.h
     300pwrctrl_LDADD   = libDim++.la libDim.la libDimExtension.la \
     301        libStateMachine.la libTools.la libTime.la \
     302        libConfiguration.la -lQtWebKit -lQtXml
    281303
    282304timecheck_SOURCES = src/timecheck.cc src/LocalControl.h

  • trunk/FACT++/Makefile.in

    r14437 r14494  
    5252        fitscheck$(EXEEXT) $(am__EXEEXT_1) $(am__EXEEXT_2) \
    5353        $(am__EXEEXT_3) $(am__EXEEXT_4) $(am__EXEEXT_5) \
    54         $(am__EXEEXT_6) $(am__EXEEXT_7)
     54        $(am__EXEEXT_6) $(am__EXEEXT_7) $(am__EXEEXT_8)
    5555@HAS_GUI_TRUE@am__append_1 = fact
    56 @HAS_SOPRANO_TRUE@am__append_2 = tngweather
     56@HAS_SOPRANO_TRUE@am__append_2 = tngweather lidctrl pwrctrl
    5757@HAS_DBUS_TRUE@am__append_3 = skypeclient
    5858@HAS_VIEWER_TRUE@am__append_4 = viewer
    5959@HAS_NOVA_TRUE@am__append_5 = moon
    60 @HAS_LIBXP_TRUE@am__append_6 = did
     60@HAS_NOVA_TRUE@@HAS_ROOT_TRUE@@HAS_SQL_TRUE@am__append_6 = makeplots
     61@HAS_LIBXP_TRUE@am__append_7 = did
    6162
    6263# This is a trick to be able to build them but not having them in 'all'
    63 @IS_FALSE@am__append_7 = \
     64@IS_FALSE@am__append_8 = \
    6465@IS_FALSE@      test scheduler \
    6566@IS_FALSE@      triggerschedule \
    … …  
    6970@IS_FALSE@      readfits
    7071
    71 @HAS_FITS_TRUE@am__append_8 = src/FitsFile.h src/FitsFile.cc \
     72@HAS_FITS_TRUE@am__append_9 = src/FitsFile.h src/FitsFile.cc \
    7273@HAS_FITS_TRUE@ src/DataWriteFits.cc    src/DataWriteFits.h \
    7374@HAS_FITS_TRUE@ src/DataWriteFits2.cc    src/DataWriteFits2.h
    7475
    75 @HAS_FITS_TRUE@am__append_9 = src/FitsFile.h src/FitsFile.cc src/Fits.h src/Fits.cc
    76 @HAS_GROFF_TRUE@am__append_10 = $(dist_man1_MANS:.man=.html)
    77 @HAS_GROFF_TRUE@am__append_11 = $(dist_man1_MANS:.man=.html)
     76@HAS_FITS_TRUE@am__append_10 = src/FitsFile.h src/FitsFile.cc src/Fits.h src/Fits.cc
     77@HAS_GROFF_TRUE@am__append_11 = $(dist_man1_MANS:.man=.html)
    7878@HAS_GROFF_TRUE@am__append_12 = $(dist_man1_MANS:.man=.html)
    79 @HAS_GROFF_TRUE@@HAS_PS2PDF_TRUE@am__append_13 = $(dist_man1_MANS:.man=.pdf)
     79@HAS_GROFF_TRUE@am__append_13 = $(dist_man1_MANS:.man=.html)
    8080@HAS_GROFF_TRUE@@HAS_PS2PDF_TRUE@am__append_14 = $(dist_man1_MANS:.man=.pdf)
    8181@HAS_GROFF_TRUE@@HAS_PS2PDF_TRUE@am__append_15 = $(dist_man1_MANS:.man=.pdf)
     82@HAS_GROFF_TRUE@@HAS_PS2PDF_TRUE@am__append_16 = $(dist_man1_MANS:.man=.pdf)
    8283subdir = .
    8384DIST_COMMON = README $(am__configure_deps) $(dist_man1_MANS) \
    … …  
    183184libTools_la_OBJECTS = $(am_libTools_la_OBJECTS)
    184185@HAS_GUI_TRUE@am__EXEEXT_1 = fact$(EXEEXT)
    185 @HAS_SOPRANO_TRUE@am__EXEEXT_2 = tngweather$(EXEEXT)
     186@HAS_SOPRANO_TRUE@am__EXEEXT_2 = tngweather$(EXEEXT) lidctrl$(EXEEXT) \
     187@HAS_SOPRANO_TRUE@      pwrctrl$(EXEEXT)
    186188@HAS_DBUS_TRUE@am__EXEEXT_3 = skypeclient$(EXEEXT)
    187189@HAS_VIEWER_TRUE@am__EXEEXT_4 = viewer$(EXEEXT)
    188190@HAS_NOVA_TRUE@am__EXEEXT_5 = moon$(EXEEXT)
    189 @HAS_LIBXP_TRUE@am__EXEEXT_6 = did$(EXEEXT)
    190 @IS_FALSE@am__EXEEXT_7 = test$(EXEEXT) scheduler$(EXEEXT) \
     191@HAS_NOVA_TRUE@@HAS_ROOT_TRUE@@HAS_SQL_TRUE@am__EXEEXT_6 = makeplots$(EXEEXT)
     192@HAS_LIBXP_TRUE@am__EXEEXT_7 = did$(EXEEXT)
     193@IS_FALSE@am__EXEEXT_8 = test$(EXEEXT) scheduler$(EXEEXT) \
    191194@IS_FALSE@      triggerschedule$(EXEEXT) dclient5$(EXEEXT) \
    192195@IS_FALSE@      dserver2$(EXEEXT) fitsloader$(EXEEXT) \
    … …  
    332335ftmctrl_DEPENDENCIES = libDim++.la libDim.la libDimExtension.la \
    333336        libStateMachine.la libTime.la libTools.la libConfiguration.la
     337am_lidctrl_OBJECTS = src/lidctrl.$(OBJEXT)
     338lidctrl_OBJECTS = $(am_lidctrl_OBJECTS)
     339lidctrl_DEPENDENCIES = libDim++.la libDim.la libDimExtension.la \
     340        libStateMachine.la libTools.la libTime.la libConfiguration.la
    334341am_log_OBJECTS = src/log.$(OBJEXT)
    335342log_OBJECTS = $(am_log_OBJECTS)
    … …  
    344351magicweather_DEPENDENCIES = libDim++.la libDim.la libDimExtension.la \
    345352        libStateMachine.la libTools.la libTime.la libConfiguration.la
     353am_makeplots_OBJECTS = src/makeplots.$(OBJEXT)
     354makeplots_OBJECTS = $(am_makeplots_OBJECTS)
     355makeplots_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
     356        libTime.la libConfiguration.la
    346357am_mcp_OBJECTS = src/mcp.$(OBJEXT)
    347358mcp_OBJECTS = $(am_mcp_OBJECTS)
    … …  
    351362moon_OBJECTS = $(am_moon_OBJECTS)
    352363moon_DEPENDENCIES = libTime.la libConfiguration.la
     364am_pwrctrl_OBJECTS = src/pwrctrl.$(OBJEXT)
     365pwrctrl_OBJECTS = $(am_pwrctrl_OBJECTS)
     366pwrctrl_DEPENDENCIES = libDim++.la libDim.la libDimExtension.la \
     367        libStateMachine.la libTools.la libTime.la libConfiguration.la
    353368am_ratecontrol_OBJECTS = src/ratecontrol.$(OBJEXT) \
    354369        src/PixelMap.$(OBJEXT)
    … …  
    480495        $(fitsdump_SOURCES) fitsgrep.c $(fitsloader_SOURCES) \
    481496        $(fsc_SOURCES) $(fscctrl_SOURCES) $(ftm_SOURCES) \
    482         $(ftmctrl_SOURCES) $(log_SOURCES) $(logtime_SOURCES) \
    483         $(magicweather_SOURCES) $(mcp_SOURCES) $(moon_SOURCES) \
    484         $(ratecontrol_SOURCES) $(ratescan_SOURCES) $(readfits_SOURCES) \
    485         sched.c $(scheduler_SOURCES) $(skypeclient_SOURCES) \
    486         $(smartfact_SOURCES) $(test_SOURCES) $(time_SOURCES) \
    487         $(timecheck_SOURCES) $(tngweather_SOURCES) \
     497        $(ftmctrl_SOURCES) $(lidctrl_SOURCES) $(log_SOURCES) \
     498        $(logtime_SOURCES) $(magicweather_SOURCES) \
     499        $(makeplots_SOURCES) $(mcp_SOURCES) $(moon_SOURCES) \
     500        $(pwrctrl_SOURCES) $(ratecontrol_SOURCES) $(ratescan_SOURCES) \
     501        $(readfits_SOURCES) sched.c $(scheduler_SOURCES) \
     502        $(skypeclient_SOURCES) $(smartfact_SOURCES) $(test_SOURCES) \
     503        $(time_SOURCES) $(timecheck_SOURCES) $(tngweather_SOURCES) \
    488504        $(triggerschedule_SOURCES) $(viewer_SOURCES)
    489505DIST_SOURCES = $(libConfiguration_la_SOURCES) $(libDim___la_SOURCES) \
    … …  
    499515        $(fitscheck_SOURCES) $(fitsdump_SOURCES) fitsgrep.c \
    500516        $(fitsloader_SOURCES) $(fsc_SOURCES) $(fscctrl_SOURCES) \
    501         $(ftm_SOURCES) $(ftmctrl_SOURCES) $(log_SOURCES) \
    502         $(logtime_SOURCES) $(magicweather_SOURCES) $(mcp_SOURCES) \
    503         $(moon_SOURCES) $(ratecontrol_SOURCES) $(ratescan_SOURCES) \
     517        $(ftm_SOURCES) $(ftmctrl_SOURCES) $(lidctrl_SOURCES) \
     518        $(log_SOURCES) $(logtime_SOURCES) $(magicweather_SOURCES) \
     519        $(makeplots_SOURCES) $(mcp_SOURCES) $(moon_SOURCES) \
     520        $(pwrctrl_SOURCES) $(ratecontrol_SOURCES) $(ratescan_SOURCES) \
    504521        $(readfits_SOURCES) sched.c $(scheduler_SOURCES) \
    505522        $(skypeclient_SOURCES) $(smartfact_SOURCES) $(test_SOURCES) \
    … …  
    773790
    774791#-------------------------------------------------------------------------
    775 CLEANFILES = $(BUILT_SOURCES) $(am__append_12) $(am__append_15)
     792CLEANFILES = $(BUILT_SOURCES) $(am__append_13) $(am__append_16)
    776793dist_noinst_SCRIPTS = autogen.sh
    777794EXTRA_DIST = Doxyfile dim/DIM_Performance.pdf dim/LICENSE.GPL \
    … …  
    781798        dim/README_v17.txt dim/README_v18.txt dim/README_v19.txt \
    782799        $(fact_DIALOGS) $(fact_RESOURCES) $(viewer_DIALOGS) \
    783         $(viewer_RESOURCES) $(am__append_11) $(am__append_14)
     800        $(viewer_RESOURCES) $(am__append_12) $(am__append_15)
    784801dns_LDADD = libDim.la libDimExtension.la
    785802dns_SOURCES = src/dns.c
    … …  
    898915moon_SOURCES = src/moon.cc
    899916moon_LDADD = libTime.la libConfiguration.la
     917makeplots_SOURCES = src/makeplots.cc
     918makeplots_LDADD = $(ROOTLDFLAGS) $(ROOTLIBS) libTime.la libConfiguration.la
    900919chatserv_SOURCES = src/chatserv.cc src/LocalControl.h
    901920chatserv_LDADD = libStateMachine.la libTools.la libConfiguration.la libTime.la \
    … …  
    926945        libConfiguration.la
    927946
     947lidctrl_SOURCES = src/lidctrl.cc src/LocalControl.h
     948lidctrl_LDADD = libDim++.la libDim.la libDimExtension.la \
     949        libStateMachine.la libTools.la libTime.la \
     950        libConfiguration.la -lQtWebKit -lQtXml
     951
     952pwrctrl_SOURCES = src/pwrctrl.cc src/LocalControl.h
     953pwrctrl_LDADD = libDim++.la libDim.la libDimExtension.la \
     954        libStateMachine.la libTools.la libTime.la \
     955        libConfiguration.la -lQtWebKit -lQtXml
     956
    928957timecheck_SOURCES = src/timecheck.cc src/LocalControl.h
    929958timecheck_LDADD = libDim++.la libDim.la libDimExtension.la \
    … …  
    940969        src/DataProcessorImp.h src/DataCalib.cc src/DataCalib.h \
    941970        src/DataWriteRaw.cc src/DataWriteRaw.h src/DrsCalib.h \
    942         $(am__append_8)
     971        $(am__append_9)
    943972fadctrl_LDADD = libDim++.la libDim.la  libDimExtension.la \
    944973        libStateMachine.la libTools.la libTime.la \
    … …  
    10021031test_LDADD = libStateMachine.la libTools.la libTime.la libDim++.la libDim.la libConfiguration.la
    10031032datalogger_SOURCES = src/datalogger.cc src/LocalControl.h \
    1004         src/DimState.cc src/DimState.h $(am__append_9)
     1033        src/DimState.cc src/DimState.h $(am__append_10)
    10051034datalogger_LDADD = libDim++.la libDim.la libDimExtension.la \
    10061035        libStateMachine.la libTools.la libTime.la \
    … …  
    10811110
    10821111#-------------------------------------------------------------------------
    1083 MAN_TARGETS = $(dist_man1_MANS) $(am__append_10) $(am__append_13)
     1112MAN_TARGETS = $(dist_man1_MANS) $(am__append_11) $(am__append_14)
    10841113all: $(BUILT_SOURCES)
    10851114        $(MAKE) $(AM_MAKEFLAGS) all-am
    … …  
    14911520        @rm -f ftmctrl$(EXEEXT)
    14921521        $(AM_V_CXXLD)$(CXXLINK) $(ftmctrl_OBJECTS) $(ftmctrl_LDADD) $(LIBS)
     1522src/lidctrl.$(OBJEXT): src/$(am__dirstamp) \
     1523        src/$(DEPDIR)/$(am__dirstamp)
     1524lidctrl$(EXEEXT): $(lidctrl_OBJECTS) $(lidctrl_DEPENDENCIES) $(EXTRA_lidctrl_DEPENDENCIES)
     1525        @rm -f lidctrl$(EXEEXT)
     1526        $(AM_V_CXXLD)$(CXXLINK) $(lidctrl_OBJECTS) $(lidctrl_LDADD) $(LIBS)
    14931527src/log.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
    14941528log$(EXEEXT): $(log_OBJECTS) $(log_DEPENDENCIES) $(EXTRA_log_DEPENDENCIES)
    … …  
    15051539        @rm -f magicweather$(EXEEXT)
    15061540        $(AM_V_CXXLD)$(CXXLINK) $(magicweather_OBJECTS) $(magicweather_LDADD) $(LIBS)
     1541src/makeplots.$(OBJEXT): src/$(am__dirstamp) \
     1542        src/$(DEPDIR)/$(am__dirstamp)
     1543makeplots$(EXEEXT): $(makeplots_OBJECTS) $(makeplots_DEPENDENCIES) $(EXTRA_makeplots_DEPENDENCIES)
     1544        @rm -f makeplots$(EXEEXT)
     1545        $(AM_V_CXXLD)$(CXXLINK) $(makeplots_OBJECTS) $(makeplots_LDADD) $(LIBS)
    15071546src/mcp.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
    15081547mcp$(EXEEXT): $(mcp_OBJECTS) $(mcp_DEPENDENCIES) $(EXTRA_mcp_DEPENDENCIES)
    … …  
    15131552        @rm -f moon$(EXEEXT)
    15141553        $(AM_V_CXXLD)$(CXXLINK) $(moon_OBJECTS) $(moon_LDADD) $(LIBS)
     1554src/pwrctrl.$(OBJEXT): src/$(am__dirstamp) \
     1555        src/$(DEPDIR)/$(am__dirstamp)
     1556pwrctrl$(EXEEXT): $(pwrctrl_OBJECTS) $(pwrctrl_DEPENDENCIES) $(EXTRA_pwrctrl_DEPENDENCIES)
     1557        @rm -f pwrctrl$(EXEEXT)
     1558        $(AM_V_CXXLD)$(CXXLINK) $(pwrctrl_OBJECTS) $(pwrctrl_LDADD) $(LIBS)
    15151559src/ratecontrol.$(OBJEXT): src/$(am__dirstamp) \
    15161560        src/$(DEPDIR)/$(am__dirstamp)
    … …  
    17591803        -rm -f src/ftm.$(OBJEXT)
    17601804        -rm -f src/ftmctrl.$(OBJEXT)
     1805        -rm -f src/lidctrl.$(OBJEXT)
    17611806        -rm -f src/log.$(OBJEXT)
    17621807        -rm -f src/logtime.$(OBJEXT)
    17631808        -rm -f src/magicweather.$(OBJEXT)
     1809        -rm -f src/makeplots.$(OBJEXT)
    17641810        -rm -f src/mcp.$(OBJEXT)
    17651811        -rm -f src/moon.$(OBJEXT)
     1812        -rm -f src/pwrctrl.$(OBJEXT)
    17661813        -rm -f src/ratecontrol.$(OBJEXT)
    17671814        -rm -f src/ratescan.$(OBJEXT)
    … …  
    18931940@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/ftm.Po@am__quote@
    18941941@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/ftmctrl.Po@am__quote@
     1942@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/lidctrl.Po@am__quote@
    18951943@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/log.Po@am__quote@
    18961944@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/logtime.Po@am__quote@
    18971945@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/magicweather.Po@am__quote@
     1946@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/makeplots.Po@am__quote@
    18981947@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/mcp.Po@am__quote@
    18991948@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/moon.Po@am__quote@
     1949@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/pwrctrl.Po@am__quote@
    19001950@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/ratecontrol.Po@am__quote@
    19011951@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/ratescan.Po@am__quote@
Note: See TracChangeset for help on using the changeset viewer.