Changeset 14240 for trunk/FACT++

Timestamp:

06/26/12 19:01:17 (12 years ago)

Author:

tbretz

Message:

Added DimState to datalogger

Location:

trunk/FACT++

Files:

• Makefile.am (modified) (1 diff)
• Makefile.in (modified) (4 diffs)

trunk/FACT++/Makefile.am

@@ -367 +367 @@
 test_LDADD = libStateMachine.la libTools.la libTime.la libDim++.la libDim.la libConfiguration.la
 
-datalogger_SOURCES = src/datalogger.cc src/LocalControl.h
+datalogger_SOURCES = src/datalogger.cc src/LocalControl.h src/DimState.cc
 if HAS_FITS
 datalogger_SOURCES += src/FitsFile.h src/FitsFile.cc src/Fits.h src/Fits.cc

trunk/FACT++/Makefile.in

@@ -208 +208 @@
         libDimExtension.la
 am__datalogger_SOURCES_DIST = src/datalogger.cc src/LocalControl.h \
-        src/FitsFile.h src/FitsFile.cc src/Fits.h src/Fits.cc
+        src/DimState.cc src/FitsFile.h src/FitsFile.cc src/Fits.h \
+        src/Fits.cc
 @HAS_FITS_TRUE@am__objects_1 = src/FitsFile.$(OBJEXT) \
 @HAS_FITS_TRUE@ src/Fits.$(OBJEXT)
-am_datalogger_OBJECTS = src/datalogger.$(OBJEXT) $(am__objects_1)
+am_datalogger_OBJECTS = src/datalogger.$(OBJEXT) \
+        src/DimState.$(OBJEXT) $(am__objects_1)
 datalogger_OBJECTS = $(am_datalogger_OBJECTS)
 datalogger_DEPENDENCIES = libDim++.la libDim.la libDimExtension.la \
@@ -987 +989 @@
 test_LDADD = libStateMachine.la libTools.la libTime.la libDim++.la libDim.la libConfiguration.la
 datalogger_SOURCES = src/datalogger.cc src/LocalControl.h \
-        $(am__append_9)
+        src/DimState.cc $(am__append_9)
 datalogger_LDADD = libDim++.la libDim.la libDimExtension.la \
         libStateMachine.la libTools.la libTime.la \
@@ -1324 +1326 @@
 src/datalogger.$(OBJEXT): src/$(am__dirstamp) \
         src/$(DEPDIR)/$(am__dirstamp)
+src/DimState.$(OBJEXT): src/$(am__dirstamp) \
+        src/$(DEPDIR)/$(am__dirstamp)
 src/FitsFile.$(OBJEXT): src/$(am__dirstamp) \
         src/$(DEPDIR)/$(am__dirstamp)
@@ -1355 +1359 @@
         src/$(DEPDIR)/$(am__dirstamp)
 src/InterpreterV8.$(OBJEXT): src/$(am__dirstamp) \
-        src/$(DEPDIR)/$(am__dirstamp)
-src/DimState.$(OBJEXT): src/$(am__dirstamp) \
         src/$(DEPDIR)/$(am__dirstamp)
 dimctrl$(EXEEXT): $(dimctrl_OBJECTS) $(dimctrl_DEPENDENCIES)