Changeset 14871 for trunk

Timestamp:

02/05/13 15:15:20 (12 years ago)

Author:

tbretz

Message:

Added magiclidar and zfits

Location:

trunk/FACT++

Files:

• Makefile.am (modified) (4 diffs)
• Makefile.in (modified) (14 diffs)

trunk/FACT++/Makefile.am

@@ -38 +38 @@
         biasctrl drivectrl agilentctrl \
         mcp feedback ratescan ratecontrol \
-        magicweather \
+        magicweather magiclidar \
         smartfact \
         timecheck \
-        fitsdump fitscheck
+        fitsdump fitscheck \ 
+        zfits
 
 if HAS_GUI
@@ -108 +109 @@
         fitscheck.man \
         magicweather.man \
+        magiclidar.man \
         smartfact.man \
-        timecheck.man
+        timecheck.man \
+        zfits.man
 if HAS_SOPRANO
 dist_man1_MANS += tngweather.man lidctrl.man pwrctrl.man
@@ -301 +304 @@
         libConfiguration.la
 
+magiclidar_SOURCES = src/magiclidar.cc src/LocalControl.h
+magiclidar_LDADD   = libDim++.la libDim.la libDimExtension.la \
+        libStateMachine.la libTools.la libTime.la \
+        libConfiguration.la
+
 tngweather_SOURCES = src/tngweather.cc src/LocalControl.h
 tngweather_LDADD   = libDim++.la libDim.la libDimExtension.la \
@@ -429 +437 @@
 readfits_LDADD   = libStateMachine.la libTools.la libTime.la libDim++.la libDim.la libConfiguration.la
 
+zfits_SOURCES = src/zfits.cc externals/huffmans.h
+zfits_LDADD   = libTime.la libConfiguration.la
+
 triggerschedule_SOURCES = src/triggerschedule.cc 
 triggerschedule_LDADD   = libDim++.la libDim.la libDimExtension.la libConfiguration.la

trunk/FACT++/Makefile.in

@@ -53 +53 @@
         drivectrl$(EXEEXT) agilentctrl$(EXEEXT) mcp$(EXEEXT) \
         feedback$(EXEEXT) ratescan$(EXEEXT) ratecontrol$(EXEEXT) \
-        magicweather$(EXEEXT) smartfact$(EXEEXT) timecheck$(EXEEXT) \
-        fitsdump$(EXEEXT) fitscheck$(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)
+        magicweather$(EXEEXT) magiclidar$(EXEEXT) smartfact$(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)
 @HAS_GUI_TRUE@am__append_1 = fact
 @HAS_SOPRANO_TRUE@am__append_2 = tngweather lidctrl pwrctrl
@@ -351 +351 @@
 logtime_DEPENDENCIES = libStateMachine.la libTools.la libTime.la \
         libDim++.la libDim.la
+am_magiclidar_OBJECTS = src/magiclidar.$(OBJEXT)
+magiclidar_OBJECTS = $(am_magiclidar_OBJECTS)
+magiclidar_DEPENDENCIES = libDim++.la libDim.la libDimExtension.la \
+        libStateMachine.la libTools.la libTime.la libConfiguration.la
 am_magicweather_OBJECTS = src/magicweather.$(OBJEXT)
 magicweather_OBJECTS = $(am_magicweather_OBJECTS)
@@ -448 +452 @@
         $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(viewer_CXXFLAGS) \
         $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+am_zfits_OBJECTS = src/zfits.$(OBJEXT)
+zfits_OBJECTS = $(am_zfits_OBJECTS)
+zfits_DEPENDENCIES = libTime.la libConfiguration.la
 SCRIPTS = $(dist_noinst_SCRIPTS)
 DEFAULT_INCLUDES = -I.@am__isrc@
@@ -503 +510 @@
         $(fitsloader_SOURCES) $(fsc_SOURCES) $(fscctrl_SOURCES) \
         $(ftm_SOURCES) $(ftmctrl_SOURCES) $(lidctrl_SOURCES) \
-        $(log_SOURCES) $(logtime_SOURCES) $(magicweather_SOURCES) \
-        $(makedata_SOURCES) $(makeplots_SOURCES) $(mcp_SOURCES) \
-        $(moon_SOURCES) $(pwrctrl_SOURCES) $(ratecontrol_SOURCES) \
-        $(ratescan_SOURCES) $(readfits_SOURCES) sched.c \
-        $(scheduler_SOURCES) $(skypeclient_SOURCES) \
-        $(smartfact_SOURCES) $(test_SOURCES) $(time_SOURCES) \
-        $(timecheck_SOURCES) $(tngweather_SOURCES) \
-        $(triggerschedule_SOURCES) $(viewer_SOURCES)
+        $(log_SOURCES) $(logtime_SOURCES) $(magiclidar_SOURCES) \
+        $(magicweather_SOURCES) $(makedata_SOURCES) \
+        $(makeplots_SOURCES) $(mcp_SOURCES) $(moon_SOURCES) \
+        $(pwrctrl_SOURCES) $(ratecontrol_SOURCES) $(ratescan_SOURCES) \
+        $(readfits_SOURCES) sched.c $(scheduler_SOURCES) \
+        $(skypeclient_SOURCES) $(smartfact_SOURCES) $(test_SOURCES) \
+        $(time_SOURCES) $(timecheck_SOURCES) $(tngweather_SOURCES) \
+        $(triggerschedule_SOURCES) $(viewer_SOURCES) $(zfits_SOURCES)
 DIST_SOURCES = $(libConfiguration_la_SOURCES) $(libDim___la_SOURCES) \
         $(libDim_la_SOURCES) $(libDimExtension_la_SOURCES) \
@@ -524 +531 @@
         $(fitsloader_SOURCES) $(fsc_SOURCES) $(fscctrl_SOURCES) \
         $(ftm_SOURCES) $(ftmctrl_SOURCES) $(lidctrl_SOURCES) \
-        $(log_SOURCES) $(logtime_SOURCES) $(magicweather_SOURCES) \
-        $(makedata_SOURCES) $(makeplots_SOURCES) $(mcp_SOURCES) \
-        $(moon_SOURCES) $(pwrctrl_SOURCES) $(ratecontrol_SOURCES) \
-        $(ratescan_SOURCES) $(readfits_SOURCES) sched.c \
-        $(scheduler_SOURCES) $(skypeclient_SOURCES) \
-        $(smartfact_SOURCES) $(test_SOURCES) $(time_SOURCES) \
-        $(timecheck_SOURCES) $(tngweather_SOURCES) \
-        $(triggerschedule_SOURCES) $(am__viewer_SOURCES_DIST)
+        $(log_SOURCES) $(logtime_SOURCES) $(magiclidar_SOURCES) \
+        $(magicweather_SOURCES) $(makedata_SOURCES) \
+        $(makeplots_SOURCES) $(mcp_SOURCES) $(moon_SOURCES) \
+        $(pwrctrl_SOURCES) $(ratecontrol_SOURCES) $(ratescan_SOURCES) \
+        $(readfits_SOURCES) sched.c $(scheduler_SOURCES) \
+        $(skypeclient_SOURCES) $(smartfact_SOURCES) $(test_SOURCES) \
+        $(time_SOURCES) $(timecheck_SOURCES) $(tngweather_SOURCES) \
+        $(triggerschedule_SOURCES) $(am__viewer_SOURCES_DIST) \
+        $(zfits_SOURCES)
 man1dir = $(mandir)/man1
 NROFF = nroff
@@ -814 +822 @@
 @HAS_HELP2MAN_TRUE@     feedback.man ratescan.man ratecontrol.man \
 @HAS_HELP2MAN_TRUE@     fitsdump.man fitscheck.man magicweather.man \
-@HAS_HELP2MAN_TRUE@     smartfact.man timecheck.man \
-@HAS_HELP2MAN_TRUE@     $(am__append_10)
+@HAS_HELP2MAN_TRUE@     magiclidar.man smartfact.man timecheck.man \
+@HAS_HELP2MAN_TRUE@     zfits.man $(am__append_10)
 
 #-------------------------------------------------------------------------
@@ -975 +983 @@
         libConfiguration.la
 
+magiclidar_SOURCES = src/magiclidar.cc src/LocalControl.h
+magiclidar_LDADD = libDim++.la libDim.la libDimExtension.la \
+        libStateMachine.la libTools.la libTime.la \
+        libConfiguration.la
+
 tngweather_SOURCES = src/tngweather.cc src/LocalControl.h
 tngweather_LDADD = libDim++.la libDim.la libDimExtension.la \
@@ -1085 +1098 @@
 readfits_SOURCES = src/readfits.cc src/ReadFits.h
 readfits_LDADD = libStateMachine.la libTools.la libTime.la libDim++.la libDim.la libConfiguration.la
+zfits_SOURCES = src/zfits.cc externals/huffmans.h
+zfits_LDADD = libTime.la libConfiguration.la
 triggerschedule_SOURCES = src/triggerschedule.cc 
 triggerschedule_LDADD = libDim++.la libDim.la libDimExtension.la libConfiguration.la
@@ -1578 +1593 @@
         @rm -f logtime$(EXEEXT)
         $(AM_V_CXXLD)$(CXXLINK) $(logtime_OBJECTS) $(logtime_LDADD) $(LIBS)
+src/magiclidar.$(OBJEXT): src/$(am__dirstamp) \
+        src/$(DEPDIR)/$(am__dirstamp)
+magiclidar$(EXEEXT): $(magiclidar_OBJECTS) $(magiclidar_DEPENDENCIES) $(EXTRA_magiclidar_DEPENDENCIES) 
+        @rm -f magiclidar$(EXEEXT)
+        $(AM_V_CXXLD)$(CXXLINK) $(magiclidar_OBJECTS) $(magiclidar_LDADD) $(LIBS)
 src/magicweather.$(OBJEXT): src/$(am__dirstamp) \
         src/$(DEPDIR)/$(am__dirstamp)
@@ -1699 +1719 @@
         @rm -f viewer$(EXEEXT)
         $(AM_V_CXXLD)$(viewer_LINK) $(viewer_OBJECTS) $(viewer_LDADD) $(LIBS)
+src/zfits.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+zfits$(EXEEXT): $(zfits_OBJECTS) $(zfits_DEPENDENCIES) $(EXTRA_zfits_DEPENDENCIES) 
+        @rm -f zfits$(EXEEXT)
+        $(AM_V_CXXLD)$(CXXLINK) $(zfits_OBJECTS) $(zfits_LDADD) $(LIBS)
 
 mostlyclean-compile:
@@ -1859 +1883 @@
         -rm -f src/log.$(OBJEXT)
         -rm -f src/logtime.$(OBJEXT)
+        -rm -f src/magiclidar.$(OBJEXT)
         -rm -f src/magicweather.$(OBJEXT)
         -rm -f src/makedata.$(OBJEXT)
@@ -1882 +1907 @@
         -rm -f src/viewer-FitsFile.$(OBJEXT)
         -rm -f src/viewer-PixelMap.$(OBJEXT)
+        -rm -f src/zfits.$(OBJEXT)
 
 distclean-compile:
@@ -1999 +2025 @@
 @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)/magiclidar.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/magicweather.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/makedata.Po@am__quote@
@@ -2021 +2048 @@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/viewer-FitsFile.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/viewer-PixelMap.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/zfits.Po@am__quote@
 
 .c.o: