Changeset 14184 for trunk

Timestamp:

06/18/12 21:53:07 (12 years ago)

Author:

tbretz

Message:

Added moon-executable.

Location:

trunk/FACT++

Files:

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

trunk/FACT++/Makefile.am

@@ -41 +41 @@
         smartfact \
         timecheck \
-        fitsdump fitscheck 
+        fitsdump fitscheck
 
 if HAS_GUI
@@ -57 +57 @@
 if HAS_VIEWER
 bin_PROGRAMS += viewer
+endif
+
+if HAS_NOVA
+bin_PROGRAMS += moon
 endif
 
@@ -243 +247 @@
 logtime_LDADD = libStateMachine.la libTools.la libTime.la libDim++.la libDim.la
 
+moon_SOURCES = src/moon.cc
+moon_LDADD = libTime.la libConfiguration.la
+
 
 chatserv_SOURCES = src/chatserv.cc src/LocalControl.h

trunk/FACT++/Makefile.in

@@ -52 +52 @@
         fitscheck$(EXEEXT) $(am__EXEEXT_1) $(am__EXEEXT_2) \
         $(am__EXEEXT_3) $(am__EXEEXT_4) $(am__EXEEXT_5) \
-        $(am__EXEEXT_6)
+        $(am__EXEEXT_6) $(am__EXEEXT_7)
 @HAS_GUI_TRUE@am__append_1 = fact
 @HAS_SOPRANO_TRUE@am__append_2 = tngweather
 @HAS_DBUS_TRUE@am__append_3 = skypeclient
 @HAS_VIEWER_TRUE@am__append_4 = viewer
-@HAS_LIBXP_TRUE@am__append_5 = did
+@HAS_NOVA_TRUE@am__append_5 = moon
+@HAS_LIBXP_TRUE@am__append_6 = did
 
 # This is a trick to be able to build them but not having them in 'all'
-@IS_FALSE@am__append_6 = \
+@IS_FALSE@am__append_7 = \
 @IS_FALSE@      test scheduler \
 @IS_FALSE@      triggerschedule \
@@ -68 +69 @@
 @IS_FALSE@      readfits
 
-@HAS_FITS_TRUE@am__append_7 = src/FitsFile.h src/FitsFile.cc \
+@HAS_FITS_TRUE@am__append_8 = src/FitsFile.h src/FitsFile.cc \
 @HAS_FITS_TRUE@ src/DataWriteFits.cc    src/DataWriteFits.h \
 @HAS_FITS_TRUE@ src/DataWriteFits2.cc    src/DataWriteFits2.h
 
-@HAS_FITS_TRUE@am__append_8 = src/FitsFile.h src/FitsFile.cc src/Fits.h src/Fits.cc
-@HAS_GROFF_TRUE@am__append_9 = $(dist_man1_MANS:.man=.html)
-@HAS_GROFF_TRUE@am__append_10 = $(dist_man1_MANS:.man=.html) 
+@HAS_FITS_TRUE@am__append_9 = src/FitsFile.h src/FitsFile.cc src/Fits.h src/Fits.cc
+@HAS_GROFF_TRUE@am__append_10 = $(dist_man1_MANS:.man=.html)
 @HAS_GROFF_TRUE@am__append_11 = $(dist_man1_MANS:.man=.html) 
-@HAS_GROFF_TRUE@@HAS_PS2PDF_TRUE@am__append_12 = $(dist_man1_MANS:.man=.pdf)
+@HAS_GROFF_TRUE@am__append_12 = $(dist_man1_MANS:.man=.html) 
 @HAS_GROFF_TRUE@@HAS_PS2PDF_TRUE@am__append_13 = $(dist_man1_MANS:.man=.pdf)
 @HAS_GROFF_TRUE@@HAS_PS2PDF_TRUE@am__append_14 = $(dist_man1_MANS:.man=.pdf)
+@HAS_GROFF_TRUE@@HAS_PS2PDF_TRUE@am__append_15 = $(dist_man1_MANS:.man=.pdf)
 subdir = .
 DIST_COMMON = README $(am__configure_deps) $(dist_man1_MANS) \
@@ -179 +180 @@
 @HAS_DBUS_TRUE@am__EXEEXT_3 = skypeclient$(EXEEXT)
 @HAS_VIEWER_TRUE@am__EXEEXT_4 = viewer$(EXEEXT)
-@HAS_LIBXP_TRUE@am__EXEEXT_5 = did$(EXEEXT)
-@IS_FALSE@am__EXEEXT_6 = test$(EXEEXT) scheduler$(EXEEXT) \
+@HAS_NOVA_TRUE@am__EXEEXT_5 = moon$(EXEEXT)
+@HAS_LIBXP_TRUE@am__EXEEXT_6 = did$(EXEEXT)
+@IS_FALSE@am__EXEEXT_7 = test$(EXEEXT) scheduler$(EXEEXT) \
 @IS_FALSE@      triggerschedule$(EXEEXT) dclient5$(EXEEXT) \
 @IS_FALSE@      dserver2$(EXEEXT) fitsloader$(EXEEXT) \
@@ -338 +340 @@
 mcp_DEPENDENCIES = libDim++.la libDim.la libDimExtension.la \
         libStateMachine.la libTools.la libTime.la libConfiguration.la
+am_moon_OBJECTS = src/moon.$(OBJEXT)
+moon_OBJECTS = $(am_moon_OBJECTS)
+moon_DEPENDENCIES = libTime.la libConfiguration.la
 am_ratecontrol_OBJECTS = src/ratecontrol.$(OBJEXT) \
         src/PixelMap.$(OBJEXT)
@@ -465 +470 @@
         $(fsc_SOURCES) $(fscctrl_SOURCES) $(ftm_SOURCES) \
         $(ftmctrl_SOURCES) $(log_SOURCES) $(logtime_SOURCES) \
-        $(magicweather_SOURCES) $(mcp_SOURCES) $(ratecontrol_SOURCES) \
-        $(ratescan_SOURCES) $(readfits_SOURCES) sched.c \
-        $(scheduler_SOURCES) $(skypeclient_SOURCES) \
+        $(magicweather_SOURCES) $(mcp_SOURCES) $(moon_SOURCES) \
+        $(ratecontrol_SOURCES) $(ratescan_SOURCES) $(readfits_SOURCES) \
+        sched.c $(scheduler_SOURCES) $(skypeclient_SOURCES) \
         $(smartfact_SOURCES) $(test_SOURCES) $(time_SOURCES) \
         $(timecheck_SOURCES) $(tngweather_SOURCES) \
@@ -485 +490 @@
         $(ftm_SOURCES) $(ftmctrl_SOURCES) $(log_SOURCES) \
         $(logtime_SOURCES) $(magicweather_SOURCES) $(mcp_SOURCES) \
-        $(ratecontrol_SOURCES) $(ratescan_SOURCES) $(readfits_SOURCES) \
-        sched.c $(scheduler_SOURCES) $(skypeclient_SOURCES) \
-        $(smartfact_SOURCES) $(test_SOURCES) $(time_SOURCES) \
-        $(timecheck_SOURCES) $(tngweather_SOURCES) \
+        $(moon_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)
 man1dir = $(mandir)/man1
@@ -753 +758 @@
 
 #-------------------------------------------------------------------------
-CLEANFILES = $(BUILT_SOURCES) $(am__append_11) $(am__append_14)
+CLEANFILES = $(BUILT_SOURCES) $(am__append_12) $(am__append_15)
 dist_noinst_SCRIPTS = autogen.sh
 EXTRA_DIST = Doxyfile dim/DIM_Performance.pdf dim/LICENSE.GPL \
@@ -761 +766 @@
         dim/README_v17.txt dim/README_v18.txt dim/README_v19.txt \
         $(fact_DIALOGS) $(fact_RESOURCES) $(viewer_DIALOGS) \
-        $(viewer_RESOURCES) $(am__append_10) $(am__append_13)
+        $(viewer_RESOURCES) $(am__append_11) $(am__append_14)
 dns_LDADD = libDim.la libDimExtension.la
 dns_SOURCES = src/dns.c
@@ -876 +881 @@
 logtime_SOURCES = src/logtime.cc
 logtime_LDADD = libStateMachine.la libTools.la libTime.la libDim++.la libDim.la
+moon_SOURCES = src/moon.cc
+moon_LDADD = libTime.la libConfiguration.la
 chatserv_SOURCES = src/chatserv.cc src/LocalControl.h
 chatserv_LDADD = libStateMachine.la libTools.la libConfiguration.la libTime.la \
@@ -918 +925 @@
         src/DataProcessorImp.h src/DataCalib.cc src/DataCalib.h \
         src/DataWriteRaw.cc src/DataWriteRaw.h src/DrsCalib.h \
-        $(am__append_7)
+        $(am__append_8)
 fadctrl_LDADD = libDim++.la libDim.la  libDimExtension.la \
         libStateMachine.la libTools.la libTime.la \
@@ -980 +987 @@
 test_LDADD = libStateMachine.la libTools.la libTime.la libDim++.la libDim.la libConfiguration.la
 datalogger_SOURCES = src/datalogger.cc src/LocalControl.h \
-        $(am__append_8)
+        $(am__append_9)
 datalogger_LDADD = libDim++.la libDim.la libDimExtension.la \
         libStateMachine.la libTools.la libTime.la \
@@ -1058 +1065 @@
 
 #-------------------------------------------------------------------------
-MAN_TARGETS = $(dist_man1_MANS) $(am__append_9) $(am__append_12)
+MAN_TARGETS = $(dist_man1_MANS) $(am__append_10) $(am__append_13)
 all: $(BUILT_SOURCES)
         $(MAKE) $(AM_MAKEFLAGS) all-am
@@ -1486 +1493 @@
         @rm -f mcp$(EXEEXT)
         $(AM_V_CXXLD)$(CXXLINK) $(mcp_OBJECTS) $(mcp_LDADD) $(LIBS)
+src/moon.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+moon$(EXEEXT): $(moon_OBJECTS) $(moon_DEPENDENCIES) 
+        @rm -f moon$(EXEEXT)
+        $(AM_V_CXXLD)$(CXXLINK) $(moon_OBJECTS) $(moon_LDADD) $(LIBS)
 src/ratecontrol.$(OBJEXT): src/$(am__dirstamp) \
         src/$(DEPDIR)/$(am__dirstamp)
@@ -1730 +1741 @@
         -rm -f src/magicweather.$(OBJEXT)
         -rm -f src/mcp.$(OBJEXT)
+        -rm -f src/moon.$(OBJEXT)
         -rm -f src/ratecontrol.$(OBJEXT)
         -rm -f src/ratescan.$(OBJEXT)
@@ -1861 +1873 @@
 @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)/moon.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/ratecontrol.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/ratescan.Po@am__quote@