Changeset 12174

Timestamp:

10/12/11 12:05:02 (13 years ago)

Author:

tbretz

Message:

Added the needed stuff for the DRS Calibration.

Location:

trunk/FACT++

Files:

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

trunk/FACT++/Makefile.am

@@ -388 +388 @@
         src/PixelMap.cc
 
-viewer_LDADD = $(QT4_LIB) $(QT4_LDFLAGS) -L. -lQtOpenGL -lGLU libConfiguration.la libTools.la
-
-viewer_SOURCES = $(viewer_SRCADD) $(viewer_QT_SOURCES)
+viewer_LDADD = $(QT4_LIB) $(QT4_LDFLAGS) -L. -lQtOpenGL -lGLU \
+        libDim.la libDim++.la libDimExtension.la \
+        libConfiguration.la libTools.la libStateMachine.la \
+        libTime.la
+        
+
+viewer_SOURCES = $(viewer_SRCADD) $(viewer_QT_SOURCES) \
+        src/DataProcessorImp.cc src/DataProcessorImp.h \
+        src/DataCalib.cc src/DataCalib.h \
+        src/FitsFile.cc  src/FitsFile.h
+        src/Fits.cc      src/Fits.h
 
 

trunk/FACT++/Makefile.in

@@ -337 +337 @@
         gui/RawEventsViewer/RawEventsViewer.moc.cc \
         gui/BasicGlCamera.moc.cc \
-        gui/RawEventsViewer/RawEventsViewer.cc gui/BasicGlCamera.cc
+        gui/RawEventsViewer/RawEventsViewer.cc gui/BasicGlCamera.cc \
+        src/DataProcessorImp.cc src/DataProcessorImp.h \
+        src/DataCalib.cc src/DataCalib.h src/FitsFile.cc \
+        src/FitsFile.h
 @HAS_VIEWER_TRUE@am__objects_8 = gui/RawEventsViewer/RawEventsViewer.moc.$(OBJEXT) \
 @HAS_VIEWER_TRUE@       gui/BasicGlCamera.moc.$(OBJEXT)
@@ -343 +346 @@
 @HAS_VIEWER_TRUE@am__objects_10 = gui/RawEventsViewer/RawEventsViewer.$(OBJEXT) \
 @HAS_VIEWER_TRUE@       gui/BasicGlCamera.$(OBJEXT)
-am_viewer_OBJECTS = $(am__objects_9) $(am__objects_10)
+am_viewer_OBJECTS = $(am__objects_9) $(am__objects_10) \
+        src/DataProcessorImp.$(OBJEXT) src/DataCalib.$(OBJEXT) \
+        src/FitsFile.$(OBJEXT)
 viewer_OBJECTS = $(am_viewer_OBJECTS)
 viewer_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-        libConfiguration.la libTools.la
+        libDim.la libDim++.la libDimExtension.la libConfiguration.la \
+        libTools.la libStateMachine.la libTime.la
 SCRIPTS = $(dist_noinst_SCRIPTS)
 DEFAULT_INCLUDES = -I.@am__isrc@
@@ -889 +895 @@
 test_SOURCES = src/test.cc
 test_LDADD = libTools.la libStateMachine.la libTime.la libDim.la libDim++.la libConfiguration.la
-
-#test_SOURCES = src/test.cc  src/DataCalib.cc src/DataProcessorImp.cc src/DimWriteStatistics.cc src/FitsFile.cc src/MessageImp.cc src/DimDescriptionService.cc src/WindowLog.cc
-#test_LDADD = libTime.la  libDim.la libDim++.la
-#libTools.la libStateMachine.la libTime.la libDim.la libDim++.la libConfiguration.la
 datalogger_SOURCES = src/datalogger.cc src/LocalControl.h \
         $(am__append_6)
@@ -950 +952 @@
         src/PixelMap.cc
 
-viewer_LDADD = $(QT4_LIB) $(QT4_LDFLAGS) -L. -lQtOpenGL -lGLU libConfiguration.la libTools.la
-viewer_SOURCES = $(viewer_SRCADD) $(viewer_QT_SOURCES)
+viewer_LDADD = $(QT4_LIB) $(QT4_LDFLAGS) -L. -lQtOpenGL -lGLU \
+        libDim.la libDim++.la libDimExtension.la \
+        libConfiguration.la libTools.la libStateMachine.la \
+        libTime.la
+
+viewer_SOURCES = $(viewer_SRCADD) $(viewer_QT_SOURCES) \
+        src/DataProcessorImp.cc src/DataProcessorImp.h \
+        src/DataCalib.cc src/DataCalib.h \
+        src/FitsFile.cc  src/FitsFile.h
+
 
 #-------------------------------------------------------------------------
@@ -2273 +2283 @@
 @DX_COND_doc_TRUE@      rm -rf @DX_DOCDIR@
 @DX_COND_doc_TRUE@      $(DX_ENV) $(DX_DOXYGEN) $(srcdir)/$(DX_CONFIG)
+        src/Fits.cc      src/Fits.h
 
 .ui.h: $<