Changeset 14787 for trunk

Timestamp:

01/21/13 14:03:15 (12 years ago)

Author:

tbretz

Message:

Added makedata

File:

• trunk/FACT++/Makefile.in (modified) (16 diffs)

trunk/FACT++/Makefile.in

@@ -57 +57 @@
         $(am__EXEEXT_2) $(am__EXEEXT_3) $(am__EXEEXT_4) \
         $(am__EXEEXT_5) $(am__EXEEXT_6) $(am__EXEEXT_7) \
-        $(am__EXEEXT_8)
+        $(am__EXEEXT_8) $(am__EXEEXT_9)
 @HAS_GUI_TRUE@am__append_1 = fact
 @HAS_SOPRANO_TRUE@am__append_2 = tngweather lidctrl pwrctrl
@@ -63 +63 @@
 @HAS_VIEWER_TRUE@am__append_4 = viewer
 @HAS_NOVA_TRUE@am__append_5 = moon
-@HAS_NOVA_TRUE@@HAS_ROOT_TRUE@@HAS_SQL_TRUE@am__append_6 = makeplots
-@HAS_LIBXP_TRUE@am__append_7 = did
+@HAS_NOVA_TRUE@@HAS_SQL_TRUE@am__append_6 = makedata
+@HAS_NOVA_TRUE@@HAS_ROOT_TRUE@@HAS_SQL_TRUE@am__append_7 = makeplots
+@HAS_LIBXP_TRUE@am__append_8 = did
 
 # This is a trick to be able to build them but not having them in 'all'
-@IS_FALSE@am__append_8 = \
+@IS_FALSE@am__append_9 = \
 @IS_FALSE@      test scheduler \
 @IS_FALSE@      triggerschedule \
@@ -74 +75 @@
 @IS_FALSE@      sched astro readfits
 
-@HAS_HELP2MAN_TRUE@@HAS_SOPRANO_TRUE@am__append_9 = tngweather.man lidctrl.man pwrctrl.man
-@HAS_FITS_TRUE@am__append_10 = src/FitsFile.h src/FitsFile.cc \
+@HAS_HELP2MAN_TRUE@@HAS_SOPRANO_TRUE@am__append_10 = tngweather.man lidctrl.man pwrctrl.man
+@HAS_FITS_TRUE@am__append_11 = 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_11 = src/FitsFile.h src/FitsFile.cc src/Fits.h src/Fits.cc
-@HAS_GROFF_TRUE@am__append_12 = $(dist_man1_MANS:.man=.html)
-@HAS_GROFF_TRUE@am__append_13 = $(dist_man1_MANS:.man=.html) 
+@HAS_FITS_TRUE@am__append_12 = src/FitsFile.h src/FitsFile.cc src/Fits.h src/Fits.cc
+@HAS_GROFF_TRUE@am__append_13 = $(dist_man1_MANS:.man=.html)
 @HAS_GROFF_TRUE@am__append_14 = $(dist_man1_MANS:.man=.html) 
-@HAS_GROFF_TRUE@@HAS_PS2PDF_TRUE@am__append_15 = $(dist_man1_MANS:.man=.pdf)
+@HAS_GROFF_TRUE@am__append_15 = $(dist_man1_MANS:.man=.html) 
 @HAS_GROFF_TRUE@@HAS_PS2PDF_TRUE@am__append_16 = $(dist_man1_MANS:.man=.pdf)
 @HAS_GROFF_TRUE@@HAS_PS2PDF_TRUE@am__append_17 = $(dist_man1_MANS:.man=.pdf)
+@HAS_GROFF_TRUE@@HAS_PS2PDF_TRUE@am__append_18 = $(dist_man1_MANS:.man=.pdf)
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -187 +188 @@
 @HAS_VIEWER_TRUE@am__EXEEXT_4 = viewer$(EXEEXT)
 @HAS_NOVA_TRUE@am__EXEEXT_5 = moon$(EXEEXT)
-@HAS_NOVA_TRUE@@HAS_ROOT_TRUE@@HAS_SQL_TRUE@am__EXEEXT_6 = makeplots$(EXEEXT)
-@HAS_LIBXP_TRUE@am__EXEEXT_7 = did$(EXEEXT)
-@IS_FALSE@am__EXEEXT_8 = test$(EXEEXT) scheduler$(EXEEXT) \
+@HAS_NOVA_TRUE@@HAS_SQL_TRUE@am__EXEEXT_6 = makedata$(EXEEXT)
+@HAS_NOVA_TRUE@@HAS_ROOT_TRUE@@HAS_SQL_TRUE@am__EXEEXT_7 = makeplots$(EXEEXT)
+@HAS_LIBXP_TRUE@am__EXEEXT_8 = did$(EXEEXT)
+@IS_FALSE@am__EXEEXT_9 = test$(EXEEXT) scheduler$(EXEEXT) \
 @IS_FALSE@      triggerschedule$(EXEEXT) dclient5$(EXEEXT) \
 @IS_FALSE@      dserver2$(EXEEXT) fitsloader$(EXEEXT) \
@@ -353 +355 @@
 magicweather_DEPENDENCIES = libDim++.la libDim.la libDimExtension.la \
         libStateMachine.la libTools.la libTime.la libConfiguration.la
+am_makedata_OBJECTS = src/makedata.$(OBJEXT)
+makedata_OBJECTS = $(am_makedata_OBJECTS)
+makedata_DEPENDENCIES = libTime.la libConfiguration.la
 am_makeplots_OBJECTS = src/makeplots.$(OBJEXT)
 makeplots_OBJECTS = $(am_makeplots_OBJECTS)
@@ -499 +504 @@
         $(ftm_SOURCES) $(ftmctrl_SOURCES) $(lidctrl_SOURCES) \
         $(log_SOURCES) $(logtime_SOURCES) $(magicweather_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) \
+        $(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)
 DIST_SOURCES = $(libConfiguration_la_SOURCES) $(libDim___la_SOURCES) \
@@ -519 +525 @@
         $(ftm_SOURCES) $(ftmctrl_SOURCES) $(lidctrl_SOURCES) \
         $(log_SOURCES) $(logtime_SOURCES) $(magicweather_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) \
+        $(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)
 man1dir = $(mandir)/man1
@@ -807 +814 @@
 @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 $(am__append_9)
+@HAS_HELP2MAN_TRUE@     smartfact.man timecheck.man \
+@HAS_HELP2MAN_TRUE@     $(am__append_10)
 
 #-------------------------------------------------------------------------
-CLEANFILES = $(BUILT_SOURCES) $(am__append_14) $(am__append_17)
+CLEANFILES = $(BUILT_SOURCES) $(am__append_15) $(am__append_18)
 dist_noinst_SCRIPTS = autogen.sh
 EXTRA_DIST = Doxyfile dim/DIM_Performance.pdf dim/LICENSE.GPL \
@@ -818 +826 @@
         dim/README_v17.txt dim/README_v18.txt dim/README_v19.txt \
         $(fact_DIALOGS) $(fact_RESOURCES) $(viewer_DIALOGS) \
-        $(viewer_RESOURCES) $(am__append_13) $(am__append_16)
+        $(viewer_RESOURCES) $(am__append_14) $(am__append_17)
 dns_LDADD = libDim.la libDimExtension.la
 dns_SOURCES = src/dns.c
@@ -937 +945 @@
 makeplots_SOURCES = src/makeplots.cc
 makeplots_LDADD = $(ROOTLDFLAGS) $(ROOTLIBS) libTime.la libConfiguration.la
+makedata_SOURCES = src/makedata.cc
+makedata_LDADD = libTime.la libConfiguration.la
 chatserv_SOURCES = src/chatserv.cc src/LocalControl.h
 chatserv_LDADD = libStateMachine.la libTools.la libConfiguration.la libTime.la \
@@ -996 +1006 @@
         src/DataProcessorImp.h src/DataCalib.cc src/DataCalib.h \
         src/DataWriteRaw.cc src/DataWriteRaw.h src/DrsCalib.h \
-        $(am__append_10)
+        $(am__append_11)
 fadctrl_LDADD = libDim++.la libDim.la  libDimExtension.la \
         libStateMachine.la libTools.la libTime.la \
@@ -1058 +1068 @@
 test_LDADD = libStateMachine.la libTools.la libTime.la libDim++.la libDim.la libConfiguration.la
 datalogger_SOURCES = src/datalogger.cc src/LocalControl.h \
-        src/DimState.cc src/DimState.h $(am__append_11)
+        src/DimState.cc src/DimState.h $(am__append_12)
 datalogger_LDADD = libDim++.la libDim.la libDimExtension.la \
         libStateMachine.la libTools.la libTime.la \
@@ -1137 +1147 @@
 
 #-------------------------------------------------------------------------
-MAN_TARGETS = $(dist_man1_MANS) $(am__append_12) $(am__append_15)
+MAN_TARGETS = $(dist_man1_MANS) $(am__append_13) $(am__append_16)
 @HAS_JSDOC_TRUE@JAVA_SCRIPT_DOC = jsdoc
 all: $(BUILT_SOURCES)
@@ -1573 +1583 @@
         @rm -f magicweather$(EXEEXT)
         $(AM_V_CXXLD)$(CXXLINK) $(magicweather_OBJECTS) $(magicweather_LDADD) $(LIBS)
+src/makedata.$(OBJEXT): src/$(am__dirstamp) \
+        src/$(DEPDIR)/$(am__dirstamp)
+makedata$(EXEEXT): $(makedata_OBJECTS) $(makedata_DEPENDENCIES) $(EXTRA_makedata_DEPENDENCIES) 
+        @rm -f makedata$(EXEEXT)
+        $(AM_V_CXXLD)$(CXXLINK) $(makedata_OBJECTS) $(makedata_LDADD) $(LIBS)
 src/makeplots.$(OBJEXT): src/$(am__dirstamp) \
         src/$(DEPDIR)/$(am__dirstamp)
@@ -1845 +1860 @@
         -rm -f src/logtime.$(OBJEXT)
         -rm -f src/magicweather.$(OBJEXT)
+        -rm -f src/makedata.$(OBJEXT)
         -rm -f src/makeplots.$(OBJEXT)
         -rm -f src/mcp.$(OBJEXT)
@@ -1984 +2000 @@
 @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)/makedata.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/makeplots.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/mcp.Po@am__quote@