Changeset 12162 for trunk

Timestamp:

10/02/11 13:34:50 (13 years ago)

Author:

tbretz

Message:

Adapted to latest change in Makefile.am

File:

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

trunk/FACT++/Makefile.in

@@ -229 +229 @@
         gui/BasicGlCamera.cc gui/CheckBoxDelegate.cc \
         gui/HtmlDelegate.cc gui/fact.cc gui/FactGui.cc \
-        src/HeadersFTM.cc
+        src/HeadersFTM.cc src/PixelMap.cc
 am__objects_2 =
 @HAS_GUI_TRUE@am__objects_3 = gui/design.$(OBJEXT)
@@ -245 +245 @@
         gui/CheckBoxDelegate.$(OBJEXT) gui/HtmlDelegate.$(OBJEXT) \
         gui/fact.$(OBJEXT) gui/FactGui.$(OBJEXT) \
-        src/HeadersFTM.$(OBJEXT)
+        src/HeadersFTM.$(OBJEXT) src/PixelMap.$(OBJEXT)
 fact_OBJECTS = $(am_fact_OBJECTS)
 am__DEPENDENCIES_1 =
@@ -690 +690 @@
 #       libAstro.la
 @HAS_HELP2MAN_TRUE@dist_man1_MANS = \
-@HAS_HELP2MAN_TRUE@     dimctrl.man ftmctrl.man datalogger.man triggerschedule.man fitsdump.man
+@HAS_HELP2MAN_TRUE@     dimctrl.man \
+@HAS_HELP2MAN_TRUE@     ftmctrl.man \
+@HAS_HELP2MAN_TRUE@     fadctrl.man \
+@HAS_HELP2MAN_TRUE@     fscctrl.man \
+@HAS_HELP2MAN_TRUE@     mcp.man \
+@HAS_HELP2MAN_TRUE@     feedback.man \
+@HAS_HELP2MAN_TRUE@     biasctrl.man \
+@HAS_HELP2MAN_TRUE@     datalogger.man \
+@HAS_HELP2MAN_TRUE@     fitsdump.man
 
 
@@ -881 +889 @@
 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)
@@ -935 +947 @@
 fact_SOURCES = $(fact_SRCADD) $(fact_QT_SOURCES) \
         gui/CheckBoxDelegate.cc gui/HtmlDelegate.cc \
-        gui/fact.cc gui/FactGui.cc src/HeadersFTM.cc
+        gui/fact.cc gui/FactGui.cc src/HeadersFTM.cc \
+        src/PixelMap.cc
 
 viewer_LDADD = $(QT4_LIB) $(QT4_LDFLAGS) -L. -lQtOpenGL -lGLU libConfiguration.la libTools.la
@@ -1279 +1292 @@
 gui/FactGui.$(OBJEXT): gui/$(am__dirstamp) \
         gui/$(DEPDIR)/$(am__dirstamp)
+src/PixelMap.$(OBJEXT): src/$(am__dirstamp) \
+        src/$(DEPDIR)/$(am__dirstamp)
 fact$(EXEEXT): $(fact_OBJECTS) $(fact_DEPENDENCIES) 
         @rm -f fact$(EXEEXT)
@@ -1494 +1509 @@
         -rm -f src/MessageImp.$(OBJEXT)
         -rm -f src/MessageImp.lo
+        -rm -f src/PixelMap.$(OBJEXT)
         -rm -f src/Readline.$(OBJEXT)
         -rm -f src/Readline.lo
@@ -1615 +1631 @@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/MessageDim.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/MessageImp.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/PixelMap.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/Readline.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/ReadlineColor.Plo@am__quote@