Changeset 12646 for trunk

Timestamp:

11/25/11 22:47:22 (13 years ago)

Author:

tbretz

Message:

Added magicweather

Location:

trunk/FACT++

Files:

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

trunk/FACT++/Makefile.am

@@ -39 +39 @@
         biasctrl drivectrl \
         mcp feedback ratescan ratecontrol \
+        magicweather \
         fitsdump
 
@@ -250 +251 @@
         libConfiguration.la
 
+magicweather_SOURCES = src/magicweather.cc src/LocalControl.h
+magicweather_LDADD   = libDim.la libDim++.la libDimExtension.la \
+        libTime.la libTools.la libStateMachine.la \
+        libConfiguration.la
+
 fadctrl_SOURCES = src/fadctrl.cc src/LocalControl.h src/HeadersFAD.cc \
         src/EventBuilder.c      src/EventBuilder.h \
@@ -269 +275 @@
         libConfiguration.la
 
-biasctrl_SOURCES = src/biasctrl.cc src/LocalControl.h
+biasctrl_SOURCES = src/biasctrl.cc src/LocalControl.h src/PixelMap.cc
 biasctrl_LDADD   = libDim.la libDim++.la  libDimExtension.la \
         libTime.la libTools.la libStateMachine.la \

trunk/FACT++/Makefile.in

@@ -183 +183 @@
 astro_OBJECTS = astro.$(OBJEXT)
 astro_LDADD = $(LDADD)
-am_biasctrl_OBJECTS = src/biasctrl.$(OBJEXT)
+am_biasctrl_OBJECTS = src/biasctrl.$(OBJEXT) src/PixelMap.$(OBJEXT)
 biasctrl_OBJECTS = $(am_biasctrl_OBJECTS)
 biasctrl_DEPENDENCIES = libDim.la libDim++.la libDimExtension.la \
@@ -312 +312 @@
 logtime_DEPENDENCIES = libTools.la libStateMachine.la libTime.la \
         libDim.la libDim++.la
+am_magicweather_OBJECTS = src/magicweather.$(OBJEXT)
+magicweather_OBJECTS = $(am_magicweather_OBJECTS)
+magicweather_DEPENDENCIES = libDim.la libDim++.la libDimExtension.la \
+        libTime.la libTools.la libStateMachine.la libConfiguration.la
 am_mcp_OBJECTS = src/mcp.$(OBJEXT)
 mcp_OBJECTS = $(am_mcp_OBJECTS)
@@ -422 +426 @@
         fitsgrep.c $(fitsloader_SOURCES) $(fsc_SOURCES) \
         $(fscctrl_SOURCES) $(ftm_SOURCES) $(ftmctrl_SOURCES) \
-        $(log_SOURCES) $(logtime_SOURCES) $(mcp_SOURCES) \
-        $(ratecontrol_SOURCES) $(ratescan_SOURCES) $(readfits_SOURCES) \
-        sched.c $(scheduler_SOURCES) $(test_SOURCES) $(time_SOURCES) \
-        $(triggerschedule_SOURCES) $(viewer_SOURCES)
+        $(log_SOURCES) $(logtime_SOURCES) $(magicweather_SOURCES) \
+        $(mcp_SOURCES) $(ratecontrol_SOURCES) $(ratescan_SOURCES) \
+        $(readfits_SOURCES) sched.c $(scheduler_SOURCES) \
+        $(test_SOURCES) $(time_SOURCES) $(triggerschedule_SOURCES) \
+        $(viewer_SOURCES)
 DIST_SOURCES = $(libConfiguration_la_SOURCES) $(libDim___la_SOURCES) \
         $(libDim_la_SOURCES) $(libDimExtension_la_SOURCES) \
@@ -439 +444 @@
         $(fsc_SOURCES) $(fscctrl_SOURCES) $(ftm_SOURCES) \
         $(ftmctrl_SOURCES) $(log_SOURCES) $(logtime_SOURCES) \
-        $(mcp_SOURCES) $(ratecontrol_SOURCES) $(ratescan_SOURCES) \
-        $(readfits_SOURCES) sched.c $(scheduler_SOURCES) \
-        $(test_SOURCES) $(time_SOURCES) $(triggerschedule_SOURCES) \
-        $(am__viewer_SOURCES_DIST)
+        $(magicweather_SOURCES) $(mcp_SOURCES) $(ratecontrol_SOURCES) \
+        $(ratescan_SOURCES) $(readfits_SOURCES) sched.c \
+        $(scheduler_SOURCES) $(test_SOURCES) $(time_SOURCES) \
+        $(triggerschedule_SOURCES) $(am__viewer_SOURCES_DIST)
 man1dir = $(mandir)/man1
 NROFF = nroff
@@ -841 +846 @@
         libConfiguration.la
 
+magicweather_SOURCES = src/magicweather.cc src/LocalControl.h
+magicweather_LDADD = libDim.la libDim++.la libDimExtension.la \
+        libTime.la libTools.la libStateMachine.la \
+        libConfiguration.la
+
 fadctrl_SOURCES = src/fadctrl.cc src/LocalControl.h src/HeadersFAD.cc \
         src/EventBuilder.c src/EventBuilder.h src/DataProcessorImp.cc \
@@ -855 +865 @@
         libConfiguration.la
 
-biasctrl_SOURCES = src/biasctrl.cc src/LocalControl.h
+biasctrl_SOURCES = src/biasctrl.cc src/LocalControl.h src/PixelMap.cc
 biasctrl_LDADD = libDim.la libDim++.la  libDimExtension.la \
         libTime.la libTools.la libStateMachine.la \
@@ -1213 +1223 @@
 src/biasctrl.$(OBJEXT): src/$(am__dirstamp) \
         src/$(DEPDIR)/$(am__dirstamp)
+src/PixelMap.$(OBJEXT): src/$(am__dirstamp) \
+        src/$(DEPDIR)/$(am__dirstamp)
 biasctrl$(EXEEXT): $(biasctrl_OBJECTS) $(biasctrl_DEPENDENCIES) 
         @rm -f biasctrl$(EXEEXT)
@@ -1306 +1318 @@
 gui/FactGui.$(OBJEXT): gui/$(am__dirstamp) \
         gui/$(DEPDIR)/$(am__dirstamp)
-src/PixelMap.$(OBJEXT): src/$(am__dirstamp) \
-        src/$(DEPDIR)/$(am__dirstamp)
 fact$(EXEEXT): $(fact_OBJECTS) $(fact_DEPENDENCIES) 
         @rm -f fact$(EXEEXT)
@@ -1377 +1387 @@
         @rm -f logtime$(EXEEXT)
         $(AM_V_CXXLD)$(CXXLINK) $(logtime_OBJECTS) $(logtime_LDADD) $(LIBS)
+src/magicweather.$(OBJEXT): src/$(am__dirstamp) \
+        src/$(DEPDIR)/$(am__dirstamp)
+magicweather$(EXEEXT): $(magicweather_OBJECTS) $(magicweather_DEPENDENCIES) 
+        @rm -f magicweather$(EXEEXT)
+        $(AM_V_CXXLD)$(CXXLINK) $(magicweather_OBJECTS) $(magicweather_LDADD) $(LIBS)
 src/mcp.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
 mcp$(EXEEXT): $(mcp_OBJECTS) $(mcp_DEPENDENCIES) 
@@ -1578 +1593 @@
         -rm -f src/log.$(OBJEXT)
         -rm -f src/logtime.$(OBJEXT)
+        -rm -f src/magicweather.$(OBJEXT)
         -rm -f src/mcp.$(OBJEXT)
         -rm -f src/ratecontrol.$(OBJEXT)
@@ -1691 +1707 @@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/log.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/logtime.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/magicweather.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/mcp.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/ratecontrol.Po@am__quote@