Changeset 15336 for trunk

Timestamp:

04/14/13 17:25:35 (12 years ago)

Author:

tbretz

Message:

Added temperature

Location:

trunk/FACT++

Files:

• Makefile.am (modified) (3 diffs)
• Makefile.in (modified) (9 diffs)

trunk/FACT++/Makefile.am

@@ -41 +41 @@
         magicweather magiclidar \
         smartfact \
+        temperature \
         timecheck \
         fitsdump fitscheck \
@@ -114 +115 @@
         magiclidar.man \
         smartfact.man \
+        temperature.man \
         timecheck.man \
         zfits.man
@@ -329 +331 @@
         libConfiguration.la -lQtWebKit -lQtXml
 
+temperature_SOURCES = src/temperature.cc src/LocalControl.h
+temperature_LDADD   = libDim++.la libDim.la libDimExtension.la \
+        libStateMachine.la libTools.la libTime.la \
+        libConfiguration.la
+
 pwrctrl_SOURCES = src/pwrctrl.cc src/LocalControl.h \
         src/HeadersPower.h src/HeadersPower.cc

trunk/FACT++/Makefile.in

@@ -53 +53 @@
         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) \
+        magiclidar$(EXEEXT) smartfact$(EXEEXT) temperature$(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)
@@ -414 +414 @@
 smartfact_DEPENDENCIES = libDim++.la libDim.la libDimExtension.la \
         libStateMachine.la libTools.la libTime.la libConfiguration.la
+am_temperature_OBJECTS = src/temperature.$(OBJEXT)
+temperature_OBJECTS = $(am_temperature_OBJECTS)
+temperature_DEPENDENCIES = libDim++.la libDim.la libDimExtension.la \
+        libStateMachine.la libTools.la libTime.la libConfiguration.la
 am_test_OBJECTS = src/test.$(OBJEXT)
 test_OBJECTS = $(am_test_OBJECTS)
@@ -530 +534 @@
         $(ratescan_SOURCES) $(readfits_SOURCES) sched.c \
         $(scheduler_SOURCES) $(skypeclient_SOURCES) \
-        $(smartfact_SOURCES) $(test_SOURCES) $(time_SOURCES) \
-        $(timecheck_SOURCES) $(tngweather_SOURCES) \
+        $(smartfact_SOURCES) $(temperature_SOURCES) $(test_SOURCES) \
+        $(time_SOURCES) $(timecheck_SOURCES) $(tngweather_SOURCES) \
         $(triggerschedule_SOURCES) $(viewer_SOURCES) $(webDid_SOURCES) \
         $(zfits_SOURCES)
@@ -552 +556 @@
         $(pwrctrl_SOURCES) $(ratecontrol_SOURCES) $(ratescan_SOURCES) \
         $(readfits_SOURCES) sched.c $(scheduler_SOURCES) \
-        $(skypeclient_SOURCES) $(smartfact_SOURCES) $(test_SOURCES) \
-        $(time_SOURCES) $(timecheck_SOURCES) $(tngweather_SOURCES) \
+        $(skypeclient_SOURCES) $(smartfact_SOURCES) \
+        $(temperature_SOURCES) $(test_SOURCES) $(time_SOURCES) \
+        $(timecheck_SOURCES) $(tngweather_SOURCES) \
         $(triggerschedule_SOURCES) $(am__viewer_SOURCES_DIST) \
         $(webDid_SOURCES) $(zfits_SOURCES)
@@ -840 +845 @@
 @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)
+@HAS_HELP2MAN_TRUE@     smartfact.man temperature.man timecheck.man \
+@HAS_HELP2MAN_TRUE@     zfits.man $(am__append_10)
 
 #-------------------------------------------------------------------------
@@ -1022 +1027 @@
         libStateMachine.la libTools.la libTime.la \
         libConfiguration.la -lQtWebKit -lQtXml
+
+temperature_SOURCES = src/temperature.cc src/LocalControl.h
+temperature_LDADD = libDim++.la libDim.la libDimExtension.la \
+        libStateMachine.la libTools.la libTime.la \
+        libConfiguration.la
 
 pwrctrl_SOURCES = src/pwrctrl.cc src/LocalControl.h \
@@ -1691 +1701 @@
         @rm -f smartfact$(EXEEXT)
         $(AM_V_CXXLD)$(CXXLINK) $(smartfact_OBJECTS) $(smartfact_LDADD) $(LIBS)
+src/temperature.$(OBJEXT): src/$(am__dirstamp) \
+        src/$(DEPDIR)/$(am__dirstamp)
+temperature$(EXEEXT): $(temperature_OBJECTS) $(temperature_DEPENDENCIES) $(EXTRA_temperature_DEPENDENCIES) 
+        @rm -f temperature$(EXEEXT)
+        $(AM_V_CXXLD)$(CXXLINK) $(temperature_OBJECTS) $(temperature_LDADD) $(LIBS)
 src/test.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
 test$(EXEEXT): $(test_OBJECTS) $(test_DEPENDENCIES) $(EXTRA_test_DEPENDENCIES) 
@@ -1945 +1960 @@
         -rm -f src/skypeclient.$(OBJEXT)
         -rm -f src/smartfact.$(OBJEXT)
+        -rm -f src/temperature.$(OBJEXT)
         -rm -f src/test.$(OBJEXT)
         -rm -f src/time.$(OBJEXT)
@@ -2090 +2106 @@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/skypeclient.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/smartfact.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/temperature.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/test.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/time.Po@am__quote@